Progress

hashtag in top of tag feed, scroll to comment, chat blocking, muting, filtering

app/controllers/api/v1/chat_conversations/blocked_chat_accounts_controller.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-class Api::V1::ChatConversationAccounts::BlockedChatAccountsController < Api::BaseController
+class Api::V1::ChatConversations::BlockedChatAccountsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :follow, :'read:blocks' }
   before_action :require_user!
   after_action :insert_pagination_headers
 
-  def show
+  def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
   end
@@ -32,13 +32,13 @@ class Api::V1::ChatConversationAccounts::BlockedChatAccountsController < Api::Ba
 
   def next_path
     if records_continue?
-      api_v1_chat_conversation_accounts_chat_blocked_accounts_url pagination_params(max_id: pagination_max_id)
+      api_v1_chat_conversations_blocked_chat_accounts_url pagination_params(max_id: pagination_max_id)
     end
   end
 
   def prev_path
     unless paginated_blocks.empty?
-      api_v1_chat_conversation_accounts_blocked_chat_accounts_url pagination_params(since_id: pagination_since_id)
+      api_v1_chat_conversations_blocked_chat_accounts_url pagination_params(since_id: pagination_since_id)
     end
   end
 

app/controllers/api/v1/chat_conversations/messages_controller.rb

@@ -47,7 +47,7 @@ class Api::V1::ChatConversations::MessagesController < Api::BaseController
     ).paginate_by_id(
       limit_param(DEFAULT_CHAT_CONVERSATION_MESSAGE_LIMIT),
       params_slice(:max_id, :since_id, :min_id)
-    )
+    ).reject { |chat_message| FeedManager.instance.filter?(:chat_message, chat_message, current_account.id) }
   end
 
   def insert_pagination_headers

app/controllers/api/v1/chat_conversations/muted_conversations_controller.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+class Api::V1::ChatConversations::MutedConversationsController < Api::BaseController
+  before_action -> { authorize_if_got_token! :read, :'read:chats' }
+
+  before_action :require_user!
+  after_action :insert_pagination_headers
+
+  def index
+    @chat_conversations = load_chat_conversations
+    render json: @chat_conversations, each_serializer: REST::ChatConversationAccountSerializer
+  end
+
+  private
+
+  def load_chat_conversations
+    paginated_chat_conversations
+  end
+
+  def paginated_chat_conversations
+    ChatConversationAccount.where(
+      account: current_account,
+      is_muted: true,
+    ).paginate_by_max_id(
+      limit_param(DEFAULT_CHAT_CONVERSATION_LIMIT),
+      params[:max_id],
+      params[:since_id]
+    )
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    if records_continue?
+      api_v1_chat_conversations_muted_conversations_url pagination_params(max_id: pagination_max_id)
+    end
+  end
+
+  def prev_path
+    unless paginated_chat_conversations.empty?
+      api_v1_chat_conversations_muted_conversations_url pagination_params(since_id: pagination_since_id)
+    end
+  end
+
+  def pagination_max_id
+    paginated_chat_conversations.last.id
+  end
+
+  def pagination_since_id
+    paginated_chat_conversations.first.id
+  end
+
+  def records_continue?
+    paginated_chat_conversations.size == limit_param(DEFAULT_CHAT_CONVERSATION_LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+
+end

app/controllers/api/v1/hashtags_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Api::V1::HashtagsController < Api::BaseController
+  before_action :require_user!
+  before_action :set_hashtag
+
+  def show
+    render json: @hashtag, serializer: REST::TagSerializer
+  end
+
+  private
+
+  def set_hashtag
+    @hashtag = Tag.where(name: params[:id]).first
+  end
+
+end