Browse Source

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

master
Eugen Rochko 6 years ago
committed by GitHub
parent
commit
4b198b172d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      app/lib/feed_manager.rb

+ 5
- 1
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)

Loading…
Cancel
Save