mastofe

commit: d6b965cf083fb24fb16a9d2a58e240c357ad4ac9
parent: e809caa0e1633cede15b2578d1582d9878eae291
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sun,  2 Apr 2017 15:58:25 +0200

Fix issue with feed merge-in code as well

Diffstat:
M
app/lib/feed_manager.rb
2
+-
M
app/services/precompute_feed_service.rb
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
@@ -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
 
diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
@@ -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