Optimize MuteService and AfterBlockService (#2836)

2 files changed, 2 insertions, 30 deletions

diff --git a/app/services/after_block_service.rb b/app/services/after_block_service.rb
index d1a846f21..a7dce08c7 100644
--- a/app/services/after_block_service.rb
+++ b/app/services/after_block_service.rb
@@ -2,30 +2,16 @@
 
 class AfterBlockService < BaseService
   def call(account, target_account)
-    clear_timelines(account, target_account)
+    FeedManager.instance.clear_from_timeline(account, target_account)
     clear_notifications(account, target_account)
   end
 
   private
 
-  def clear_timelines(account, target_account)
-    home_key = FeedManager.instance.key(:home, account.id)
-
-    redis.pipelined do
-      target_account.statuses.select('id').reorder(nil).find_each do |status|
-        redis.zrem(home_key, status.id)
-      end
-    end
-  end
-
   def clear_notifications(account, target_account)
     Notification.where(account: account).joins(:follow).where(activity_type: 'Follow', follows: { account_id: target_account.id }).delete_all
     Notification.where(account: account).joins(mention: :status).where(activity_type: 'Mention', statuses: { account_id: target_account.id }).delete_all
     Notification.where(account: account).joins(:favourite).where(activity_type: 'Favourite', favourites: { account_id: target_account.id }).delete_all
     Notification.where(account: account).joins(:status).where(activity_type: 'Status', statuses: { account_id: target_account.id }).delete_all
   end
-
-  def redis
-    Redis.current
-  end
 end
diff --git a/app/services/mute_service.rb b/app/services/mute_service.rb
index 1a650ed2a..92f92cc7d 100644
--- a/app/services/mute_service.rb
+++ b/app/services/mute_service.rb
@@ -3,21 +3,7 @@
 class MuteService < BaseService
   def call(account, target_account)
     return if account.id == target_account.id
-    clear_home_timeline(account, target_account)
+    FeedManager.instance.clear_from_timeline(account, target_account)
     account.mute!(target_account)
   end
-
-  private
-
-  def clear_home_timeline(account, target_account)
-    home_key = FeedManager.instance.key(:home, account.id)
-
-    target_account.statuses.select('id').reorder(nil).find_each do |status|
-      redis.zrem(home_key, status.id)
-    end
-  end
-
-  def redis
-    Redis.current
-  end
 end