diff options
author | ThibG <thib@sitedethib.com> | 2019-03-08 01:47:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-08 01:47:36 +0100 |
commit | 29a09858f6700c0a6eb17797836589ed0839dec9 (patch) | |
tree | 96ac7fbac23d6ca32704c143342b5606523c8cab /app/services/activitypub | |
parent | 38e9c66f34d7054357a3de63834f182734d43d75 (diff) | |
parent | ca45198ccbbdde88731f074fcab2b5c9310775c2 (diff) |
Merge pull request #945 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/activitypub')
-rw-r--r-- | app/services/activitypub/fetch_remote_poll_service.rb | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/app/services/activitypub/fetch_remote_poll_service.rb b/app/services/activitypub/fetch_remote_poll_service.rb index 1dd587d73..4f9814fcd 100644 --- a/app/services/activitypub/fetch_remote_poll_service.rb +++ b/app/services/activitypub/fetch_remote_poll_service.rb @@ -32,12 +32,17 @@ class ActivityPub::FetchRemotePollService < BaseService # votes, so we need to remove them poll.votes.delete_all if latest_options != poll.options - poll.update!( - last_fetched_at: Time.now.utc, - expires_at: expires_at, - options: latest_options, - cached_tallies: items.map { |item| item.dig('replies', 'totalItems') || 0 } - ) + begin + poll.update!( + last_fetched_at: Time.now.utc, + expires_at: expires_at, + options: latest_options, + cached_tallies: items.map { |item| item.dig('replies', 'totalItems') || 0 } + ) + rescue ActiveRecord::StaleObjectError + poll.reload + retry + end end private |