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: support for watched_words_regular_expressions when censoring words

Browse Source
This commit is contained in:
Neil Lalonde
2018-01-10 14:11:14 -05:00
parent 213cc2fe51
commit edb3a7f646
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,14 +2,17 @@ function escapeRegexp(text) {
return text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&').replace(/\*/g, "\S*");
}
export function censorFn(censoredWords, censoredPattern, replacementLetter) {
export function censorFn(censoredWords, censoredPattern, replacementLetter, watchedWordsRegularExpressions) {
let patterns = [];
replacementLetter = replacementLetter || "■";
if (censoredWords && censoredWords.length) {
patterns = censoredWords.split("|").map(t => `(${escapeRegexp(t)})`);
patterns = censoredWords.split("|");
if (!watchedWordsRegularExpressions) {
patterns = patterns.map(t => `(${escapeRegexp(t)})`);
}
}
if (censoredPattern && censoredPattern.length > 0) {
@@ -20,7 +23,11 @@ export function censorFn(censoredWords, censoredPattern, replacementLetter) {
let censorRegexp;
try {
censorRegexp = new RegExp("(\\b(?:" + patterns.join("|") + ")\\b)(?![^\\(]*\\))", "ig");
if (watchedWordsRegularExpressions) {
censorRegexp = new RegExp("((?:" + patterns.join("|") + "))(?![^\\(]*\\))", "ig");
} else {
censorRegexp = new RegExp("(\\b(?:" + patterns.join("|") + ")\\b)(?![^\\(]*\\))", "ig");
}
if (censorRegexp) {
@@ -33,7 +40,11 @@ export function censorFn(censoredWords, censoredPattern, replacementLetter) {
while (m && m[0]) {
if (m[0].length > original.length) { return original; } // regex is dangerous
const replacement = new Array(m[0].length+1).join(replacementLetter);
text = text.replace(new RegExp(`(\\b${escapeRegexp(m[0])}\\b)(?![^\\(]*\\))`, "ig"), replacement);
if (watchedWordsRegularExpressions) {
text = text.replace(new RegExp(`(${escapeRegexp(m[0])})(?![^\\(]*\\))`, "ig"), replacement);
} else {
text = text.replace(new RegExp(`(\\b${escapeRegexp(m[0])}\\b)(?![^\\(]*\\))`, "ig"), replacement);
}
m = censorRegexp.exec(text);
}

3
app/assets/javascripts/pretty-text/engines/discourse-markdown/censored.js.es6
View File

@@ -25,6 +25,7 @@ function censorTree(state, censor) {
export function setup(helper) {
helper.registerOptions((opts, siteSettings) => {
opts.censoredPattern = siteSettings.censored_pattern;
opts.watchedWordsRegularExpressions = siteSettings.watched_words_regular_expressions;
});
helper.registerPlugin(md => {
@@ -33,7 +34,7 @@ export function setup(helper) {
if ((words && words.length > 0) || (patterns && patterns.length > 0)) {
const replacement = String.fromCharCode(9632);
const censor = censorFn(words, patterns, replacement);
const censor = censorFn(words, patterns, replacement, md.options.discourse.watchedWordsRegularExpressions);
md.core.ruler.push('censored', state => censorTree(state, censor));
}
});