Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-06-17 13:41:58 +02:00
parent 68c9fa8fcc 3a191b3797
commit 677f73f793
61 changed files with 598 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/lib/feed_manager.rb
View File

@@ -470,10 +470,7 @@ class FeedManager
check_for_blocks = status.active_mentions.pluck(:account_id)
check_for_blocks.push(status.in_reply_to_account) if status.reply? && !status.in_reply_to_account_id.nil?
should_filter = blocks_or_mutes?(receiver_id, check_for_blocks, :mentions) # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked (or muted)
should_filter ||= status.account.silenced? && !Follow.exists?(account_id: receiver_id, target_account_id: status.account_id) # Filter if the account is silenced and I'm not following them
should_filter
blocks_or_mutes?(receiver_id, check_for_blocks, :mentions) # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked (or muted)
end
# Check if status should not be added to the linear direct message feed