Skip to content
This repository has been archived by the owner on May 27, 2022. It is now read-only.

Commit

Permalink
FIX: Do not replace in mentions and hashtags (discourse#14260)
Browse files Browse the repository at this point in the history
Watched words of type 'replace' or 'link' replaced the text inside
mentions or hashtags too, which broke these. These types of watched
words must skip any match that has an @ or # before it.
  • Loading branch information
nbianca authored Sep 9, 2021
1 parent 7b77dd5 commit 0532a5a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ export function setup(helper) {
continue;
}

if (
matches[ln].index > 0 &&
(text[matches[ln].index - 1] === "@" ||
text[matches[ln].index - 1] === "#")
) {
continue;
}

if (matches[ln].index > lastPos) {
token = new state.Token("text", "", 0);
token.content = text.slice(lastPos, matches[ln].index);
Expand Down
14 changes: 14 additions & 0 deletions spec/components/pretty_text_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1465,6 +1465,20 @@ def expect_cooked_match(raw, expected_cooked)
expect(PrettyText.cook("f.o")).to match_html("<p>test</p>")
end

it "does not replace hashtags and mentions" do
Fabricate(:user, username: "test")
category = Fabricate(:category, slug: "test")
Fabricate(:watched_word, action: WatchedWord.actions[:replace], word: "test", replacement: "discourse")

expect(PrettyText.cook("@test #test test")).to match_html(<<~HTML)
<p>
<a class="mention" href="/u/test">@test</a>
<a class="hashtag" href="/c/test/#{category.id}">#<span>test</span></a>
discourse
</p>
HTML
end

it "supports overlapping words" do
Fabricate(:watched_word, action: WatchedWord.actions[:link], word: "meta", replacement: "https://meta.discourse.org")
Fabricate(:watched_word, action: WatchedWord.actions[:replace], word: "iz", replacement: "is")
Expand Down

0 comments on commit 0532a5a

Please sign in to comment.