From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 5 Jul 2018 16:43:37 +0000 (+0200)
Subject: Check reblogged status for blocked/muted mentions (#7957)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4b198b172d0924c2cf9c3f19b3cc6238c140b1f0;p=mastodon.git

Check reblogged status for blocked/muted mentions (#7957)
---

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index ee9185d34..efe7e2b7b 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -157,7 +157,11 @@ class FeedManager
 
     check_for_blocks = status.mentions.pluck(:account_id)
     check_for_blocks.concat([status.account_id])
-    check_for_blocks.concat([status.reblog.account_id]) if status.reblog?
+
+    if status.reblog?
+      check_for_blocks.concat([status.reblog.account_id])
+      check_for_blocks.concat(status.reblog.mentions.pluck(:account_id))
+    end
 
     return true if blocks_or_mutes?(receiver_id, check_for_blocks, :home)