From c0bfb3c1b4c35763667f678eea62507597f358c9 Mon Sep 17 00:00:00 2001 From: fzzinchemical Date: Thu, 10 Apr 2025 17:17:10 +0200 Subject: [PATCH 1/2] move api tests to different location --- src/plugins/yandere/api/api.ts | 18 +----------------- src/plugins/yandere/test.ts | 32 -------------------------------- src/plugins/yandere/tests/api.ts | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 49 deletions(-) create mode 100644 src/plugins/yandere/tests/api.ts diff --git a/src/plugins/yandere/api/api.ts b/src/plugins/yandere/api/api.ts index 69400df..15d705e 100644 --- a/src/plugins/yandere/api/api.ts +++ b/src/plugins/yandere/api/api.ts @@ -53,20 +53,4 @@ function prepareURLObjectForRequest(type: APIKeys) { export function getPosts(search? : string){ const url = prepareURLObjectForRequest("post") return handlePostRequest(url, search) -} - -Deno.test("Empty Post Request", async() => { - console.debug(await getPosts()) -}) - -Deno.test("Post Request with tag", async() => { - console.debug(await getPosts("[tags:love_live!_(series)]")) -}) - -Deno.test("Post Request with limit", async() => { - console.debug(await getPosts("[limit: 1)]")) -}) - -Deno.test("Post Request with page", async() => { - console.debug(await getPosts("[page: 30)]")) -}) \ No newline at end of file +} \ No newline at end of file diff --git a/src/plugins/yandere/test.ts b/src/plugins/yandere/test.ts index 2545218..e69de29 100644 --- a/src/plugins/yandere/test.ts +++ b/src/plugins/yandere/test.ts @@ -1,32 +0,0 @@ -import { assert } from "@std/assert/assert"; -import { - dropYandere, - getPage, - refresh, - setPage, -} from "./api/api.ts"; -import { assertEquals } from "@std/assert/equals"; -//tests -/* -get page, -switch page, -drop, - */ - -Deno.test("Get default Page", async () => { - assertEquals(getPage(), 1); -}); - -Deno.test("Switching page", async () => { - assertEquals(getPage(), 1); - await setPage(2); - assertEquals(getPage(), 2); - await setPage(100); - assertEquals(getPage(), 100); -}); - -Deno.test("Test Drop", async () => { - await refresh(); - const link = await dropYandere(); - assert(link !== "", "Empty String was dropped!"); -}); diff --git a/src/plugins/yandere/tests/api.ts b/src/plugins/yandere/tests/api.ts new file mode 100644 index 0000000..ba02bd3 --- /dev/null +++ b/src/plugins/yandere/tests/api.ts @@ -0,0 +1,17 @@ +import { getPosts } from "@root/plugins/yandere/api/api.ts" + +Deno.test("Empty Post Request", async() => { + console.debug(await getPosts()) +}) + +Deno.test("Post Request with tag", async() => { + console.debug(await getPosts("[tags:love_live!_(series)]")) +}) + +Deno.test("Post Request with limit", async() => { + console.debug(await getPosts("[limit: 1)]")) +}) + +Deno.test("Post Request with page", async() => { + console.debug(await getPosts("[page: 30)]")) +}) \ No newline at end of file From 485432ce48bc137fdb6b7fcf944a81532cbc103c Mon Sep 17 00:00:00 2001 From: fzzinchemical Date: Thu, 10 Apr 2025 18:07:07 +0200 Subject: [PATCH 2/2] refactor: improve embed handling in yandereMessageHandler --- src/plugins/yandere/messages.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/yandere/messages.ts b/src/plugins/yandere/messages.ts index dbd35d2..b47e149 100644 --- a/src/plugins/yandere/messages.ts +++ b/src/plugins/yandere/messages.ts @@ -1,16 +1,16 @@ -import { Bot, Embed, Message } from "npm:discordeno@18.0.1"; +import { Bot, Message, transformEmbed } from "npm:discordeno@18.0.1"; import { defaultString } from "@root/defaultString.ts"; import { logMessage } from "@root/logging.ts"; import { getPosts } from "@root/plugins/yandere/api/api.ts"; -import { debug } from "node:console"; export async function yandereMessageHandler(bot: Bot, message: Message) { const command = message.content.split(" ").slice(1).join(" "); const args = command.match(/(\[\.+\])/g) if (command === "drop") { - const embed = await getPosts("[limit: 1]") + const embed = (await getPosts("[limit: 1]"))[0] + if (embed === undefined) throw Error("undefined embed") bot.helpers.sendMessage(message.channelId, { - embeds: [embed as Embed] + embeds: [transformEmbed(bot, embed)] }) } else if (command.startsWith("drop [") && command.endsWith("]")) { logMessage(message); @@ -18,7 +18,7 @@ export async function yandereMessageHandler(bot: Bot, message: Message) { const generatedEmbeds = await getPosts(args[0]); for (const embed of generatedEmbeds) { bot.helpers.sendMessage(message.channelId, { - embeds: [embed as Embed], + embeds: [transformEmbed(bot, embed)], }); } }