ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Validation of count works even when text of status is nil (#6429)

rebase/4.0.0rc2
abcang 2018-02-04 20:32:41 +09:00 committed by Eugen Rochko
parent 3f35d43222
commit 9b6223f5e2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/validators/status_length_validator.rb
View File

@ -23,6 +23,8 @@ class StatusLengthValidator < ActiveModel::Validator
end end
def countable_text(status) def countable_text(status)
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!(FetchLinkCardService::URL_PATTERN, 'x' * 23)
new_text.gsub!(Account::MENTION_RE, '@\2') new_text.gsub!(Account::MENTION_RE, '@\2')