gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Fix issue with feed merge-in code as well

gh/stable
Eugen Rochko 2017-04-02 15:58:25 +02:00
parent e809caa0e1
commit d6b965cf08
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/lib/feed_manager.rb
View File

@ -52,7 +52,7 @@ class FeedManager
timeline_key = key(:home, into_account.id) timeline_key = key(:home, into_account.id)
from_account.statuses.limit(MAX_ITEMS).each do |status| 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) redis.zadd(timeline_key, status.id, status.id)
end end

2
app/services/precompute_feed_service.rb
View File

@ -6,7 +6,7 @@ class PrecomputeFeedService < BaseService
# @param [Account] account # @param [Account] account
def call(_, account) def call(_, account)
Status.as_home_timeline(account).limit(FeedManager::MAX_ITEMS).each do |status| 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) redis.zadd(FeedManager.instance.key(:home, account.id), status.id, status.reblog? ? status.reblog_of_id : status.id)
end end
end end