From f84239ecabf5d92d0275894ee357e58af0a4e711 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sat, 7 Nov 2020 13:16:00 +0100
Subject: [PATCH] Fix suspension/unsuspension not working because of
FeedManager change (#15099)
---
app/services/suspend_account_service.rb | 2 +-
app/services/unsuspend_account_service.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index 5a079c3acd..ea96767fa8 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -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
diff --git a/app/services/unsuspend_account_service.rb b/app/services/unsuspend_account_service.rb
index 3e731ddd9f..fe49e34717 100644
--- a/app/services/unsuspend_account_service.rb
+++ b/app/services/unsuspend_account_service.rb
@@ -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
--
GitLab