From 21ae29c002afb6fe1d3b93345ea4e6d00e1198df Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 13 Jun 2024 14:44:48 +0100
Subject: [PATCH] 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>
---
 src/HtmlUtils.tsx         | 1 +
 src/Linkify.tsx           | 2 ++
 src/Markdown.ts           | 2 +-
 src/editor/deserialize.ts | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/HtmlUtils.tsx b/src/HtmlUtils.tsx
index b63ed1dcf0..655be4ac92 100644
--- 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
index 24a8a153c5..910acc9dde 100644
--- 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
index 0d33e58b6f..cf57f93542 100644
--- 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
index 1d2d1f6b29..c3eccf718c 100644
--- 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":