Merge branch 'master' of https://github.com/misskey-dev/summaly

misskey-dev · Mar 16, 2023 · 1bab7af · 1bab7af
2 parents 441e8c2 + 376bba9
commit 1bab7af
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 44 deletions.
diff --git a/built/general.js b/built/general.js
@@ -15,7 +15,21 @@ async function getOEmbedPlayer($, pageUrl) {
     if (!href) {
         return null;
     }
-    const oEmbed = await get((new URL(href, pageUrl)).href);
+    const oEmbedUrl = (() => {
+        try {
+            return new URL(href, pageUrl);
+        }
+        catch {
+            return null;
+        }
+    })();
+    if (!oEmbedUrl) {
+        return null;
+    }
+    const oEmbed = await get(oEmbedUrl.href).catch(() => null);
+    if (!oEmbed) {
+        return null;
+    }
     const body = (() => {
         try {
             return JSON.parse(oEmbed);

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/general.ts b/src/general.ts
@@ -20,7 +20,20 @@ async function getOEmbedPlayer($: cheerio.CheerioAPI, pageUrl: string): Promise<
 		return null;
 	}
 
-	const oEmbed = await get((new URL(href, pageUrl)).href);
+	const oEmbedUrl = (() => {
+		try {
+			return new URL(href, pageUrl);
+		} catch { return null }
+	})();
+	if (!oEmbedUrl) {
+		return null;
+	}
+
+	const oEmbed = await get(oEmbedUrl.href).catch(() => null);
+	if (!oEmbed) {
+		return null;
+	}
+
 	const body = (() => {
 		try {
 			return JSON.parse(oEmbed);

diff --git a/test/htmls/oembed-nonexistent-path.html b/test/htmls/oembed-nonexistent-path.html
@@ -1,2 +1,3 @@
 <!DOCTYPE html>
 <link type="application/json+oembed" href="http://localhost:3060/oembe.json" />
+<meta property="og:description" content="nonexistent">
diff --git a/test/htmls/oembed-wrong-path.html b/test/htmls/oembed-wrong-path.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<link type="application/json+oembed" href="http://localhost:+3060/oembed.json" />
+<meta property="og:description" content="wrong url">
diff --git a/test/htmls/oembed-wrong.html b/test/htmls/oembed-wrong.html
diff --git a/test/index.ts b/test/index.ts
@@ -322,12 +322,16 @@ describe("oEmbed", () => {
 
 	test('oEmbed with nonexistent path', async () => {
 		await setUpFastify('oembed.json', 'htmls/oembed-nonexistent-path.html');
-		await expect(summaly(host)).rejects.toThrow('404 Not Found');
+		const summary = await summaly(host);
+		expect(summary.player.url).toBe(null);
+		expect(summary.description).toBe('nonexistent');
 	});
 
 	test('oEmbed with wrong path', async () => {
 		await setUpFastify('oembed.json', 'htmls/oembed-wrong-path.html');
-		await expect(summaly(host)).rejects.toThrow();
+		const summary = await summaly(host);
+		expect(summary.player.url).toBe(null);
+		expect(summary.description).toBe('wrong url');
 	});
 
 	test('oEmbed with OpenGraph', async () => {