mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 00:54:49 +01:00
Code Issues Projects Releases Wiki 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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats 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 = status.mentions.pluck(:account_id)
check_for_blocks.concat([status.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) return true if blocks_or_mutes?(receiver_id, check_for_blocks, :home)