mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-02-01 23:11:41 +01:00
Code Issues Projects Releases Wiki Activity

Fix PollExpirationValidator redundant check for expires_at presence (#33777)

Browse Source
This commit is contained in:
Claire 2025-01-29 15:37:59 +01:00 committed by GitHub
parent 7ffda06b6a
commit e53c8fbaf8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/validators/poll_expiration_validator.rb
View File

@ -5,9 +5,12 @@ class PollExpirationValidator < ActiveModel::Validator
MIN_EXPIRATION = 5.minutes.freeze
def validate(poll)
# We have a `presence: true` check for this attribute already
return if poll.expires_at.nil?
current_time = Time.now.utc
poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_long')) if poll.expires_at.nil? || poll.expires_at - current_time > MAX_EXPIRATION
poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_short')) if poll.expires_at.present? && (poll.expires_at - current_time).ceil < MIN_EXPIRATION
poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_long')) if poll.expires_at - current_time > MAX_EXPIRATION
poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_short')) if (poll.expires_at - current_time).ceil < MIN_EXPIRATION
end
end