fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-22 22:19:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatically block outgoing notifications from silenced accounts to users

Browse source 
who don't follow them
This commit is contained in:
Eugen Rochko 2016-12-04 16:51:49 +01:00
parent f763e844e8
commit 00e9dac1d3
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/lib/feed_manager.rb
View file

@ -82,12 +82,13 @@ class FeedManager
end end
def filter_from_mentions?(status, receiver) def filter_from_mentions?(status, receiver)
should_filter = receiver.id == status.account_id # Filter if I'm mentioning myself should_filter = receiver.id == status.account_id # Filter if I'm mentioning myself
should_filter ||= receiver.blocking?(status.account) # or it's from someone I blocked should_filter ||= receiver.blocking?(status.account) # or it's from someone I blocked
should_filter ||= receiver.blocking?(status.mentions.includes(:account).map(&:account)) # or if it mentions someone I blocked should_filter ||= receiver.blocking?(status.mentions.includes(:account).map(&:account)) # or if it mentions someone I blocked
should_filter ||= (status.account.silenced? && !receiver.following?(status.account)) # of if the account is silenced and I'm not following them
if status.reply? && !status.thread.account.nil? # or it's a reply if status.reply? && !status.thread.account.nil? # or it's a reply
should_filter ||= receiver.blocking?(status.thread.account) # to a user I blocked should_filter ||= receiver.blocking?(status.thread.account) # to a user I blocked
end end
should_filter should_filter

1
app/services/notify_service.rb
View file

@ -36,6 +36,7 @@ class NotifyService < BaseService
blocked = false blocked = false
blocked ||= @recipient.id == @notification.from_account.id blocked ||= @recipient.id == @notification.from_account.id
blocked ||= @recipient.blocking?(@notification.from_account) blocked ||= @recipient.blocking?(@notification.from_account)
blocked ||= (@notification.from_account.silenced? && !@recipient.following?(@notification.from_account))
blocked ||= (@recipient.user.settings(:interactions).must_be_follower && !@notification.from_account.following?(@recipient)) blocked ||= (@recipient.user.settings(:interactions).must_be_follower && !@notification.from_account.following?(@recipient))
blocked ||= (@recipient.user.settings(:interactions).must_be_following && !@recipient.following?(@notification.from_account)) blocked ||= (@recipient.user.settings(:interactions).must_be_following && !@recipient.following?(@notification.from_account))
blocked ||= send("blocked_#{@notification.type}?") blocked ||= send("blocked_#{@notification.type}?")