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
(cherry picked from commit cca464b)
  • Loading branch information
ClearlyClaire authored and F-Finene committed Jul 6, 2023
1 parent 61f9eab commit 1640f72
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? && vote.poll.votes.where(account: vote.account, choice: vote.choice).exists?
vote.errors.add(:base, I18n.t('polls.errors.already_voted'))
Expand All @@ -18,4 +18,8 @@ def validate(vote)
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
end
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1387,6 +1387,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 1640f72

Please sign in to comment.