Merge branch 'master' into feat/death-message

destinygg · Dec 31, 2023 · 0d17cb4 · 0d17cb4
2 parents 63b32bd + 67fa2d4
commit 0d17cb4
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/assets/chat/js/formatters/UrlFormatter.js b/assets/chat/js/formatters/UrlFormatter.js
@@ -113,12 +113,16 @@ export default class UrlFormatter {
       return url.split('?')[0];
     }
 
-    if (/youtu(?:be\.com|\.be)/i.test(url)) {
+    if (/^(?:(?:https|http):\/\/)?(?:www\.)?youtu(?:be\.com|\.be)/i.test(url)) {
       // Same as with xeets, remove the nasty share tracking query param
       // from YouTube links.
-      const ytLink = new URL(url);
-      ytLink.searchParams.delete('si');
-      return ytLink.href;
+      try {
+        const ytLink = new URL(url);
+        ytLink.searchParams.delete('si');
+        return ytLink.href;
+      } catch {
+        return url;
+      }
     }
 
     return url;