diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-03-02 16:33:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-02 16:33:06 +0100 |
commit | f4abf8e7829c6a5b952dea6fb9ad01b6b3601f95 (patch) | |
tree | afc41f393d862885eae63cccd3b72262ce08128b /app/validators/status_length_validator.rb | |
parent | 4aa860b65bd796b09dc0ceffa1fdd7de31060a34 (diff) | |
parent | 7336276252ab89985c609359eb9953fca0383db3 (diff) |
Merge pull request #1504 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/validators/status_length_validator.rb')
-rw-r--r-- | app/validators/status_length_validator.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb index 92ee5e643..dcbc4a41a 100644 --- a/app/validators/status_length_validator.rb +++ b/app/validators/status_length_validator.rb @@ -2,6 +2,13 @@ class StatusLengthValidator < ActiveModel::Validator MAX_CHARS = (ENV['MAX_TOOT_CHARS'] || 500).to_i + URL_PATTERN = %r{ + (?: + (#{Twitter::TwitterText::Regex[:valid_url_preceding_chars]}) + (#{FetchLinkCardService::URL_PATTERN}) + ) + }iox + URL_PLACEHOLDER = "\1#{'x' * 23}" def validate(status) return unless status.local? && !status.reblog? @@ -28,7 +35,7 @@ class StatusLengthValidator < ActiveModel::Validator return '' if @status.text.nil? @status.text.dup.tap do |new_text| - new_text.gsub!(FetchLinkCardService::URL_PATTERN, 'x' * 23) + new_text.gsub!(URL_PATTERN, URL_PLACEHOLDER) new_text.gsub!(Account::MENTION_RE, '@\2') end end |