mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-14 00:08:46 +00:00
baac429103
Conflicts: - `app/lib/feed_manager.rb`: Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method. Added upstream's code. In addition, upstream changed how notifications from follow subscriptions were handled, refactoring this file in the process. Ported upstream's changes. - `app/services/precompute_feed_service.rb`: Not a real conflict, glitch-soc has extra code for the direct feed. Added upstream's new code for populating lists. - `app/validators/poll_options_validator.rb`: Upstream split `PollValidator` in two, and glitch-soc had local changes to make the options configurable. Refactored as upstream did, keeping glitch-soc's configurable limits. - `app/workers/feed_insert_worker.rb`: Upstream changed how notifications from follow subscriptions were handled, refactoring this file in the process. Conflict is due to glitch-soc having an extra timeline type (direct). Ported upstream's changes.
14 lines
765 B
Ruby
14 lines
765 B
Ruby
# frozen_string_literal: true
|
|
|
|
class PollOptionsValidator < ActiveModel::Validator
|
|
MAX_OPTIONS = (ENV['MAX_POLL_OPTIONS'] || 5).to_i
|
|
MAX_OPTION_CHARS = (ENV['MAX_POLL_OPTION_CHARS'] || 100).to_i
|
|
|
|
def validate(poll)
|
|
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_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.duplicate_options')) unless poll.options.uniq.size == poll.options.size
|
|
end
|
|
end
|