diff options
| author | ThibG <thib@sitedethib.com> | 2018-11-27 12:28:01 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-11-27 12:28:01 +0100 |
| commit | 395615d9f3c521824f7e56f6d1bb2d82b8e421b4 (patch) | |
| tree | e6e1821481ee41819e582d1d03811c2a3bc7c0a6 /app/models | |
| parent | d5fac45f5b3501e923401a12a9b18d225b19232a (diff) | |
Allow hyphens in the middle of remote user names (#9345)
Fixes #9309 This only allows hyphens in the middle of a username, much like dots, although I don't have a compelling reason to do so other than keeping the changes minimal.
Diffstat (limited to 'app/models')
| -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 46d32a36e..f25263306 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -46,7 +46,7 @@ # class Account < ApplicationRecord - USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.]+[a-z0-9_]+)?/i + USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/i include AccountAvatar |