techhub/mastodon
2
0
Fork 0
Code Activity

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

Browse Source
This commit is contained in:
Eugen Rochko
2018-07-05 18:43:37 +02:00
committed by GitHub
parent 1f6ed4f86a
commit 4b198b172d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/feed_manager.rb
View File

@@ -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)