diff options
| author | Starfall <us@starfall.systems> | 2022-01-31 12:50:14 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-01-31 12:50:14 -0600 |
| commit | 17265f47f8f931e70699088dd8bd2a1c7b78112b (patch) | |
| tree | a1dde2630cd8e481cc4c5d047c4af241a251def0 /app/validators | |
| parent | 129962006c2ebcd195561ac556887dc87d32081c (diff) | |
| parent | d6f3261c6cb810ea4eb6f74b9ee62af0d94cbd52 (diff) | |
Merge branch 'glitchsoc'
Diffstat (limited to 'app/validators')
| -rw-r--r-- | app/validators/reaction_validator.rb | 2 | ||||
| -rw-r--r-- | app/validators/status_length_validator.rb | 3 | ||||
| -rw-r--r-- | app/validators/status_pin_validator.rb | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/validators/reaction_validator.rb b/app/validators/reaction_validator.rb index 494b6041b..4ed3376e8 100644 --- a/app/validators/reaction_validator.rb +++ b/app/validators/reaction_validator.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class ReactionValidator < ActiveModel::Validator - SUPPORTED_EMOJIS = Oj.load(File.read(Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json'))).keys.freeze + SUPPORTED_EMOJIS = Oj.load_file(Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json').to_s).keys.freeze LIMIT = 8 diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb index 11997024f..2a3ac8862 100644 --- a/app/validators/status_length_validator.rb +++ b/app/validators/status_length_validator.rb @@ -2,7 +2,8 @@ class StatusLengthValidator < ActiveModel::Validator MAX_CHARS = (ENV['MAX_TOOT_CHARS'] || 500).to_i - URL_PLACEHOLDER = "\1#{'x' * 23}" + URL_PLACEHOLDER_CHARS = 23 + URL_PLACEHOLDER = "\1#{'x' * URL_PLACEHOLDER_CHARS}" def validate(status) return unless status.local? && !status.reblog? diff --git a/app/validators/status_pin_validator.rb b/app/validators/status_pin_validator.rb index 16353066c..35a101f1d 100644 --- a/app/validators/status_pin_validator.rb +++ b/app/validators/status_pin_validator.rb @@ -6,7 +6,7 @@ class StatusPinValidator < ActiveModel::Validator def validate(pin) pin.errors.add(:base, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog? pin.errors.add(:base, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id - pin.errors.add(:base, I18n.t('statuses.pin_errors.private')) unless %w(public unlisted).include?(pin.status.visibility) + pin.errors.add(:base, I18n.t('statuses.pin_errors.direct')) if pin.status.direct_visibility? pin.errors.add(:base, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count >= MAX_PINNED && pin.account.local? end end |