diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-13 15:16:02 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-13 15:16:02 +0100 |
| commit | 02062aab55cb6f8da527998a210775c2ad695eed (patch) | |
| tree | ab606ee84d964f28dad5bc77cfbd49b5c12849fa /app/services/notify_service.rb | |
| parent | c2857c976c7d4a8bbd02c3c18569913f2bf8a034 (diff) | |
| parent | 06663fcf87fe0d6bc71336e6f212b82f098066d7 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb
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? |