From 0762258aec68f1d422a0ecdc29d637c5807f943a Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 13 Sep 2019 16:01:26 +0200 Subject: [PATCH] Fix hashtags being split by ZWNJ character (#11821) Fix #11761 --- app/models/tag.rb | 5 +++-- spec/models/tag_spec.rb | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/models/tag.rb b/app/models/tag.rb index 135e0a0306..a6aed0d68e 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -25,8 +25,9 @@ class Tag < ApplicationRecord has_many :featured_tags, dependent: :destroy, inverse_of: :tag has_one :account_tag_stat, dependent: :destroy - HASHTAG_NAME_RE = '([[:word:]_][[:word:]_·]*[[:alpha:]_·][[:word:]_·]*[[:word:]_])|([[:word:]_]*[[:alpha:]][[:word:]_]*)' - HASHTAG_RE = /(?:^|[^\/\)\w])#(#{HASHTAG_NAME_RE})/i + HASHTAG_SEPARATORS = "_\u00B7\u200c" + HASHTAG_NAME_RE = "([[:word:]_][[:word:]#{HASHTAG_SEPARATORS}]*[[:alpha:]#{HASHTAG_SEPARATORS}][[:word:]#{HASHTAG_SEPARATORS}]*[[:word:]_])|([[:word:]_]*[[:alpha:]][[:word:]_]*)" + HASHTAG_RE = /(?:^|[^\/\)\w])#(#{HASHTAG_NAME_RE})/i validates :name, presence: true, format: { with: /\A(#{HASHTAG_NAME_RE})\z/i } validate :validate_name_change, if: -> { !new_record? && name_changed? } diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb index 2bb30fb57f..df876593c9 100644 --- a/spec/models/tag_spec.rb +++ b/spec/models/tag_spec.rb @@ -62,6 +62,10 @@ RSpec.describe Tag, type: :model do expect(subject.match('hello #one·two·three').to_s).to eq ' #one·two·three' end + it 'matches ZWNJ' do + expect(subject.match('just add #نرم‌افزار and').to_s).to eq ' #نرم‌افزار' + end + it 'does not match middle dots at the start' do expect(subject.match('hello #·one·two·three')).to be_nil end