kikobar/mastodon
1
0
Fork 0
mirror of https://github.com/kikobar/mastodon.git synced 2024-11-17 21:04:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #4172 - Mutes now block notifications (#4300)

Browse source
This commit is contained in:
Eugen Rochko 2017-07-22 16:36:36 +02:00 committed by GitHub
parent cf51e07bde
commit a929f7e6ac
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/services/notify_service.rb
View file

@ -21,7 +21,7 @@ class NotifyService < BaseService
end end
def blocked_favourite? def blocked_favourite?
@recipient.muting?(@notification.from_account) false
end end
def blocked_follow? def blocked_follow?
@ -41,6 +41,7 @@ class NotifyService < BaseService
blocked ||= @recipient.id == @notification.from_account.id # Skip for interactions with self blocked ||= @recipient.id == @notification.from_account.id # Skip for interactions with self
blocked ||= @recipient.domain_blocking?(@notification.from_account.domain) && !@recipient.following?(@notification.from_account) # Skip for domain blocked accounts blocked ||= @recipient.domain_blocking?(@notification.from_account.domain) && !@recipient.following?(@notification.from_account) # Skip for domain blocked accounts
blocked ||= @recipient.blocking?(@notification.from_account) # Skip for blocked accounts blocked ||= @recipient.blocking?(@notification.from_account) # Skip for blocked accounts
blocked ||= @recipient.muting?(@notification.from_account) # Skip for muted accounts
blocked ||= (@notification.from_account.silenced? && !@recipient.following?(@notification.from_account)) # Hellban blocked ||= (@notification.from_account.silenced? && !@recipient.following?(@notification.from_account)) # Hellban
blocked ||= (@recipient.user.settings.interactions['must_be_follower'] && !@notification.from_account.following?(@recipient)) # Options blocked ||= (@recipient.user.settings.interactions['must_be_follower'] && !@notification.from_account.following?(@recipient)) # Options
blocked ||= (@recipient.user.settings.interactions['must_be_following'] && !@recipient.following?(@notification.from_account)) # Options blocked ||= (@recipient.user.settings.interactions['must_be_following'] && !@recipient.following?(@notification.from_account)) # Options