Progress on little important things

removing .mov for now until we can figure out solution with videojs, added model to track username changes, got chat creation flow down, progress on bookmark collections, albums, filtering blocks/mutes from group, explore, collection timelines

app/controllers/api/v1/chat_conversation_controller.rb

@@ -20,7 +20,7 @@ class Api::V1::ChatConversationController < Api::BaseController
 
   def create
     chat_conversation_account = find_or_create_conversation
-    render json: chat_conversation_account, each_serializer: REST::ChatConversationAccountSerializer
+    render json: chat_conversation_account, serializer: REST::ChatConversationAccountSerializer
   end
 
   def mark_chat_conversation_read

app/controllers/api/v1/timelines/explore_controller.rb

@@ -45,7 +45,11 @@ class Api::V1::Timelines::ExploreController < EmptyController
   end
 
   def explore_statuses
-    SortingQueryBuilder.new.call(@sort_type, params[:max_id])
+    if current_account
+      SortingQueryBuilder.new.call(@sort_type, params[:max_id]).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
+    else
+      SortingQueryBuilder.new.call(@sort_type, params[:max_id])
+    end
   end
 
   def insert_pagination_headers

app/controllers/api/v1/timelines/group_collection_controller.rb

@@ -70,7 +70,11 @@ class Api::V1::Timelines::GroupCollectionController < EmptyController
       return []
     end
 
-    SortingQueryBuilder.new.call(@sort_type, params[:max_id], @groupIds)
+    if current_account
+      SortingQueryBuilder.new.call(@sort_type, params[:max_id], @groupIds).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
+    else
+      SortingQueryBuilder.new.call(@sort_type, params[:max_id], @groupIds)
+    end
   end
 
   def insert_pagination_headers

app/controllers/api/v1/timelines/group_controller.rb

@@ -51,7 +51,12 @@ class Api::V1::Timelines::GroupController < Api::BaseController
   end
 
   def group_statuses
-    SortingQueryBuilder.new.call(@sort_type, params[:max_id], @group)
+    if current_account
+      SortingQueryBuilder.new.call(@sort_type, params[:max_id], @group).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
+    else
+      SortingQueryBuilder.new.call(@sort_type, params[:max_id], @group)
+    end
+
   end
 
   def insert_pagination_headers