Skip to content

Commit

Permalink
Fix being able to vote on your own polls (mastodon#25015)
Browse files Browse the repository at this point in the history
  • Loading branch information
ClearlyClaire authored and atsu1125 committed Aug 18, 2023
1 parent 8ff16c5 commit 5176b7f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
6 changes: 5 additions & 1 deletion app/validators/vote_validator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
class VoteValidator < ActiveModel::Validator
def validate(vote)
vote.errors.add(:base, I18n.t('polls.errors.expired')) if vote.poll_expired?

vote.errors.add(:base, I18n.t('polls.errors.invalid_choice')) if invalid_choice?(vote)
vote.errors.add(:base, I18n.t('polls.errors.self_vote')) if self_vote?(vote)

if vote.poll_multiple? && already_voted_for_same_choice_on_multiple_poll?(vote)
vote.errors.add(:base, I18n.t('polls.errors.already_voted'))
Expand All @@ -19,6 +19,10 @@ def invalid_choice?(vote)
vote.choice.negative? || vote.choice >= vote.poll.options.size
end

def self_vote?(vote)
vote.account_id == vote.poll.account_id
end

def already_voted_for_same_choice_on_multiple_poll?(vote)
if vote.persisted?
account_votes_on_same_poll(vote).where(choice: vote.choice).where.not(poll_votes: { id: vote }).exists?
Expand Down
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1233,6 +1233,7 @@ en:
expired: The poll has already ended
invalid_choice: The chosen vote option does not exist
over_character_limit: cannot be longer than %{max} characters each
self_vote: You cannot vote in your own polls
too_few_options: must have more than one item
too_many_options: can't contain more than %{max} items
preferences:
Expand Down

0 comments on commit 5176b7f

Please sign in to comment.