diff options
author | ThibG <thib@sitedethib.com> | 2019-03-11 00:49:31 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-11 00:49:31 +0100 |
commit | 3a92885a860df12b12d8356faf179a3fc63be6f2 (patch) | |
tree | f83e764e7b6f9f4cb84724b09fe0ee9f3ed469f6 /app/lib | |
parent | c11dff50493ecb106390153866bea539f3587293 (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/lib')
-rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 | ||||
-rw-r--r-- | app/lib/activitypub/activity/update.rb | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 7e4e57ead..b49806ecd 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -243,6 +243,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity return false if replied_to_status.nil? || replied_to_status.poll.nil? || !replied_to_status.local? || !replied_to_status.poll.options.include?(@object['name']) return true if replied_to_status.poll.expired? replied_to_status.poll.votes.create!(account: @account, choice: replied_to_status.poll.options.index(@object['name']), uri: @object['id']) + ActivityPub::DistributePollUpdateWorker.perform_in(3.minutes, replied_to_status.id) unless replied_to_status.poll.hide_totals + true end def resolve_thread(status) diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb index 67dae3f81..5f15f5274 100644 --- a/app/lib/activitypub/activity/update.rb +++ b/app/lib/activitypub/activity/update.rb @@ -5,6 +5,7 @@ class ActivityPub::Activity::Update < ActivityPub::Activity def perform update_account if equals_or_includes_any?(@object['type'], SUPPORTED_TYPES) + update_poll if equals_or_includes_any?(@object['type'], %w(Question)) end private @@ -14,4 +15,14 @@ class ActivityPub::Activity::Update < ActivityPub::Activity ActivityPub::ProcessAccountService.new.call(@account.username, @account.domain, @object, signed_with_known_key: true) end + + def update_poll + return reject_payload! if invalid_origin?(@object['id']) + status = Status.find_by(uri: object_uri, account_id: @account.id) + return if status.nil? || status.poll_id.nil? + poll = Poll.find(status.poll_id) + return if poll.nil? + + ActivityPub::ProcessPollService.new.call(poll, @object) + end end |