diff options
| author | Surinna Curtis <ekiru.0@gmail.com> | 2017-07-27 07:52:45 -0500 |
|---|---|---|
| committer | Surinna Curtis <ekiru.0@gmail.com> | 2017-09-13 21:47:30 -0500 |
| commit | 27f8d7069beeb1996fe8121dddfbcf3fe60248a6 (patch) | |
| tree | 18d10c8bb2f221845294a48c34a541025b3e28d1 /app/services | |
| parent | 44207b6af6977f44200b6fd82f3e18ba70fd7cc7 (diff) | |
block notifications in notify_service from hard muted accounts
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/notify_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index ca53c61c5..fb09df983 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -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 |