diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-11 13:23:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-11 13:23:54 +0100 |
| commit | 45e4c90a23ccd6ccbed389d5c1b62f830d2c3757 (patch) | |
| tree | 6fbb79dda2e8a75c8b88bccd08078f346e8392ca /app/services/notify_service.rb | |
| parent | f534f4869ecb52cb48f3e68e42752d8f81d7a710 (diff) | |
| parent | 9c620fc5c80ff0f2aa600069dfdf868e150b0799 (diff) | |
Merge pull request #953 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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index b80ceef03..7a86879f0 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -38,6 +38,10 @@ class NotifyService < BaseService false end + def blocked_poll? + false + end + def following_sender? return @following_sender if defined?(@following_sender) @following_sender = @recipient.following?(@notification.from_account) || @recipient.requested?(@notification.from_account) @@ -88,7 +92,7 @@ class NotifyService < BaseService def blocked? blocked = @recipient.suspended? # Skip if the recipient account is suspended anyway - blocked ||= from_self? # Skip for interactions with self + blocked ||= from_self? unless @notification.type == :poll # Skip for interactions with self return blocked if message? && from_staff? |