From 29bb22a819840432e6ca24ed51145fbd4d89fbd1 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Fri, 12 Jul 2024 16:09:26 +0100 Subject: [PATCH 1/2] Update the series list command to say cards instead of x (#296) - Update the /series list command so that it says "cards" instead if "x", for example `39 cards` #289 Reviewed-on: https://git.vylpes.xyz/External/card-drop/pulls/296 Reviewed-by: VylpesTester Co-authored-by: Ethan Lane Co-committed-by: Ethan Lane --- src/helpers/SeriesHelper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/SeriesHelper.ts b/src/helpers/SeriesHelper.ts index 9bb94a2..ee4133b 100644 --- a/src/helpers/SeriesHelper.ts +++ b/src/helpers/SeriesHelper.ts @@ -78,7 +78,7 @@ export default class SeriesHelper { const seriesOnPage = series.splice(page * itemsPerPage, itemsPerPage); const description = seriesOnPage - .map(x => `[${x.id}] ${x.name} (x${x.cards.length})`) + .map(x => `[${x.id}] ${x.name} (${x.cards.length} cards)`) .join("\n"); const embed = new EmbedBuilder() From 807c87d4243130e7d1c67ae6bc43f67430daa47a Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Fri, 12 Jul 2024 17:33:09 +0100 Subject: [PATCH 2/2] Fix quantity checker not factoring in entities with 0 count --- src/database/entities/app/Inventory.ts | 8 -------- src/helpers/ImageHelper.ts | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/database/entities/app/Inventory.ts b/src/database/entities/app/Inventory.ts index a0aee18..7d659fe 100644 --- a/src/database/entities/app/Inventory.ts +++ b/src/database/entities/app/Inventory.ts @@ -47,14 +47,6 @@ export default class Inventory extends AppBaseEntity { return single; } - public static async ExistsByCardNumberAndUserId(userId: string, cardNumber: string): Promise { - const repository = AppDataSource.getRepository(Inventory); - - const count = await repository.count({ where: { UserId: userId, CardNumber: cardNumber }}); - - return count != 0; - } - public static async FetchAllByUserId(userId: string): Promise { const repository = AppDataSource.getRepository(Inventory); diff --git a/src/helpers/ImageHelper.ts b/src/helpers/ImageHelper.ts index 3a04b92..3b64dd5 100644 --- a/src/helpers/ImageHelper.ts +++ b/src/helpers/ImageHelper.ts @@ -39,9 +39,9 @@ export default class ImageHelper { const imageData = await Jimp.read(filePath); if (userId != null) { - const claimed = await Inventory.ExistsByCardNumberAndUserId(userId, card.id); + const claimed = await Inventory.FetchOneByCardNumberAndUserId(userId, card.id); - if (!claimed) { + if (!claimed || claimed.Quantity == 0) { imageData.greyscale(); } }