diff options
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/fan_out_on_write_service.rb | 4 | ||||
| -rw-r--r-- | app/services/precompute_feed_service.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index 2d18709d6..29b093ef8 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -15,7 +15,7 @@ class FanOutOnWriteService < BaseService def deliver_to_followers(status) status.account.followers.each do |follower| - next if !follower.local? || FeedManager.instance.filter_status?(status, follower) + next if !follower.local? || FeedManager.instance.filter?(:home, status, follower) FeedManager.instance.push(:home, follower, status) end end @@ -23,7 +23,7 @@ class FanOutOnWriteService < BaseService def deliver_to_mentioned(status) status.mentions.each do |mention| mentioned_account = mention.account - next if !mentioned_account.local? || mentioned_account.id == status.account_id + next if !mentioned_account.local? || mentioned_account.id == status.account_id || FeedManager.instance.filter?(:mentions, status, mentioned_account) FeedManager.instance.push(:mentions, mentioned_account, status) end end diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb index 84d655437..cdeb4a92f 100644 --- a/app/services/precompute_feed_service.rb +++ b/app/services/precompute_feed_service.rb @@ -7,7 +7,7 @@ class PrecomputeFeedService < BaseService instant_return = [] Status.send("as_#{type}_timeline", account).order('created_at desc').limit(FeedManager::MAX_ITEMS).find_each do |status| - next if type == :home && FeedManager.instance.filter_status?(status, account) + next FeedManager.instance.filter?(type, status, account) redis.zadd(FeedManager.instance.key(type, account.id), status.id, status.id) instant_return << status unless instant_return.size > limit end |