diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-13 16:55:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 16:55:07 +0100 |
| commit | 3005e473a0df4d2ea942dcc33e01c5e4c15b81fa (patch) | |
| tree | 8d0b0e635bf12a56ae99278ab206684da2a9aad1 /app/services/notify_service.rb | |
| parent | c2857c976c7d4a8bbd02c3c18569913f2bf8a034 (diff) | |
| parent | 387f253f3100317ae247928aa9168f431879ecb6 (diff) | |
Merge pull request #957 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/notify_service.rb')
| -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 7a86879f0..b5c721589 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -92,7 +92,7 @@ class NotifyService < BaseService def blocked? blocked = @recipient.suspended? # Skip if the recipient account is suspended anyway - blocked ||= from_self? unless @notification.type == :poll # Skip for interactions with self + blocked ||= from_self? && @notification.type != :poll # Skip for interactions with self return blocked if message? && from_staff? |