diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-09-08 13:24:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 13:24:54 +0200 |
| commit | 127aaa81742d57a7cee782c7d7fa3ec83488fba5 (patch) | |
| tree | 2cf834a3719e8ab485d57d3f448df887bdc2bdae /app/models/account.rb | |
| parent | e7e04b46d750f5e2addfd9650991727101d76910 (diff) | |
| parent | f9185c72a9aeaaa09eec6186776108dafa27d3fd (diff) | |
Merge pull request #1594 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 2cfa77615..69a12c7bc 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -59,7 +59,7 @@ class Account < ApplicationRecord ) USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i - MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[a-z0-9]+)?)/i + MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[[:word:]]+)?)/i URL_PREFIX_RE = /\Ahttp(s?):\/\/[^\/]+/ include AccountAssociations |