|
@@ -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?)://[^/]+}
|
|
|
|
|
|
include Attachmentable
|
|
|
include AccountAssociations
|