fix: crash with invalid url as link (#1791)

aeharding · Dec 22, 2024 · 7b3c388 · 7b3c388
1 parent cbd7297
commit 7b3c388
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/features/comment/CommentLinks.tsx b/src/features/comment/CommentLinks.tsx
@@ -8,6 +8,7 @@ import { SKIP, visit } from "unist-util-visit";
 
 import CommentLink from "#/features/post/link/CommentLink";
 import customRemarkGfm from "#/features/shared/markdown/customRemarkGfm";
+import { parseUrl } from "#/helpers/url";
 import { buildBaseLemmyUrl } from "#/services/lemmy";
 import { useAppSelector } from "#/store";
 
@@ -54,7 +55,7 @@ export default function CommentLinks({ markdown }: CommentLinksProps) {
         links.push({
           type: node.type,
           // normalize relative links
-          url: new URL(node.url, connectedInstanceUrl).href,
+          url: parseUrl(node.url, connectedInstanceUrl)?.href ?? node.url,
           text:
             "children" in node ? (node.children[0] as Text)?.value : undefined,
         });

diff --git a/src/helpers/url.ts b/src/helpers/url.ts
@@ -26,9 +26,9 @@ export function getPathname(url: string): string | undefined {
   }
 }
 
-export function parseUrl(url: string): URL | undefined {
+export function parseUrl(url: string, baseUrl?: string): URL | undefined {
   try {
-    return new URL(url);
+    return new URL(url, baseUrl);
   } catch {
     return;
   }