about summary refs log tree commit diff
path: root/app/services/notify_service.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-11 00:49:31 +0100
committerEugen Rochko <eugen@zeonfederated.com>2019-03-11 00:49:31 +0100
commit3a92885a860df12b12d8356faf179a3fc63be6f2 (patch)
treef83e764e7b6f9f4cb84724b09fe0ee9f3ed469f6 /app/services/notify_service.rb
parentc11dff50493ecb106390153866bea539f3587293 (diff)
Support pushing and receiving updates to poll tallies (#10209)
* Process incoming poll tallies update

* Send Update on poll vote

* Do not send Updates for a poll more often than once every 3 minutes

* Include voters in people to notify of results update

* Schedule closing poll worker on poll creation

* Add new notification type for ending polls

* Add front-end support for ended poll notifications

* Fix UpdatePollSerializer

* Fix Updates not being triggered by local votes

* Fix tests failure

* Fix web push notifications for closing polls

* Minor cleanup

* Notify voters of both remote and local polls when those close

* Fix delivery of poll updates to mentioned accounts and voters
Diffstat (limited to 'app/services/notify_service.rb')
-rw-r--r--app/services/notify_service.rb6
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?