diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-07-05 18:43:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 18:43:37 +0200 |
| commit | 4b198b172d0924c2cf9c3f19b3cc6238c140b1f0 (patch) | |
| tree | b1ec8c2e320d1b9a6a6a436a863cc7c9454141dc /app | |
| parent | 1f6ed4f86ab2aa98bb271b40bf381370fab4fdf2 (diff) | |
Check reblogged status for blocked/muted mentions (#7957)
Diffstat (limited to 'app')
| -rw-r--r-- | app/lib/feed_manager.rb | 6 |
1 files changed, 5 insertions, 1 deletions
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) |