diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-22 22:20:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 22:20:17 +0200 |
| commit | 6913426e48b7dd5b44d9d085fdd8c4eb35903ccb (patch) | |
| tree | c89eef6c939e85d4795044580b95fc3afdad31dd /app/services | |
| parent | 3ba7c1e725417dded555d6a5b9a3911c39e355bf (diff) | |
| parent | 4cd82d442ea2040bc594a0e1b10c15df736d9ca5 (diff) | |
Merge pull request #92 from tootsuite/master
tiny upstream merge
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/notify_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index a44df5180..ca53c61c5 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -21,7 +21,7 @@ class NotifyService < BaseService end def blocked_favourite? - @recipient.muting?(@notification.from_account) + false end def blocked_follow? @@ -41,6 +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 ||= (@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 |