From 17903c6dae9eb38ac221fb7cf86e5e3cafe465d0 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 10 Nov 2016 00:03:33 +0100 Subject: Improve filtering of public/hashtag timelines, both in backlog and real-time --- app/channels/application_cable/channel.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/channels') diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb index 43adadbd9..28bf0d9d3 100644 --- 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 -- cgit