diff options
author | Fire Demon <firedemon@creature.cafe> | 2020-09-17 12:05:45 -0500 |
---|---|---|
committer | Fire Demon <firedemon@creature.cafe> | 2020-09-17 12:08:35 -0500 |
commit | e56e3d187f8ddd3db72fc90c5d200f552d5c1c04 (patch) | |
tree | 59204082c7f9731d301716f08865f8639149452c /app/lib | |
parent | 4a1b8bcf34ce834ee8c30f1ac94c29f4e56a2b41 (diff) |
[Filters] Merge thread muting and hiding into a single action
Diffstat (limited to 'app/lib')
-rw-r--r-- | app/lib/feed_manager.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 4659f6c4d..4e34e3b61 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -494,7 +494,7 @@ class FeedManager crutches[:muting] = Mute.where(account_id: receiver_id, target_account_id: check_for_blocks).pluck(:target_account_id).each_with_object({}) { |id, mapping| mapping[id] = true } crutches[:domain_blocking] = AccountDomainBlock.where(account_id: receiver_id, domain: statuses.map { |s| s.reblog&.account&.domain }.compact).pluck(:domain).each_with_object({}) { |domain, mapping| mapping[domain] = true } crutches[:blocked_by] = Block.where(target_account_id: receiver_id, account_id: statuses.map { |s| s.reblog&.account_id }.compact).pluck(:account_id).each_with_object({}) { |id, mapping| mapping[id] = true } - crutches[:hiding_thread] = ConversationMute.where(account_id: receiver_id, conversation_id: statuses.map(&:conversation_id).compact, hidden: true).pluck(:conversation_id).each_with_object({}) { |id, mapping| mapping[id] = true } + crutches[:hiding_thread] = ConversationMute.where(account_id: receiver_id, conversation_id: statuses.map(&:conversation_id).compact).pluck(:conversation_id).each_with_object({}) { |id, mapping| mapping[id] = true } crutches end |