diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-07 17:35:25 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-07 17:35:25 +0100 |
| commit | f5c6baf29dde4d89c1c4611ac11b1da939523f06 (patch) | |
| tree | f59670c323ce462cf85ec71c38bcc9cf3eec305f /app/models | |
| parent | c3559d18a3824982995d2c0d67d829fca4d30fb6 (diff) | |
Fix account and hashtag regex
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/account.rb | 2 | ||||
| -rw-r--r-- | app/models/tag.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 936095ffd..92286369e 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -1,7 +1,7 @@ class Account < ApplicationRecord include Targetable - MENTION_RE = /(?:^|[\s\.>*+])@([a-z0-9_]+(?:@[a-z0-9\.\-]+)?)/i + MENTION_RE = /(?:^|[^\/\w])@([a-z0-9_]+(?:@[a-z0-9\.\-]+)?)/i IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze # Local users diff --git a/app/models/tag.rb b/app/models/tag.rb index a5ee62263..ac89c9bff 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -1,7 +1,7 @@ class Tag < ApplicationRecord has_and_belongs_to_many :statuses - HASHTAG_RE = /[?:^|\s|\.|>]#([[:word:]_]+)/i + HASHTAG_RE = /(?:^|[^\/\w])#([[:word:]_]+)/i validates :name, presence: true, uniqueness: true |