]> cat aescling's git repositories - mastodon.git/commitdiff
Fix suspension/unsuspension not working because of FeedManager change (#15099)
authorThibG <thib@sitedethib.com>
Sat, 7 Nov 2020 12:16:00 +0000 (13:16 +0100)
committerGitHub <noreply@github.com>
Sat, 7 Nov 2020 12:16:00 +0000 (13:16 +0100)
app/services/suspend_account_service.rb
app/services/unsuspend_account_service.rb

index 5a079c3acdd47aa80021fca81778de4995b34169..ea96767fa8d81e3f17a07a251281eec9ef24105c 100644 (file)
@@ -18,7 +18,7 @@ class SuspendAccountService < BaseService
 
   def unmerge_from_home_timelines!
     @account.followers_for_local_distribution.find_each do |follower|
-      FeedManager.instance.unmerge_from_timeline(@account, follower)
+      FeedManager.instance.unmerge_from_home(@account, follower)
     end
   end
 
index 3e731ddd9f7ef127c3f730210efa031ba0d71c9e..fe49e3471719c1f0bd326fe98a354a605a177a4e 100644 (file)
@@ -18,7 +18,7 @@ class UnsuspendAccountService < BaseService
 
   def merge_into_home_timelines!
     @account.followers_for_local_distribution.find_each do |follower|
-      FeedManager.instance.merge_into_timeline(@account, follower)
+      FeedManager.instance.merge_into_home(@account, follower)
     end
   end