Support s tags for strikethrough for Matrix v1.10 (#12604)

* Support s tags for strikethrough for Matrix v1.10 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update src/Linkify.tsx --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
matrix-org · Jun 13, 2024 · 21ae29c · 21ae29c
1 parent ccf751d
commit 21ae29c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx
@@ -124,6 +124,7 @@ const topicSanitizeHtmlParams: IExtendedSanitizeOptions = {
     allowedTags: [
         "font", // custom to matrix for IRC-style font coloring
         "del", // for markdown
+        "s",
         "a",
         "sup",
         "sub",

diff --git a/src/Linkify.tsx b/src/Linkify.tsx
@@ -147,8 +147,10 @@ export const transformTags: NonNullable<IExtendedSanitizeOptions["transformTags"
 
 export const sanitizeHtmlParams: IExtendedSanitizeOptions = {
     allowedTags: [
+        // These tags are suggested by the spec https://spec.matrix.org/v1.10/client-server-api/#mroommessage-msgtypes
         "font", // custom to matrix for IRC-style font coloring
         "del", // for markdown
+        "s",
         "h1",
         "h2",
         "h3",

diff --git a/src/Markdown.ts b/src/Markdown.ts
@@ -22,7 +22,7 @@ import { logger } from "matrix-js-sdk/src/logger";
 
 import { linkify } from "./linkify-matrix";
 
-const ALLOWED_HTML_TAGS = ["sub", "sup", "del", "u", "br", "br/"];
+const ALLOWED_HTML_TAGS = ["sub", "sup", "del", "s", "u", "br", "br/"];
 
 // These types of node are definitely text
 const TEXT_NODES = ["text", "softbreak", "linebreak", "paragraph", "document"];

diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts
@@ -195,6 +195,8 @@ function parseNode(n: Node, pc: PartCreator, opts: IParseOptions, mkListItem?: (
                     return [pc.plain("**"), ...parseChildren(n, pc, opts), pc.plain("**")];
                 case "DEL":
                     return [pc.plain("<del>"), ...parseChildren(n, pc, opts), pc.plain("</del>")];
+                case "S":
+                    return [pc.plain("<s>"), ...parseChildren(n, pc, opts), pc.plain("</s>")];
                 case "SUB":
                     return [pc.plain("<sub>"), ...parseChildren(n, pc, opts), pc.plain("</sub>")];
                 case "SUP":
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,6 +124,7 @@ const topicSanitizeHtmlParams: IExtendedSanitizeOptions = { @@
         allowedTags: [
             "font", // custom to matrix for IRC-style font coloring
             "del", // for markdown
+            "s",
             "a",
             "sup",
             "sub",
@@ Expand Down @@