From 597884832722f8692656af3fdd111020828b809e Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Mon, 30 Jan 2023 19:42:57 +0100
Subject: [PATCH] Properly rewrite channel descriptions

---
 src/components/ChannelPage.vue | 2 +-
 src/components/WatchVideo.vue  | 8 +-------
 src/main.js                    | 9 +++++++++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/components/ChannelPage.vue b/src/components/ChannelPage.vue
index 95bbdeef..75966797 100644
--- a/src/components/ChannelPage.vue
+++ b/src/components/ChannelPage.vue
@@ -10,7 +10,7 @@
         <img v-if="channel.bannerUrl" :src="channel.bannerUrl" class="w-full pb-1.5" loading="lazy" />
         <!-- eslint-disable-next-line vue/no-v-html -->
         <p class="whitespace-pre-wrap">
-            <span v-html="purifyHTML(urlify(channel.description))" />
+            <span v-html="purifyHTML(rewriteDescription(channel.description))" />
         </p>
 
         <button
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index 24dfca65..7af3e776 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -408,13 +408,7 @@ export default {
                                 elem.outerHTML = elem.getAttribute("href");
                         });
                         xmlDoc.querySelectorAll("br").forEach(elem => (elem.outerHTML = "\n"));
-                        this.video.description = this.urlify(xmlDoc.querySelector("body").innerHTML)
-                            .replaceAll(/(?:http(?:s)?:\/\/)?(?:www\.)?youtube\.com(\/[/a-zA-Z0-9_?=&-]*)/gm, "$1")
-                            .replaceAll(
-                                /(?:http(?:s)?:\/\/)?(?:www\.)?youtu\.be\/(?:watch\?v=)?([/a-zA-Z0-9_?=&-]*)/gm,
-                                "/watch?v=$1",
-                            )
-                            .replaceAll("\n", "<br>");
+                        this.video.description = this.rewriteDescription(xmlDoc.querySelector("body").innerHTML);
                     }
                 });
         },
diff --git a/src/main.js b/src/main.js
index 7aa789d9..19a037de 100644
--- a/src/main.js
+++ b/src/main.js
@@ -251,6 +251,15 @@ const mixin = {
             elem.click();
             elem.remove();
         },
+        rewriteDescription(text) {
+            return this.urlify(text)
+                .replaceAll(/(?:http(?:s)?:\/\/)?(?:www\.)?youtube\.com(\/[/a-zA-Z0-9_?=&-]*)/gm, "$1")
+                .replaceAll(
+                    /(?:http(?:s)?:\/\/)?(?:www\.)?youtu\.be\/(?:watch\?v=)?([/a-zA-Z0-9_?=&-]*)/gm,
+                    "/watch?v=$1",
+                )
+                .replaceAll("\n", "<br>");
+        },
     },
     computed: {
         authenticated(_this) {