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/vote_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/vote_service.rb')
-rw-r--r-- | app/services/vote_service.rb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/app/services/vote_service.rb b/app/services/vote_service.rb index 5b80da03a..34a1fe2aa 100644 --- a/app/services/vote_service.rb +++ b/app/services/vote_service.rb @@ -19,14 +19,17 @@ class VoteService < BaseService end end - return if @poll.account.local? - - @votes.each do |vote| - ActivityPub::DeliveryWorker.perform_async( - build_json(vote), - @account.id, - @poll.account.inbox_url - ) + if @poll.account.local? + ActivityPub::DistributePollUpdateWorker.perform_in(3.minutes, @poll.status.id) unless @poll.hide_totals + else + @votes.each do |vote| + ActivityPub::DeliveryWorker.perform_async( + build_json(vote), + @account.id, + @poll.account.inbox_url + ) + end + PollExpirationNotifyWorker.perform_at(@poll.expires_at + 5.minutes, @poll.id) unless @poll.expires_at.nil? end end |