diff options
Diffstat (limited to 'app/services/notify_service.rb')
| -rw-r--r-- | app/services/notify_service.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index ab76e2a6b..8263c4376 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -33,13 +33,13 @@ class NotifyService < BaseService end def blocked? - blocked = false - blocked ||= @recipient.id == @notification.from_account.id - 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_following && !@recipient.following?(@notification.from_account)) - blocked ||= send("blocked_#{@notification.type}?") + blocked = @recipient.suspended? # Skip if the recipient account is suspended anyway + blocked ||= @recipient.id == @notification.from_account.id # Skip for interactions with self + blocked ||= @recipient.blocking?(@notification.from_account) # Skip for blocked accounts + 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 + blocked ||= send("blocked_#{@notification.type}?") # Type-dependent filters blocked end |