Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add pending specs for StatusLengthValidator (#9647)

Browse source 
* Add pending specs of StatusLengthValidator

* Use instance variable
This commit is contained in:
ysksn 2018-12-28 16:18:47 +09:00 • committed by Eugen Rochko
parent c1693827ae
commit ccb9c1b952
2 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/validators/status_length_validator.rb
View file

@ -5,27 +5,29 @@ class StatusLengthValidator < ActiveModel::Validator
def validate(status)
return unless status.local? && !status.reblog?
status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if too_long?(status)
@status = status
status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if too_long?
end
private
def too_long?(status)
countable_length(status) > MAX_CHARS
def too_long?
countable_length > MAX_CHARS
end
def countable_length(status)
total_text(status).mb_chars.grapheme_length
def countable_length
total_text.mb_chars.grapheme_length
end
def total_text(status)
[status.spoiler_text, countable_text(status)].join
def total_text
[@status.spoiler_text, countable_text].join
end
def countable_text(status)
return '' if status.text.nil?
def countable_text
return '' if @status.text.nil?
status.text.dup.tap do |new_text|
@status.text.dup.tap do |new_text|
new_text.gsub!(FetchLinkCardService::URL_PATTERN, 'x' * 23)
new_text.gsub!(Account::MENTION_RE, '@\2')
end