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

6 years ago · 9f0a91e142
parent 34fdf77f48
commit 9f0a91e142
1 changed files with 5 additions and 1 deletions
--- 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)