test times
"); + assert.cookedOptions("test fun funny", opts, "test times funny
"); }); test("watched words link", function (assert) { const opts = { - watchedWordsLink: { fun: "https://discourse.org" }, + watchedWordsLink: { "(?:\\W|^)(fun)(?=\\W|$)": "https://discourse.org" }, }; assert.cookedOptions( - "test fun", + "test fun funny", opts, - 'test fun
' + 'test fun funny
' ); }); @@ -1697,7 +1697,7 @@ var bar = 'bar'; const maxMatches = 100; // same limit as MD watched-words-replace plugin const opts = { siteSettings: { watched_words_regular_expressions: true }, - watchedWordsReplace: { "\\bu?\\b": "you" }, + watchedWordsReplace: { "(\\bu?\\b)": "you" }, }; assert.cookedOptions( diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/watched-words.js b/app/assets/javascripts/pretty-text/engines/discourse-markdown/watched-words.js index c8ad08a0c01..cce39254b90 100644 --- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/watched-words.js +++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/watched-words.js @@ -20,8 +20,8 @@ function findAllMatches(text, matchers) { count++ < MAX_MATCHES ) { matches.push({ - index: match.index, - text: match[0], + index: match.index + match[0].indexOf(match[1]), + text: match[1], replacement: matcher.replacement, link: matcher.link, }); diff --git a/app/serializers/watched_word_serializer.rb b/app/serializers/watched_word_serializer.rb index 4b3b138be0a..070da701fd2 100644 --- a/app/serializers/watched_word_serializer.rb +++ b/app/serializers/watched_word_serializer.rb @@ -4,7 +4,7 @@ class WatchedWordSerializer < ApplicationSerializer attributes :id, :word, :regexp, :replacement, :action def regexp - WordWatcher.word_to_regexp(word) + WordWatcher.word_to_regexp(word, whole: true) end def action diff --git a/app/services/word_watcher.rb b/app/services/word_watcher.rb index 36699140f0c..1927ac9474b 100644 --- a/app/services/word_watcher.rb +++ b/app/services/word_watcher.rb @@ -54,17 +54,26 @@ class WordWatcher def self.word_matcher_regexps(action) if words = get_cached_words(action) - words.map { |w, r| [word_to_regexp(w), r] }.to_h + words.map { |w, r| [word_to_regexp(w, whole: true), r] }.to_h end end - def self.word_to_regexp(word) + def self.word_to_regexp(word, whole: false) if SiteSetting.watched_words_regular_expressions? # Strip ruby regexp format if present, we're going to make the whole thing # case insensitive anyway - return word.start_with?("(?-mix:") ? word[7..-2] : word + regexp = word.start_with?("(?-mix:") ? word[7..-2] : word + regexp = "(#{regexp})" if whole + return regexp end - Regexp.escape(word).gsub("\\*", '\S*') + + regexp = Regexp.escape(word).gsub("\\*", '\S*') + + if whole && !SiteSetting.watched_words_regular_expressions? + regexp = "(?:\\W|^)(#{regexp})(?=\\W|$)" + end + + regexp end def self.word_matcher_regexp_key(action) @@ -144,6 +153,6 @@ class WordWatcher end def word_matches?(word) - Regexp.new(WordWatcher.word_to_regexp(word), Regexp::IGNORECASE).match?(@raw) + Regexp.new(WordWatcher.word_to_regexp(word, whole: true), Regexp::IGNORECASE).match?(@raw) end end diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb index 5827de6ad0c..e01db2b312e 100644 --- a/spec/components/post_creator_spec.rb +++ b/spec/components/post_creator_spec.rb @@ -502,13 +502,21 @@ describe PostCreator do end context "without regular expressions" do - it "works" do + it "works with many tags" do Fabricate(:watched_word, action: WatchedWord.actions[:tag], word: "HELLO", replacement: "greetings , hey") @post = creator.create expect(@post.topic.tags.map(&:name)).to match_array(['greetings', 'hey']) end + it "works with overlapping words" do + Fabricate(:watched_word, action: WatchedWord.actions[:tag], word: "art", replacement: "about-art") + Fabricate(:watched_word, action: WatchedWord.actions[:tag], word: "artist*", replacement: "about-artists") + + post = PostCreator.new(user, title: "hello world topic", raw: "this is topic abour artists", archetype_id: 1).create + expect(post.topic.tags.map(&:name)).to match_array(['about-artists']) + end + it "does not treat as regular expressions" do Fabricate(:watched_word, action: WatchedWord.actions[:tag], word: "he(llo|y)", replacement: "greetings , hey") diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 0d538809663..3d31c1ae1e3 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -1420,6 +1420,10 @@ HTML expect(PrettyText.cook("Lorem ipsum dolor sittt amet")).to match_html(<<~HTML)Lorem ipsum something else amet
HTML + + expect(PrettyText.cook("Lorem ipsum xdolor sit amet")).to match_html(<<~HTML) +Lorem ipsum xdolor sit amet
+ HTML end it "replaces words with links" do