github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 11:13:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Replace censored watched word consistently (#12486)

Browse Source 
Applying oneboxes and replacing censored watched words does not happen
in a strict order which often lead to inconsistencies. This commit
fixes the behavior and will never censor oneboxes.

To make it always censor oneboxes implies significant changes to the
PrettyText pipeline.
This commit is contained in:
Bianca Nenciu 2021-03-23 13:09:24 +02:00 committed by GitHub
parent deb9e3cd22
commit d7bd62d9cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,10 @@ import { censorFn } from "pretty-text/censored-words";
function recurse(tokens, apply) {
let i;
for (i = 0; i < tokens.length; i++) {
if (tokens[i].type === "html_raw" && tokens[i].onebox) {
continue;
}
apply(tokens[i]);
if (tokens[i].children) {
recurse(tokens[i].children, apply);

1
app/assets/javascripts/pretty-text/engines/discourse-markdown/onebox.js
View File

@ -81,6 +81,7 @@ function applyOnebox(state, silent) {
child.type = "html_raw";
child.content = cached;
child.inline = true;
child.onebox = true;
text.type = "html_raw";
text.content = "";