about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-05-21 21:20:42 -0500
committermultiple creatures <dev@multiple-creature.party>2019-05-21 21:20:42 -0500
commitdd7164aac2e26426dbc82f213aa30249aae5638b (patch)
tree8af48dc7204f71c0283974a4f9010bb68459299c /app/models
parent9abf1ce535f48fd641b8bfb5083d6086a5d5cb0d (diff)
handle tags with the old `:` scope delimiter but translate those to `.`
Diffstat (limited to 'app/models')
-rw-r--r--app/models/tag.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/tag.rb b/app/models/tag.rb
index a6a1445a3..d3511a54e 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -19,7 +19,7 @@ class Tag < ApplicationRecord
   has_many :featured_tags, dependent: :destroy, inverse_of: :tag
   has_one :account_tag_stat, dependent: :destroy
 
-  HASHTAG_NAME_RE = '[[:word:]._\-]*[[:alpha:]._·\-][[:word:]._\-]*'
+  HASHTAG_NAME_RE = '[[:word:]:._\-]*[[:alpha:]:._·\-][[:word:]:._\-]*'
   HASHTAG_RE = /(?:^|[^\/\)\w])#(#{HASHTAG_NAME_RE})/i
 
   validates :name, presence: true, uniqueness: true, format: { with: /\A#{HASHTAG_NAME_RE}\z/i }
@@ -82,7 +82,7 @@ class Tag < ApplicationRecord
     end
 
     def find_normalized(name)
-      find_by(name: name.mb_chars.gsub(':', '.').downcase.to_s)
+      find_by(name: name.gsub(':', '.').mb_chars.downcase.to_s)
     end
 
     def find_normalized!(name)