Merge 4e99637115 into 624c024766

app/models/tag.rb

@@ -67,6 +67,8 @@ class Tag < ApplicationRecord
                         }
   scope :matches_name, ->(term) { where(arel_table[:name].lower.matches(arel_table.lower("#{sanitize_sql_like(Tag.normalize(term))}%"), nil, true)) } # Search with case-sensitive to use B-tree index
 
+  normalizes :display_name, with: ->(value) { value.gsub(HASHTAG_INVALID_CHARS_RE, '') }
+
   update_index('tags', :self)
 
   def to_param
@@ -112,8 +114,7 @@ class Tag < ApplicationRecord
       names = Array(name_or_names).map { |str| [normalize(str), str] }.uniq(&:first)
 
       names.map do |(normalized_name, display_name)|
-        tag = matching_name(normalized_name).first || create(name: normalized_name,
-                                                             display_name: display_name.gsub(HASHTAG_INVALID_CHARS_RE, ''))
+        tag = matching_name(normalized_name).first || create(name: normalized_name, display_name:)
 
         yield tag if block_given?
 

spec/models/tag_spec.rb

@@ -57,6 +57,11 @@ RSpec.describe Tag do
     end
   end
 
+  describe 'Normalizations' do
+    it { is_expected.to normalize(:display_name).from('#HelloWorld').to('HelloWorld') }
+    it { is_expected.to normalize(:display_name).from('Hello❤️World').to('HelloWorld') }
+  end
+
   describe 'HASHTAG_RE' do
     subject { described_class::HASHTAG_RE }