mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-22 10:38:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update poll validation to allow one-option polls if configured

Browse source
This commit is contained in:
Jeremy Kescher 2022-08-12 21:38:35 +02:00
parent e354a296c1
commit 1c107575d8
No known key found for this signature in database
GPG key ID: 48DFE4BB15BA5940
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env.production.catcatnya
View file

@ -37,6 +37,7 @@ MAX_BIO_CHARS=6942
MAX_PROFILE_FIELDS=10 MAX_PROFILE_FIELDS=10
MAX_PINNED_TOOTS=10 MAX_PINNED_TOOTS=10
MAX_DISPLAY_NAME_CHARS=50 MAX_DISPLAY_NAME_CHARS=50
MIN_POLL_OPTIONS=1
MAX_POLL_OPTIONS=20 MAX_POLL_OPTIONS=20
MAX_SEARCH_RESULTS=1000 MAX_SEARCH_RESULTS=1000
MAX_REMOTE_EMOJI_SIZE=1048576 MAX_REMOTE_EMOJI_SIZE=1048576

3
.env.production.sample
View file

@ -263,6 +263,9 @@ MAX_PROFILE_FIELDS=4
# Maximum allowed display name characters # Maximum allowed display name characters
MAX_DISPLAY_NAME_CHARS=30 MAX_DISPLAY_NAME_CHARS=30
# Minimum allowed poll options. (Minimum of 1)
MIN_POLL_OPTIONS=2
# Maximum allowed poll options # Maximum allowed poll options
MAX_POLL_OPTIONS=5 MAX_POLL_OPTIONS=5

5
app/validators/poll_validator.rb
View file

@ -1,7 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
class PollValidator < ActiveModel::Validator class PollValidator < ActiveModel::Validator
MAX_OPTIONS = (ENV['MAX_POLL_OPTIONS'] || 5).to_i MIN_OPTIONS = [1, (ENV['MIN_POLL_OPTIONS'] || 2).to_i].max
MAX_OPTIONS = [MIN_OPTIONS, (ENV['MAX_POLL_OPTIONS'] || 5).to_i].max
MAX_OPTION_CHARS = (ENV['MAX_POLL_OPTION_CHARS'] || 100).to_i MAX_OPTION_CHARS = (ENV['MAX_POLL_OPTION_CHARS'] || 100).to_i
MAX_EXPIRATION = 1.month.freeze MAX_EXPIRATION = 1.month.freeze
MIN_EXPIRATION = 5.minutes.freeze MIN_EXPIRATION = 5.minutes.freeze
@ -9,7 +10,7 @@ class PollValidator < ActiveModel::Validator
def validate(poll) def validate(poll)
current_time = Time.now.utc current_time = Time.now.utc
poll.errors.add(:options, I18n.t('polls.errors.too_few_options')) unless poll.options.size > 1 poll.errors.add(:options, I18n.t('polls.errors.too_few_options')) unless poll.options.size >= MIN_OPTIONS
poll.errors.add(:options, I18n.t('polls.errors.too_many_options', max: MAX_OPTIONS)) if poll.options.size > MAX_OPTIONS poll.errors.add(:options, I18n.t('polls.errors.too_many_options', max: MAX_OPTIONS)) if poll.options.size > MAX_OPTIONS
poll.errors.add(:options, I18n.t('polls.errors.over_character_limit', max: MAX_OPTION_CHARS)) if poll.options.any? { |option| option.mb_chars.grapheme_length > MAX_OPTION_CHARS } poll.errors.add(:options, I18n.t('polls.errors.over_character_limit', max: MAX_OPTION_CHARS)) if poll.options.any? { |option| option.mb_chars.grapheme_length > MAX_OPTION_CHARS }
poll.errors.add(:options, I18n.t('polls.errors.duplicate_options')) unless poll.options.uniq.size == poll.options.size poll.errors.add(:options, I18n.t('polls.errors.duplicate_options')) unless poll.options.uniq.size == poll.options.size