From 2775b49ce7dca0a7aab2cfcf928c40a70054905a Mon Sep 17 00:00:00 2001
From: keyan <keyan.kousha+huumn@gmail.com>
Date: Tue, 4 Jun 2024 12:10:37 -0500
Subject: [PATCH] fix inconsistency in url handling and don't let parseEmbedURL
 throw

---
 components/text.js | 58 ++++++++++++++++++--------------------
 lib/url.js         | 69 +++++++++++++++++++++++++++++-----------------
 2 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/components/text.js b/components/text.js
index 19f02744..59da392e 100644
--- a/components/text.js
+++ b/components/text.js
@@ -259,39 +259,35 @@ export default memo(function Text ({ rel, imgproxyUrls, children, tab, itemId, o
               paddingRight: '15px'
             }
 
-            try {
-              const { provider, id, meta } = parseEmbedUrl(href)
-              // Youtube video embed
-              if (provider === 'youtube') {
-                return (
-                  <div style={videoWrapperStyles}>
-                    <YouTube
-                      videoId={id} className={styles.videoContainer} opts={{
-                        playerVars: {
-                          start: meta?.start || 0
-                        }
-                      }}
+            const { provider, id, meta } = parseEmbedUrl(href)
+            // Youtube video embed
+            if (provider === 'youtube') {
+              return (
+                <div style={videoWrapperStyles}>
+                  <YouTube
+                    videoId={id} className={styles.videoContainer} opts={{
+                      playerVars: {
+                        start: meta?.start || 0
+                      }
+                    }}
+                  />
+                </div>
+              )
+            }
+
+            // Rumble video embed
+            if (provider === 'rumble') {
+              return (
+                <div style={videoWrapperStyles}>
+                  <div className={styles.videoContainer}>
+                    <iframe
+                      title='Rumble Video'
+                      allowFullScreen=''
+                      src={meta?.href}
                     />
                   </div>
-                )
-              }
-
-              // Rumble video embed
-              if (provider === 'rumble') {
-                return (
-                  <div style={videoWrapperStyles}>
-                    <div className={styles.videoContainer}>
-                      <iframe
-                        title='Rumble Video'
-                        allowFullScreen=''
-                        src={meta?.href}
-                      />
-                    </div>
-                  </div>
-                )
-              }
-            } catch {
-            // ignore invalid URLs
+                </div>
+              )
             }
 
             // assume the link is an image which will fallback to link if it's not
diff --git a/lib/url.js b/lib/url.js
index 371b0275..2f67fce0 100644
--- a/lib/url.js
+++ b/lib/url.js
@@ -1,10 +1,23 @@
 export function ensureProtocol (value) {
   if (!value) return value
   value = value.trim()
-  if (!/^([a-z0-9]+:\/\/|mailto:)/.test(value)) {
-    value = 'http://' + value
+  let url
+
+  try {
+    url = new URL(value)
+  } catch {
+    try {
+      url = new URL('http://' + value)
+    } catch {
+      return value
+    }
   }
-  return value
+
+  // remove trailing slash if new URL() added it
+  if (url.href.endsWith('/') && !value.endsWith('/')) {
+    return url.href.slice(0, -1)
+  }
+  return url.href
 }
 
 export function isExternal (url) {
@@ -63,38 +76,42 @@ export function parseInternalLinks (href) {
 }
 
 export function parseEmbedUrl (href) {
-  const { hostname, pathname, searchParams } = new URL(href)
+  try {
+    const { hostname, pathname, searchParams } = new URL(href)
 
-  if (hostname.endsWith('youtube.com') && pathname.includes('/watch')) {
-    return {
-      provider: 'youtube',
-      id: searchParams.get('v'),
-      meta: {
-        href,
-        start: searchParams.get('t')
+    if (hostname.endsWith('youtube.com') && pathname.includes('/watch')) {
+      return {
+        provider: 'youtube',
+        id: searchParams.get('v'),
+        meta: {
+          href,
+          start: searchParams.get('t')
+        }
       }
     }
-  }
 
-  if (hostname.endsWith('youtu.be') && pathname.length > 1) {
-    return {
-      provider: 'youtube',
-      id: pathname.slice(1), // remove leading slash
-      meta: {
-        href,
-        start: searchParams.get('t')
+    if (hostname.endsWith('youtu.be') && pathname.length > 1) {
+      return {
+        provider: 'youtube',
+        id: pathname.slice(1), // remove leading slash
+        meta: {
+          href,
+          start: searchParams.get('t')
+        }
       }
     }
-  }
 
-  if (hostname.endsWith('rumble.com') && pathname.includes('/embed')) {
-    return {
-      provider: 'rumble',
-      id: null, // not required
-      meta: {
-        href
+    if (hostname.endsWith('rumble.com') && pathname.includes('/embed')) {
+      return {
+        provider: 'rumble',
+        id: null, // not required
+        meta: {
+          href
+        }
       }
     }
+  } catch {
+    // ignore
   }
 
   // Important to return empty object as default