From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 9 Oct 2016 13:05:07 +0000 (+0200)
Subject: Filter block users and reblogs of them from public timeline
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=769b1ebbe0de2e3c9929add50bc18718055690d1;p=mastodon.git

Filter block users and reblogs of them from public timeline
---

diff --git a/app/channels/public_channel.rb b/app/channels/public_channel.rb
index 870b5cc2e..5d7fadc1d 100644
--- a/app/channels/public_channel.rb
+++ b/app/channels/public_channel.rb
@@ -5,7 +5,7 @@ class PublicChannel < ApplicationCable::Channel
       message = ActiveSupport::JSON.decode(encoded_message)
 
       status = Status.find_by(id: message['id'])
-      next if status.nil?
+      next if status.nil? || current_user.account.blocking?(status.account) || (status.reblog? && current_user.account.blocking?(status.reblog.account))
 
       message['message'] = FeedManager.instance.inline_render(current_user.account, status)