github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 02:54:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: censored words should support * as wildcard

Browse Source
This commit is contained in:
Neil Lalonde
2018-01-09 15:51:47 -05:00
parent 61384c8026
commit ad62f1099c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/pretty-text/censored-words.js.es6
View File

@ -1,5 +1,5 @@
function escapeRegexp(text) { function escapeRegexp(text) {
return text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&'); return text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&').replace(/\*/g, "\S*");
} }
export function censorFn(censoredWords, censoredPattern, replacementLetter) { export function censorFn(censoredWords, censoredPattern, replacementLetter) {

5
test/javascripts/lib/pretty-text-test.js.es6
View File

@ -14,7 +14,7 @@ const rawOpts = {
default_code_lang: 'auto', default_code_lang: 'auto',
censored_pattern: '\\d{3}-\\d{4}|tech\\w*' censored_pattern: '\\d{3}-\\d{4}|tech\\w*'
}, },
censoredWords: 'shucks|whiz|whizzer|a**le', censoredWords: 'shucks|whiz|whizzer|a**le|badword*',
getURL: url => url getURL: url => url
}; };
@ -604,6 +604,9 @@ QUnit.test("censoring", assert => {
assert.cooked("I have a pen, I have an a**le", assert.cooked("I have a pen, I have an a**le",
"<p>I have a pen, I have an ■■■■■</p>", "<p>I have a pen, I have an ■■■■■</p>",
"it escapes regexp chars"); "it escapes regexp chars");
assert.cooked("No badword or apple here plz.",
"<p>No ■■■■■■■ or ■■■■■ here plz.</p>",
"it handles * as wildcard");
}); });
QUnit.test("code blocks/spans hoisting", assert => { QUnit.test("code blocks/spans hoisting", assert => {