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

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index ee9185d34400130466cd11454be806eca5d5d4bf..efe7e2b7bb021ffaa2938e062ae312b629b37f74 100644 (file)
--- 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)