diff --git a/.env.example b/.env.example index e37a3a0..7f873ca 100644 --- a/.env.example +++ b/.env.example @@ -7,7 +7,7 @@ # any secret values. BOT_TOKEN= -BOT_VER=0.8.2 +BOT_VER=0.8.3 BOT_AUTHOR=Vylpes BOT_OWNERID=147392775707426816 BOT_CLIENTID=682942374040961060 diff --git a/package.json b/package.json index 0dc2630..32242a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "card-drop", - "version": "0.8.2", + "version": "0.8.3", "main": "./dist/bot.js", "typings": "./dist", "scripts": { diff --git a/src/buttonEvents/Effects.ts b/src/buttonEvents/Effects.ts index f185009..0f9686b 100644 --- a/src/buttonEvents/Effects.ts +++ b/src/buttonEvents/Effects.ts @@ -2,6 +2,7 @@ import { ButtonInteraction } from "discord.js"; import { ButtonEvent } from "../type/buttonEvent"; import List from "./Effects/List"; import Use from "./Effects/Use"; +import AppLogger from "../client/appLogger"; export default class Effects extends ButtonEvent { public override async execute(interaction: ButtonInteraction) { @@ -14,6 +15,8 @@ export default class Effects extends ButtonEvent { case "use": await Use.Execute(interaction); break; + default: + AppLogger.LogError("Buttons/Effects", `Unknown action, ${action}`); } } } diff --git a/src/buttonEvents/Reroll.ts b/src/buttonEvents/Reroll.ts index 814cccc..619fe2a 100644 --- a/src/buttonEvents/Reroll.ts +++ b/src/buttonEvents/Reroll.ts @@ -52,10 +52,17 @@ export default class Reroll extends ButtonEvent { try { AppLogger.LogVerbose("Button/Reroll", `Sending next drop: ${randomCard.card.id} (${randomCard.card.name})`); - const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path)); - const imageFileName = randomCard.card.path.split("/").pop()!; + const files = []; + let imageFileName = ""; - const attachment = new AttachmentBuilder(image, { name: imageFileName }); + if (!(randomCard.card.path.startsWith("http://") || randomCard.card.path.startsWith("https://"))) { + const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path)); + imageFileName = randomCard.card.path.split("/").pop()!; + + const attachment = new AttachmentBuilder(image, { name: imageFileName }); + + files.push(attachment); + } const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id); const quantityClaimed = inventory ? inventory.Quantity : 0; @@ -68,7 +75,7 @@ export default class Reroll extends ButtonEvent { await interaction.editReply({ embeds: [ embed ], - files: [ attachment ], + files: files, components: [ row ], }); diff --git a/src/buttonEvents/View.ts b/src/buttonEvents/View.ts index f79a1af..007a911 100644 --- a/src/buttonEvents/View.ts +++ b/src/buttonEvents/View.ts @@ -19,7 +19,7 @@ export default class View extends ButtonEvent { await interaction.editReply({ embeds: [ searchResult.embed ], components: [ searchResult.row ], - files: [ searchResult.attachment ], + files: searchResult.attachments, }); } } diff --git a/src/commands/drop.ts b/src/commands/drop.ts index bd4d3f6..f2ea2f5 100644 --- a/src/commands/drop.ts +++ b/src/commands/drop.ts @@ -70,10 +70,17 @@ export default class Drop extends Command { await interaction.deferReply(); try { - const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path)); - const imageFileName = randomCard.card.path.split("/").pop()!; + const files = []; + let imageFileName = ""; - const attachment = new AttachmentBuilder(image, { name: imageFileName }); + if (!(randomCard.card.path.startsWith("http://") || randomCard.card.path.startsWith("https://"))) { + const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path)); + imageFileName = randomCard.card.path.split("/").pop()!; + + const attachment = new AttachmentBuilder(image, { name: imageFileName }); + + files.push(attachment); + } const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id); const quantityClaimed = inventory ? inventory.Quantity : 0; @@ -86,7 +93,7 @@ export default class Drop extends Command { await interaction.editReply({ embeds: [ embed ], - files: [ attachment ], + files: files, components: [ row ], }); diff --git a/src/commands/id.ts b/src/commands/id.ts index 072553d..0f11aaa 100644 --- a/src/commands/id.ts +++ b/src/commands/id.ts @@ -43,22 +43,20 @@ export default class Id extends Command { const series = CoreClient.Cards .find(x => x.cards.includes(card))!; - let image: Buffer; - const imageFileName = card.path.split("/").pop()!; + const files = []; + let imageFileName = ""; - try { - image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path)); - } catch { - AppLogger.LogError("Commands/View", `Unable to fetch image for card ${card.id}.`); + if (!(card.path.startsWith("http://") || card.path.startsWith("https://"))) { + const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path)); + imageFileName = card.path.split("/").pop()!; - await interaction.reply(`Unable to fetch image for card ${card.id}.`); - return; + const attachment = new AttachmentBuilder(image, { name: imageFileName }); + + files.push(attachment); } await interaction.deferReply(); - const attachment = new AttachmentBuilder(image, { name: imageFileName }); - const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.id); const quantityClaimed = inventory ? inventory.Quantity : 0; @@ -67,7 +65,7 @@ export default class Id extends Command { try { await interaction.editReply({ embeds: [ embed ], - files: [ attachment ], + files: files, }); } catch (e) { AppLogger.LogError("Commands/View", `Error sending view for card ${card.id}: ${e}`); diff --git a/src/commands/stage/dropnumber.ts b/src/commands/stage/dropnumber.ts index 6819a5c..f9391d2 100644 --- a/src/commands/stage/dropnumber.ts +++ b/src/commands/stage/dropnumber.ts @@ -43,20 +43,20 @@ export default class Dropnumber extends Command { const series = CoreClient.Cards .find(x => x.cards.includes(card))!; - let image: Buffer; - const imageFileName = card.path.split("/").pop()!; + const files = []; + let imageFileName = ""; - try { - image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path)); - } catch { - await interaction.reply(`Unable to fetch image for card ${card.id}`); - return; + if (!(card.path.startsWith("http://") || card.path.startsWith("https://"))) { + const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path)); + imageFileName = card.path.split("/").pop()!; + + const attachment = new AttachmentBuilder(image, { name: imageFileName }); + + files.push(attachment); } await interaction.deferReply(); - const attachment = new AttachmentBuilder(image, { name: imageFileName }); - const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.id); const quantityClaimed = inventory ? inventory.Quantity : 0; @@ -69,7 +69,7 @@ export default class Dropnumber extends Command { try { await interaction.editReply({ embeds: [ embed ], - files: [ attachment ], + files: files, components: [ row ], }); } catch (e) { diff --git a/src/commands/stage/droprarity.ts b/src/commands/stage/droprarity.ts index 517a443..75f8a7f 100644 --- a/src/commands/stage/droprarity.ts +++ b/src/commands/stage/droprarity.ts @@ -47,20 +47,18 @@ export default class Droprarity extends Command { return; } - let image: Buffer; - const imageFileName = card.card.path.split("/").pop()!; + const files = []; + let imageFileName = ""; - try { - image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path)); - } catch { - await interaction.reply(`Unable to fetch image for card ${card.card.id}`); - return; + if (!(card.card.path.startsWith("http://") || card.card.path.startsWith("https://"))) { + const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path)); + imageFileName = card.card.path.split("/").pop()!; + + const attachment = new AttachmentBuilder(image, { name: imageFileName }); + + files.push(attachment); } - await interaction.deferReply(); - - const attachment = new AttachmentBuilder(image, { name: imageFileName }); - const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.card.id); const quantityClaimed = inventory ? inventory.Quantity : 0; @@ -73,7 +71,7 @@ export default class Droprarity extends Command { try { await interaction.editReply({ embeds: [ embed ], - files: [ attachment ], + files: files, components: [ row ], }); } catch (e) { diff --git a/src/commands/view.ts b/src/commands/view.ts index 3ba5621..9a1d447 100644 --- a/src/commands/view.ts +++ b/src/commands/view.ts @@ -34,7 +34,7 @@ export default class View extends Command { await interaction.editReply({ embeds: [ searchResult.embed ], components: [ searchResult.row ], - files: [ searchResult.attachment ], + files: searchResult.attachments, }); } } \ No newline at end of file diff --git a/src/helpers/CardSearchHelper.ts b/src/helpers/CardSearchHelper.ts index 6e848f4..df0265c 100644 --- a/src/helpers/CardSearchHelper.ts +++ b/src/helpers/CardSearchHelper.ts @@ -11,7 +11,7 @@ import DropEmbedHelper from "./DropHelpers/DropEmbedHelper.js"; interface ReturnedPage { embed: EmbedBuilder, row: ActionRowBuilder, - attachment: AttachmentBuilder, + attachments: AttachmentBuilder[], results: string[], } @@ -37,19 +37,18 @@ export default class CardSearchHelper { if (!card) return undefined; - let image: Buffer; - const imageFileName = card.card.path.split("/").pop()!; + const attachments = []; + let imageFileName = ""; - try { - image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path)); - } catch { - AppLogger.LogError("CardSearchHelper/GenerateSearchQuery", `Unable to fetch image for card ${card.card.id}.`); + if (!(card.card.path.startsWith("http://") || card.card.path.startsWith("https://"))) { + const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path)); + imageFileName = card.card.path.split("/").pop()!; - return undefined; + const attachment = new AttachmentBuilder(image, { name: imageFileName }); + + attachments.push(attachment); } - const attachment = new AttachmentBuilder(image, { name: imageFileName }); - const inventory = await Inventory.FetchOneByCardNumberAndUserId(userid, card.card.id); const quantityClaimed = inventory?.Quantity ?? 0; @@ -68,7 +67,7 @@ export default class CardSearchHelper { .setStyle(ButtonStyle.Primary) .setDisabled(pages == 1)); - return { embed, row, attachment, results }; + return { embed, row, attachments, results }; } public static async GenerateSearchPageFromQuery(results: string[], userid: string, page: number): Promise { @@ -82,19 +81,18 @@ export default class CardSearchHelper { return undefined; } - let image: Buffer; - const imageFileName = card.card.path.split("/").pop()!; + const attachments = []; + let imageFileName = ""; - try { - image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path)); - } catch { - AppLogger.LogError("CardSearchHelper/GenerateSearchPageFromQuery", `Unable to fetch image for card ${card.card.id}.`); + if (!(card.card.path.startsWith("http://") || card.card.path.startsWith("https://"))) { + const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path)); + imageFileName = card.card.path.split("/").pop()!; - return undefined; + const attachment = new AttachmentBuilder(image, { name: imageFileName }); + + attachments.push(attachment); } - const attachment = new AttachmentBuilder(image, { name: imageFileName }); - const inventory = await Inventory.FetchOneByCardNumberAndUserId(userid, card.card.id); const quantityClaimed = inventory?.Quantity ?? 0; @@ -113,6 +111,6 @@ export default class CardSearchHelper { .setStyle(ButtonStyle.Primary) .setDisabled(page == results.length)); - return { embed, row, attachment, results }; + return { embed, row, attachments, results }; } } diff --git a/src/helpers/DropHelpers/DropEmbedHelper.ts b/src/helpers/DropHelpers/DropEmbedHelper.ts index ba1ba47..c739de7 100644 --- a/src/helpers/DropHelpers/DropEmbedHelper.ts +++ b/src/helpers/DropHelpers/DropEmbedHelper.ts @@ -24,12 +24,18 @@ export default class DropEmbedHelper { AppLogger.LogWarn("CardDropHelperMetadata/GenerateDropEmbed", `Card's colour override is invalid: ${drop.card.id}, ${drop.card.colour}`); } + let imageUrl = `attachment://${imageFileName}`; + + if (drop.card.path.startsWith("http://") || drop.card.path.startsWith("https://")) { + imageUrl = drop.card.path; + } + const embed = new EmbedBuilder() .setTitle(drop.card.name) .setDescription(description) .setFooter({ text: `${CardRarityToString(drop.card.type)} ยท ${drop.card.id}` }) .setColor(colour) - .setImage(`attachment://${imageFileName}`) + .setImage(imageUrl) .addFields([ { name: "Claimed", diff --git a/tests/__functions__/discord.js/GenerateButtonInteractionMock.ts b/tests/__functions__/discord.js/GenerateButtonInteractionMock.ts new file mode 100644 index 0000000..a1024ee --- /dev/null +++ b/tests/__functions__/discord.js/GenerateButtonInteractionMock.ts @@ -0,0 +1,21 @@ +import { ButtonInteraction } from "../../__types__/discord.js"; + +export default function GenerateButtonInteractionMock(): ButtonInteraction { + return { + guild: {}, + guildId: "guildId", + channel: { + isSendable: jest.fn().mockReturnValue(true), + send: jest.fn(), + }, + deferUpdate: jest.fn(), + editReply: jest.fn(), + message: { + createdAt: new Date(1000 * 60 * 27), + }, + user: { + id: "userId", + }, + customId: "customId", + }; +} \ No newline at end of file diff --git a/tests/__types__/discord.js.ts b/tests/__types__/discord.js.ts index 22c3291..6506b1d 100644 --- a/tests/__types__/discord.js.ts +++ b/tests/__types__/discord.js.ts @@ -1,5 +1,5 @@ export type ButtonInteraction = { - guild: {} | null, + guild: object | null, guildId: string | null, channel: { isSendable: jest.Func, diff --git a/tests/buttonEvents/Claim.test.ts b/tests/buttonEvents/Claim.test.ts index 226cee0..d9e7e6f 100644 --- a/tests/buttonEvents/Claim.test.ts +++ b/tests/buttonEvents/Claim.test.ts @@ -2,6 +2,7 @@ import { ButtonInteraction, TextChannel } from "discord.js"; import Claim from "../../src/buttonEvents/Claim"; import { ButtonInteraction as ButtonInteractionType } from "../__types__/discord.js"; import User from "../../src/database/entities/app/User"; +import GenerateButtonInteractionMock from "../__functions__/discord.js/GenerateButtonInteractionMock"; jest.mock("../../src/client/appLogger"); @@ -11,23 +12,8 @@ beforeEach(() => { jest.useFakeTimers(); jest.setSystemTime(1000 * 60 * 30); - interaction = { - guild: {}, - guildId: "guildId", - channel: { - isSendable: jest.fn().mockReturnValue(true), - send: jest.fn(), - }, - deferUpdate: jest.fn(), - editReply: jest.fn(), - message: { - createdAt: new Date(1000 * 60 * 27), - }, - user: { - id: "userId", - }, - customId: "claim cardNumber claimId droppedBy userId", - }; + interaction = GenerateButtonInteractionMock(); + interaction.customId = "claim cardNumber claimId droppedBy userId"; }); afterAll(() => { @@ -120,16 +106,4 @@ test("GIVEN user.RemoveCurrency fails, EXPECT error", async () => { expect(interaction.channel!.send).toHaveBeenCalledWith("[object Object], Not enough currency! You need 10 currency, you have 5!"); expect(interaction.editReply).not.toHaveBeenCalled(); -}); - -test.todo("GIVEN the card has already been claimed, EXPECT error"); - -test.todo("GIVEN the current drop is the latest AND the current user is NOT the one who dropped it, EXPECT error"); - -test.todo("GIVEN the user already has the card in their inventory, EXPECT the entity quantity to be +1"); - -test.todo("GIVEN user does NOT have the card in their inventory, EXPECT a new entity to be created"); - -test.todo("GIVEN card can not be found in the bot, EXPECT error logged"); - -test.todo("EXPECT message to be edited"); \ No newline at end of file +}); \ No newline at end of file diff --git a/tests/buttonEvents/Effects.test.ts b/tests/buttonEvents/Effects.test.ts index 18ccc31..f1f86be 100644 --- a/tests/buttonEvents/Effects.test.ts +++ b/tests/buttonEvents/Effects.test.ts @@ -1,5 +1,66 @@ -test.todo("GIVEN action is list, EXPECT list function to be called"); +import { ButtonInteraction } from "discord.js"; +import Effects from "../../src/buttonEvents/Effects"; +import GenerateButtonInteractionMock from "../__functions__/discord.js/GenerateButtonInteractionMock"; +import { ButtonInteraction as ButtonInteractionType } from "../__types__/discord.js"; +import List from "../../src/buttonEvents/Effects/List"; +import Use from "../../src/buttonEvents/Effects/Use"; +import AppLogger from "../../src/client/appLogger"; -test.todo("GIVEN action is use, EXPECT use function to be called"); +jest.mock("../../src/client/appLogger"); +jest.mock("../../src/buttonEvents/Effects/List"); +jest.mock("../../src/buttonEvents/Effects/Use"); -test.todo("GIVEN action is unknown, EXPECT nothing to be called"); \ No newline at end of file +let interaction: ButtonInteractionType; + +beforeEach(() => { + jest.resetAllMocks(); + + interaction = GenerateButtonInteractionMock(); + interaction.customId = "effects"; +}); + +test("GIVEN action is list, EXPECT list function to be called", async () => { + // Arrange + interaction.customId = "effects list"; + + // Act + const effects = new Effects(); + await effects.execute(interaction as unknown as ButtonInteraction); + + // Assert + expect(List).toHaveBeenCalledTimes(1); + expect(List).toHaveBeenCalledWith(interaction); + + expect(Use.Execute).not.toHaveBeenCalled(); +}); + +test("GIVEN action is use, EXPECT use function to be called", async () => { + // Arrange + interaction.customId = "effects use"; + + // Act + const effects = new Effects(); + await effects.execute(interaction as unknown as ButtonInteraction); + + // Assert + expect(Use.Execute).toHaveBeenCalledTimes(1); + expect(Use.Execute).toHaveBeenCalledWith(interaction); + + expect(List).not.toHaveBeenCalled(); +}); + +test("GIVEN action is invalid, EXPECT nothing to be called", async () => { + // Arrange + interaction.customId = "effects invalid"; + + // Act + const effects = new Effects(); + await effects.execute(interaction as unknown as ButtonInteraction); + + // Assert + expect(List).not.toHaveBeenCalled(); + expect(Use.Execute).not.toHaveBeenCalled(); + + expect(AppLogger.LogError).toHaveBeenCalledTimes(1); + expect(AppLogger.LogError).toHaveBeenCalledWith("Buttons/Effects", "Unknown action, invalid"); +}); \ No newline at end of file diff --git a/tests/buttonEvents/Effects/Use.test.ts b/tests/buttonEvents/Effects/Use.test.ts index d5618cc..86391cc 100644 --- a/tests/buttonEvents/Effects/Use.test.ts +++ b/tests/buttonEvents/Effects/Use.test.ts @@ -1,4 +1,4 @@ -import { ButtonInteraction, EmbedBuilder, InteractionResponse } from "discord.js"; +import { ButtonInteraction, InteractionResponse, InteractionUpdateOptions, MessagePayload } from "discord.js"; import Use from "../../../src/buttonEvents/Effects/Use"; import { mock } from "jest-mock-extended"; import AppLogger from "../../../src/client/appLogger"; @@ -82,7 +82,7 @@ describe("UseConfirm", () => { // Arrange interaction.customId += " unclaimed"; interaction.user.id = "userId"; - interaction.update.mockImplementation(async (opts: any) => { + interaction.update.mockImplementation(async (opts: string | MessagePayload | InteractionUpdateOptions) => { updatedWith = opts; return mock>(); @@ -133,7 +133,7 @@ describe("UseCancel", () => { // Arrange interaction.customId += " unclaimed"; interaction.user.id = "userId"; - interaction.update.mockImplementation(async (opts: any) => { + interaction.update.mockImplementation(async (opts: string | MessagePayload | InteractionUpdateOptions) => { updatedWith = opts; return mock>(); diff --git a/tests/commands/effects.test.ts b/tests/commands/effects.test.ts deleted file mode 100644 index 20c8f35..0000000 --- a/tests/commands/effects.test.ts +++ /dev/null @@ -1,27 +0,0 @@ -describe("constructor", () => { - test.todo("EXPECT CommandBuilder to be defined"); -}); - -describe("execute", () => { - test.todo("GIVEN interaction is NOT a ChatInputCommand, EXPECT nothing to happen"); - - test.todo("GIVEN subcommand is list, EXPECT list function to be called"); - - test.todo("GIVEN subcommand is use, EXPECT use function to be called"); -}); - -describe("List", () => { - test.todo("GIVEN pageOption is null, EXPECT page to default to 0"); - - test.todo("GIVEN pageOption.value is undefined, EXPECT page to default to 0"); - - test.todo("EXPECT interaction to be replied"); -}); - -describe("Use", () => { - test.todo("GIVEN effectDetail is not found, EXPECT error"); - - test.todo("GIVEN user can not use effect, EXPECT error"); - - test.todo("EXPECT interaction to be replied"); -}); \ No newline at end of file diff --git a/tests/helpers/EffectHelper.test.ts b/tests/helpers/EffectHelper.test.ts deleted file mode 100644 index e41c2bc..0000000 --- a/tests/helpers/EffectHelper.test.ts +++ /dev/null @@ -1,41 +0,0 @@ -describe("AddEffectToUserInventory", () => { - test.todo("GIVEN effect is found in database, EXPECT effect unused to be incremented"); - - test.todo("GIVEN effect is NOT found in database, EXPECT new effect to be created"); -}); - -describe("UseEffect", () => { - test.todo("GIVEN user can not use effect, EXPECT false returned"); - - test.todo("GIVEN user has effect, EXPECT entity to be updated AND true returned"); -}); - -describe("CanUseEffect", () => { - test.todo("GIVEN effect is not in database, EXPECT false returned"); - - test.todo("GIVEN user does not have any of the effect unused, EXPECT false returned"); - - test.todo("GIVEN effectDetail can not be found, EXPECT false returned"); - - test.todo("GIVEN effect has NOT passed the cooldown, EXPECT false returned"); - - test.todo("GIVEN effect has passed the cooldown, EXPECT true returned"); - - test.todo("GIVEN effect does not have a WhenExpires date supplied, EXPECT true returned"); -}); - -describe("HasEffect", () => { - test.todo("GIVEN effect is NOT found in database, EXPECT false returned"); - - test.todo("GIVEN effect does NOT have an expiry date, EXPECT false returned"); - - test.todo("GIVEN effect.WhenExpires is in the future, EXPECT false returned"); - - test.todo("GIVEN effect.WhenExpires is in the past, EXPECT true returned"); -}); - -describe("GenerateEffectEmbed", () => { - test.todo("GIVEN user has no effects, EXPECT embed to be generated"); - - test.todo("GIVEN user has some effects, EXPECT embed to be generated"); -}); \ No newline at end of file