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

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));
}
});