diff --git a/src/database/entities/app/Inventory.ts b/src/database/entities/app/Inventory.ts index 7d659fe..a0aee18 100644 --- a/src/database/entities/app/Inventory.ts +++ b/src/database/entities/app/Inventory.ts @@ -47,6 +47,14 @@ 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 3b64dd5..3a04b92 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.FetchOneByCardNumberAndUserId(userId, card.id); + const claimed = await Inventory.ExistsByCardNumberAndUserId(userId, card.id); - if (!claimed || claimed.Quantity == 0) { + if (!claimed) { imageData.greyscale(); } } diff --git a/src/helpers/SeriesHelper.ts b/src/helpers/SeriesHelper.ts index a26fedd..cb728d3 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.cards.length} cards)`) + .map(x => `[${x.id}] ${x.name} (x${x.cards.length})`) .join("\n"); const embed = new EmbedBuilder()