Change note length validation to ignore mention domains and URLs (#9717)
Fix #4419
This commit is contained in:
parent
60b0585743
commit
fd35d69b4f
3 changed files with 25 additions and 3 deletions
|
@ -75,7 +75,7 @@ class Account < ApplicationRecord
|
||||||
validates_with UniqueUsernameValidator, if: -> { local? && will_save_change_to_username? }
|
validates_with UniqueUsernameValidator, if: -> { local? && will_save_change_to_username? }
|
||||||
validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
|
validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
|
||||||
validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
|
validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
|
||||||
validates :note, length: { maximum: 160 }, if: -> { local? && will_save_change_to_note? }
|
validates :note, note_length: { maximum: 160 }, if: -> { local? && will_save_change_to_note? }
|
||||||
validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }
|
validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }
|
||||||
|
|
||||||
scope :remote, -> { where.not(domain: nil) }
|
scope :remote, -> { where.not(domain: nil) }
|
||||||
|
|
22
app/validators/note_length_validator.rb
Normal file
22
app/validators/note_length_validator.rb
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class NoteLengthValidator < ActiveModel::EachValidator
|
||||||
|
def validate_each(record, attribute, value)
|
||||||
|
record.errors.add(attribute, I18n.t('statuses.over_character_limit', max: options[:maximum])) if too_long?(value)
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def too_long?(value)
|
||||||
|
countable_text(value).mb_chars.grapheme_length > options[:maximum]
|
||||||
|
end
|
||||||
|
|
||||||
|
def countable_text(value)
|
||||||
|
return '' if value.nil?
|
||||||
|
|
||||||
|
value.dup.tap do |new_text|
|
||||||
|
new_text.gsub!(FetchLinkCardService::URL_PATTERN, 'x' * 23)
|
||||||
|
new_text.gsub!(Account::MENTION_RE, '@\2')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -8,7 +8,7 @@ class UrlValidator < ActiveModel::EachValidator
|
||||||
private
|
private
|
||||||
|
|
||||||
def compliant?(url)
|
def compliant?(url)
|
||||||
parsed_url = Addressable::URI.parse(url).normalize
|
parsed_url = Addressable::URI.parse(url)
|
||||||
!parsed_url.nil? && %w(http https).include?(parsed_url.scheme) && parsed_url.host
|
parsed_url && %w(http https).include?(parsed_url.scheme) && parsed_url.host
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue