diff options
| author | Matt Jankowski <matt@jankowski.online> | 2023-10-03 11:01:45 -0400 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-10-10 13:51:56 +0200 |
| commit | 335982325e32430858da8112cb86e382e1eaeaa2 (patch) | |
| tree | bdbefb4d2edc8ec5df556f00001310cff4c3df81 | |
| parent | 15c5727f71eeeb321802f3d3ed264a15e1934c01 (diff) | |
Dont match mention in url query string (#25656)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
| -rw-r--r-- | app/models/account.rb | 6 | ||||
| -rw-r--r-- | spec/models/account_spec.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 2fbed780122..31d3fa69c1c 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -61,9 +61,9 @@ class Account < ApplicationRecord trust_level ) - USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i - MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[[:word:]]+)?)/i - URL_PREFIX_RE = /\Ahttp(s?):\/\/[^\/]+/ + USERNAME_RE = /[a-z0-9_]+([a-z0-9_.-]+[a-z0-9_]+)?/i + MENTION_RE = %r{(?<![=/[:word:]])@((#{USERNAME_RE})(?:@[[:word:].-]+[[:word:]]+)?)}i + URL_PREFIX_RE = %r{\Ahttp(s?)://[^/]+} USERNAME_ONLY_RE = /\A#{USERNAME_RE}\z/i include Attachmentable diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 6cd769dc84b..35fc7b721c6 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -695,7 +695,7 @@ RSpec.describe Account, type: :model do expect(subject.match('Check this out https://medium.com/@alice/some-article#.abcdef123')).to be_nil end - xit 'does not match URL querystring' do + it 'does not match URL query string' do expect(subject.match('https://example.com/?x=@alice')).to be_nil end end |