diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-10 00:03:33 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-10 00:03:33 +0100 |
| commit | 17903c6dae9eb38ac221fb7cf86e5e3cafe465d0 (patch) | |
| tree | 4f1d32a1ec9b770407a919bcc46794fcc09f339b /app/channels | |
| parent | c5e03a2e0d7eac132a5d62d1d7d523a6969697cc (diff) | |
Improve filtering of public/hashtag timelines, both in backlog and real-time
Diffstat (limited to 'app/channels')
| -rw-r--r-- | app/channels/application_cable/channel.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |