From 4b198b172d0924c2cf9c3f19b3cc6238c140b1f0 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 5 Jul 2018 18:43:37 +0200 Subject: [PATCH] Check reblogged status for blocked/muted mentions (#7957) --- app/lib/feed_manager.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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)