Skip to content
Snippets Groups Projects
Unverified Commit 0762258a authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub
Browse files

Fix hashtags being split by ZWNJ character (#11821)

Fix #11761
parent 59da5ccb
No related branches found
No related tags found
No related merge requests found
...@@ -25,8 +25,9 @@ class Tag < ApplicationRecord ...@@ -25,8 +25,9 @@ class Tag < ApplicationRecord
has_many :featured_tags, dependent: :destroy, inverse_of: :tag has_many :featured_tags, dependent: :destroy, inverse_of: :tag
has_one :account_tag_stat, dependent: :destroy has_one :account_tag_stat, dependent: :destroy
HASHTAG_NAME_RE = '([[:word:]_][[:word:]_·]*[[:alpha:]_·][[:word:]_·]*[[:word:]_])|([[:word:]_]*[[:alpha:]][[:word:]_]*)' HASHTAG_SEPARATORS = "_\u00B7\u200c"
HASHTAG_RE = /(?:^|[^\/\)\w])#(#{HASHTAG_NAME_RE})/i 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 } validates :name, presence: true, format: { with: /\A(#{HASHTAG_NAME_RE})\z/i }
validate :validate_name_change, if: -> { !new_record? && name_changed? } validate :validate_name_change, if: -> { !new_record? && name_changed? }
......
...@@ -62,6 +62,10 @@ RSpec.describe Tag, type: :model do ...@@ -62,6 +62,10 @@ RSpec.describe Tag, type: :model do
expect(subject.match('hello #one·two·three').to_s).to eq ' #one·two·three' expect(subject.match('hello #one·two·three').to_s).to eq ' #one·two·three'
end 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 it 'does not match middle dots at the start' do
expect(subject.match('hello #·one·two·three')).to be_nil expect(subject.match('hello #·one·two·three')).to be_nil
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment