diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-08-01 13:07:43 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-08-01 13:20:29 -0700 |
| commit | 8150689b48716bb016d492d28cef08600a4b315e (patch) | |
| tree | a05a2539e894c79ef17698dce0da5a6af0c25bf6 /app/models/account.rb | |
| parent | b61e3daf983d87c6d2de7e54d420c2e8f5a531e6 (diff) | |
| parent | 7ef848256871454a790a9b7cc725053c67ba3da4 (diff) | |
Merge upstream (#111)
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 46cc84746..e217733f5 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -44,7 +44,7 @@ # class Account < ApplicationRecord - MENTION_RE = /(?:^|[^\/[:word:]])@([a-z0-9_]+(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/i + MENTION_RE = /(?:^|[^\/[:word:]])@(([a-z0-9_]+)(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/i include AccountAvatar include AccountFinderConcern |