mastofe

commit: f5c6baf29dde4d89c1c4611ac11b1da939523f06
parent: c3559d18a3824982995d2c0d67d829fca4d30fb6
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Mon,  7 Nov 2016 17:35:25 +0100

Fix account and hashtag regex

Diffstat:
M
app/models/account.rb
2
+-
M
app/models/tag.rb
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git 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
@@ -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