Merge branch 'main' into glitch-soc/merge-upstream

2021-09-02 10:52:09 +02:00
parent e7e04b46d7 2b18f7a943
commit f9185c72a9
7 changed files with 825 additions and 1103 deletions
--- 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