diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-11 11:23:50 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-11 11:23:50 +0100 |
| commit | 89bee860cdae399b796814f80a48eafa8b838d92 (patch) | |
| tree | 7f31aaa85f78b170f22cadd8c53fca8d09f8e795 /app/services/notify_service.rb | |
| parent | 3cef04610cd809c7bd01adc00d34fb3d25261a16 (diff) | |
| parent | 13a7f05030cdcbab24aeb25944a9a430238dbff1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/services/post_status_service.rb Small conflict due to handling of instance-local toots. A subsequent change is required to ensure instance-local polls are not leaked through Update.
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? |