mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-16 23:22:01 +00:00
block notifications in notify_service from hard muted accounts
This commit is contained in:
parent
44207b6af6
commit
27f8d7069b
|
@ -41,7 +41,7 @@ class NotifyService < BaseService
|
|||
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.blocking?(@notification.from_account) # Skip for blocked accounts
|
||||
blocked ||= @recipient.muting?(@notification.from_account) # Skip for muted accounts
|
||||
blocked ||= @recipient.muting_notifications?(@notification.from_account)
|
||||
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_following'] && !@recipient.following?(@notification.from_account)) # Options
|
||||
|
|
Loading…
Reference in a new issue