Improve filtering of public/hashtag timelines, both in backlog and real-time

2016-11-10 00:03:33 +01:00 · 2016-11-10 00:03:33 +01:00 · 17903c6dae
commit 17903c6dae
parent c5e03a2e0d
4 changed files with 32 additions and 8 deletions
--- a/app/channels/application_cable/channel.rb
+++ b/app/channels/application_cable/channel.rb
@ -14,7 +14,7 @@ module ApplicationCable
    end

    def filter?(status)
-      !status.nil? && (current_user.account.blocking?(status.account) || (status.reblog? && current_user.account.blocking?(status.reblog.account)))
+      !status.nil? && FeedManager.instance.filter?(:public, status, current_user.account)
    end
  end
 end