From 6cd6bb1745e1e8c4430336c85cd977a5585683df Mon Sep 17 00:00:00 2001 From: neobooru <50623835+neobooru@users.noreply.github.com> Date: Mon, 1 Jan 2024 20:15:11 +0100 Subject: [PATCH] Add sensitive -> sketchy conversion for gelbooru --- package.json | 2 +- src/engines/Gelbooru.test.ts | 5 +++++ src/engines/Gelbooru.ts | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b7da2a2..a2b9794 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "neo-scraper", - "version": "0.7.3", + "version": "0.7.4", "description": "Scrape a booru-like post object from the DOM.", "type": "module", "main": "dist/index.js", diff --git a/src/engines/Gelbooru.test.ts b/src/engines/Gelbooru.test.ts index 68c8c4e..91dac4d 100644 --- a/src/engines/Gelbooru.test.ts +++ b/src/engines/Gelbooru.test.ts @@ -13,6 +13,7 @@ test("get safebooru.org post 2871532", async () => { expect(res.posts[0]).toHaveTag("long_hair"); expect(res.posts[0]).toHaveResolution([1142, 1600]); expect(res.posts[0].pageUrl).toBe(pageUrl); + expect(res.posts[0].rating).toBe("safe"); expect(res.posts[0].contentUrl).toBe( "https://safebooru.org//images/2757/5f19c7744db918c3d4c4c6035bc65dfa9e18866f.jpg" ); @@ -27,6 +28,7 @@ test("get gelbooru.com post 4925055", async () => { expect(res.posts[0]).toHaveResolution([720, 1103]); expect(res.posts[0]).toHaveSource("https://www.pixiv.net/artworks/76853958"); expect(res.posts[0].pageUrl).toBe(pageUrl); + expect(res.posts[0].rating).toBe("sketchy"); expect(res.posts[0].contentUrl).toBe("https://img3.gelbooru.com/images/3d/03/3d03f6858637805d6473d390a4b1d8c8.jpg"); }); @@ -47,6 +49,7 @@ test("get gelbooru.com post 6225495 with notes", async () => { expect(res.posts[0]).toHaveResolution([1600, 2200]); expect(res.posts[0]).toHaveSource("http://www.pixiv.net/member_illust.php?mode=medium&illust_id=88721816"); expect(res.posts[0].pageUrl).toBe(pageUrl); + expect(res.posts[0].rating).toBe("sketchy"); expect(res.posts[0].contentUrl).toBe("https://img3.gelbooru.com/images/af/1d/af1dd661fab6714dffc29cb38b6b2269.png"); }); @@ -61,6 +64,7 @@ test("get rule34.xxx post 2740994", async () => { expect(res.posts[0]).toHaveResolution([600, 800]); expect(res.posts.length).toBe(1); expect(res.posts[0].pageUrl).toBe(pageUrl); + expect(res.posts[0].rating).toBe("safe"); expect(res.posts[0].contentUrl).toContain(".rule34.xxx//images/2472/35bf31c98f53a369c047baf9bae496fb.jpeg"); }); @@ -75,5 +79,6 @@ test("get xbooru.com post 834083", async () => { expect(res.posts[0]).toHaveResolution([1024, 1878]); expect(res.posts.length).toBe(1); expect(res.posts[0].pageUrl).toBe(pageUrl); + expect(res.posts[0].rating).toBe("safe"); expect(res.posts[0].contentUrl).toBe("https://img.xbooru.com//images/584/040dc1625c094a7d5d7b0918aa0d8324.png"); }); diff --git a/src/engines/Gelbooru.ts b/src/engines/Gelbooru.ts index 7133e90..dc059d4 100644 --- a/src/engines/Gelbooru.ts +++ b/src/engines/Gelbooru.ts @@ -91,6 +91,7 @@ export default class Gelbooru extends ScrapeEngineBase { case "safe": post.rating = "safe"; break; + case "sensitive": case "questionable": post.rating = "sketchy"; break;