IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Replace watched words with wildcards (#24279)

Browse Source 
These have been broken since fd07c943ad
because watched words were not correctly transformed to regexps.
This partially reverts the changes.
This commit is contained in:
Bianca Nenciu
2023-11-08 18:51:11 +02:00
committed by GitHub
parent e3f8e9c0fb
commit 277496b6e0
5 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse-common/addon/utils/watched-words.js
View File

@@ -5,5 +5,5 @@ export function createWatchedWordRegExp(word) {
export function toWatchedWord(regexp) {
const [[regexpString, options]] = Object.entries(regexp);
return { regexp: regexpString, ...options };
return { ...options, regexp: regexpString };
}

4
app/assets/javascripts/discourse-markdown-it/src/features/watched-words.js
View File

@@ -61,7 +61,7 @@ export function setup(helper) {
const word = toWatchedWord({ [regexpString]: options });
matchers.push({
word: new RegExp(options.word, options.case_sensitive ? "" : "i"),
word: new RegExp(options.regexp, options.case_sensitive ? "" : "i"),
pattern: createWatchedWordRegExp(word),
replacement: options.replacement,
link: false,
@@ -76,7 +76,7 @@ export function setup(helper) {
const word = toWatchedWord({ [regexpString]: options });
matchers.push({
word: new RegExp(options.word, options.case_sensitive ? "" : "i"),
word: new RegExp(options.regexp, options.case_sensitive ? "" : "i"),
pattern: createWatchedWordRegExp(word),
replacement: options.replacement,
link: true,