cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Fix suspension/unsuspension not working because of FeedManager change (#15099)

This commit is contained in:
ThibG 2020-11-07 13:16:00 +01:00 committed by GitHub
parent acc1c03861
commit f84239ecab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/suspend_account_service.rb
View File

@ -18,7 +18,7 @@ class SuspendAccountService < BaseService
def unmerge_from_home_timelines! def unmerge_from_home_timelines!
@account.followers_for_local_distribution.find_each do |follower| @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
end end

2
app/services/unsuspend_account_service.rb
View File

@ -18,7 +18,7 @@ class UnsuspendAccountService < BaseService
def merge_into_home_timelines! def merge_into_home_timelines!
@account.followers_for_local_distribution.find_each do |follower| @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
end end