diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2020-09-08 03:41:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-08 03:41:16 +0200 |
commit | 65760f59df46e388919a9f7ccba1958d967b2695 (patch) | |
tree | 50243d7994f006d3bb53ba829460cbc191dbe540 /app/services | |
parent | 169f9105ef9b65380ff6af177c11a7b247025684 (diff) |
Refactor feed manager (#14761)
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/after_block_service.rb | 2 | ||||
-rw-r--r-- | app/services/notify_service.rb | 6 | ||||
-rw-r--r-- | app/services/precompute_feed_service.rb | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/app/services/after_block_service.rb b/app/services/after_block_service.rb index 2a0e10a79..314919df8 100644 --- a/app/services/after_block_service.rb +++ b/app/services/after_block_service.rb @@ -13,7 +13,7 @@ class AfterBlockService < BaseService private def clear_home_feed! - FeedManager.instance.clear_from_timeline(@account, @target_account) + FeedManager.instance.clear_from_home(@account, @target_account) end def clear_conversations! diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index abd676494..e4ca10eb1 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -13,15 +13,13 @@ class NotifyService < BaseService push_to_conversation! if direct_message? send_email! if email_enabled? rescue ActiveRecord::RecordInvalid - # rubocop:disable Style/RedundantReturn - return - # rubocop:enable Style/RedundantReturn + nil end private def blocked_mention? - FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient.id) + FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient) end def blocked_favourite? diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb index 076dedaca..61f573534 100644 --- a/app/services/precompute_feed_service.rb +++ b/app/services/precompute_feed_service.rb @@ -2,7 +2,7 @@ class PrecomputeFeedService < BaseService def call(account) - FeedManager.instance.populate_feed(account) + FeedManager.instance.populate_home(account) ensure Redis.current.del("account:#{account.id}:regeneration") end |