tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix poll votes not being properly reset on poll change (#17498)

Browse Source 
* Fix poll votes not being properly reset on poll change

* Fix and add tests

* Fix poll update handling when the number of options changes
This commit is contained in:
Claire
2022-02-10 14:26:54 +01:00
committed by GitHub
parent 1bfcb75105
commit 63854bee6c
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/poll.rb
View File

@@ -83,6 +83,12 @@ class Poll < ApplicationRecord
end
end
def reset_votes!
self.cached_tallies = options.map { 0 }
self.votes_count = 0
votes.delete_all unless new_record?
end
private
def prepare_cached_tallies

6
app/services/activitypub/process_status_update_service.rb
View File

@@ -95,10 +95,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
# If for some reasons the options were changed, it invalidates all previous
# votes, so we need to remove them
if poll_parser.significantly_changes?(poll)
@poll_changed = true
poll.votes.delete_all unless poll.new_record?
end
@poll_changed = true if poll_parser.significantly_changes?(poll)
poll.last_fetched_at = Time.now.utc
poll.options = poll_parser.options
@@ -106,6 +103,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
poll.expires_at = poll_parser.expires_at
poll.voters_count = poll_parser.voters_count
poll.cached_tallies = poll_parser.cached_tallies
poll.reset_votes! if @poll_changed
poll.save!
@status.poll_id = poll.id

6
app/services/update_status_service.rb
View File

@@ -73,15 +73,13 @@ class UpdateStatusService < BaseService
# If for some reasons the options were changed, it invalidates all previous
# votes, so we need to remove them
if @options[:poll][:options] != poll.options || ActiveModel::Type::Boolean.new.cast(@options[:poll][:multiple]) != poll.multiple
@poll_changed = true
poll.votes.delete_all unless poll.new_record?
end
@poll_changed = true if @options[:poll][:options] != poll.options || ActiveModel::Type::Boolean.new.cast(@options[:poll][:multiple]) != poll.multiple
poll.options = @options[:poll][:options]
poll.hide_totals = @options[:poll][:hide_totals] || false
poll.multiple = @options[:poll][:multiple] || false
poll.expires_in = @options[:poll][:expires_in]
poll.reset_votes! if @poll_changed
poll.save!
@status.poll_id = poll.id