Browse Source

Fix issue with feed merge-in code as well

master
Eugen Rochko 7 years ago
parent
commit
d6b965cf08
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      app/lib/feed_manager.rb
  2. +1
    -1
      app/services/precompute_feed_service.rb

+ 1
- 1
app/lib/feed_manager.rb View File

@ -52,7 +52,7 @@ class FeedManager
timeline_key = key(:home, into_account.id)
from_account.statuses.limit(MAX_ITEMS).each do |status|
next if filter?(:home, status, into_account)
next if status.direct_visibility? || filter?(:home, status, into_account)
redis.zadd(timeline_key, status.id, status.id)
end

+ 1
- 1
app/services/precompute_feed_service.rb View File

@ -6,7 +6,7 @@ class PrecomputeFeedService < BaseService
# @param [Account] account
def call(_, account)
Status.as_home_timeline(account).limit(FeedManager::MAX_ITEMS).each do |status|
next if (status.direct_visibility? && !status.permitted?(account)) || FeedManager.instance.filter?(:home, status, account)
next if status.direct_visibility? || FeedManager.instance.filter?(:home, status, account)
redis.zadd(FeedManager.instance.key(:home, account.id), status.id, status.reblog? ? status.reblog_of_id : status.id)
end
end

Loading…
Cancel
Save