diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-29 00:06:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-29 00:06:29 +0200 |
| commit | 53b2b1b2389c0ea941c50d4a9c726539d808c384 (patch) | |
| tree | 2afc8cc342a62aa66f4ab52b82a7f8fdf182cd67 /app/models | |
| parent | 634b71ed1d551ee569e5ff5b858ea7eb07c824bd (diff) | |
Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427)
* Count all URLs in text as 23 characters flat, do not count domain part of usernames * Add new status text counting logic to web UI
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 82c9b58d5..163bd1c0e 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 |