Update dependency minimatch to v9.0.5 (#283)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [minimatch](https://github.com/isaacs/minimatch) | dependencies | patch | [`9.0.4` -> `9.0.5`](https://renovatebot.com/diffs/npm/minimatch/9.0.4/9.0.5) |

---

### Release Notes

<details>
<summary>isaacs/minimatch (minimatch)</summary>

### [`v9.0.5`](https://github.com/isaacs/minimatch/compare/v9.0.4...v9.0.5)

[Compare Source](https://github.com/isaacs/minimatch/compare/v9.0.4...v9.0.5)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4wLjAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4wLjAiLCJ0YXJnZXRCcmFuY2giOiJkZXZlbG9wIn0=-->

Reviewed-on: #283
Co-authored-by: Renovate Bot <renovate@vylpes.com>
Co-committed-by: Renovate Bot <renovate@vylpes.com>

.env.example

@@ -14,6 +14,10 @@ BOT_CLIENTID=682942374040961060
 BOT_ENV=4
 BOT_ADMINS=147392775707426816,887272961504071690
 BOT_LOGLEVEL=info
+BOT_LOG_DISCORD_ENABLE=false
+BOT_LOG_DISCORD_LEVEL=warn
+BOT_LOG_DISCORD_WEBHOOK=
+BOT_LOG_DISCORD_SERVICE=
 
 ABOUT_FUNDING=
 ABOUT_REPO=

.forgejo/workflows/production.yml

@@ -55,12 +55,16 @@ jobs:
         GDRIVESYNC_AUTO: ${{ vars.PROD_GDRIVESYNC_AUTO }}
         EXPRESS_PORT: ${{ secrets.PROD_EXPRESS_PORT }}
         BOT_LOGLEVEL: ${{ vars.PROD_BOT_LOGLEVEL }}
+        BOT_LOG_DISCORD_ENABLE: ${{ vars.PROD_BOT_LOG_DISCORD_ENABLE }}
+        BOT_LOG_DISCORD_LEVEL: ${{ vars.PROD_BOT_LOG_DISCORD_LEVEL }}
+        BOT_LOG_DISCORD_WEBHOOK: ${{ secrets.PROD_BOT_LOG_DISCORD_WEBHOOK }}
+        BOT_LOG_DISCORD_SERVICE: ${{ vars.PROD_BOT_LOG_DISCORD_SERVICE }}
       with:
         host: ${{ secrets.PROD_SSH_HOST }}
         username: ${{ secrets.PROD_SSH_USER }}
         key: ${{ secrets.PROD_SSH_KEY }}
         port: ${{ secrets.PROD_SSH_PORT }}
-        envs: DB_NAME,DB_AUTH_USER,DB_AUTH_PASS,DB_HOST,DB_PORT,DB_ROOT_HOST,DB_SYNC,DB_LOGGING,DB_DATA_LOCATION,BOT_TOKEN,BOT_VER,BOT_AUTHOR,BOT_OWNERID,BOT_CLIENTID,ABOUT_FUNDING,ABOUT_REPO,BOT_ENV,BOT_ADMINS,DATA_DIR,GDRIVESYNC_AUTO,SERVER_PATH,EXPRESS_PORT,BOT_LOGLEVEL
+        envs: DB_NAME,DB_AUTH_USER,DB_AUTH_PASS,DB_HOST,DB_PORT,DB_ROOT_HOST,DB_SYNC,DB_LOGGING,DB_DATA_LOCATION,BOT_TOKEN,BOT_VER,BOT_AUTHOR,BOT_OWNERID,BOT_CLIENTID,ABOUT_FUNDING,ABOUT_REPO,BOT_ENV,BOT_ADMINS,DATA_DIR,GDRIVESYNC_AUTO,SERVER_PATH,EXPRESS_PORT,BOT_LOGLEVEL,BOT_LOG_DISCORD_ENABLE,BOT_LOG_DISCORD_LEVEL,BOT_LOG_DISCORD_WEBHOOK,BOT_LOG_DISCORD_SERVICE
         script: |
           source .sshrc \
           && cd /home/vylpes/apps/card-drop/card-drop_prod \

.forgejo/workflows/stage.yml

@@ -55,12 +55,16 @@ jobs:
         GDRIVESYNC_AUTO: ${{ vars.STAGE_GDRIVESYNC_AUTO }}
         EXPRESS_PORT: ${{ secrets.STAGE_EXPRESS_PORT }}
         BOT_LOGLEVEL: ${{ vars.STAGE_BOT_LOGLEVEL }}
+        BOT_LOG_DISCORD_ENABLE: ${{ vars.STAGE_BOT_LOG_DISCORD_ENABLE }}
+        BOT_LOG_DISCORD_LEVEL: ${{ vars.STAGE_BOT_LOG_DISCORD_LEVEL }}
+        BOT_LOG_DISCORD_WEBHOOK: ${{ secrets.STAGE_BOT_LOG_DISCORD_WEBHOOK }}
+        BOT_LOG_DISCORD_SERVICE: ${{ vars.STAGE_BOT_LOG_DISCORD_SERVICE }}
       with:
         host: ${{ secrets.STAGE_SSH_HOST }}
         username: ${{ secrets.STAGE_SSH_USER }}
         key: ${{ secrets.STAGE_SSH_KEY }}
         port: ${{ secrets.STAGE_SSH_PORT }}
-        envs: DB_NAME,DB_AUTH_USER,DB_AUTH_PASS,DB_HOST,DB_PORT,DB_ROOT_HOST,DB_SYNC,DB_LOGGING,DB_DATA_LOCATION,BOT_TOKEN,BOT_VER,BOT_AUTHOR,BOT_OWNERID,BOT_CLIENTID,ABOUT_FUNDING,ABOUT_REPO,BOT_ENV,BOT_ADMINS,DATA_DIR,GDRIVESYNC_AUTO,SERVER_PATH,EXPRESS_PORT,BOT_LOGLEVEL
+        envs: DB_NAME,DB_AUTH_USER,DB_AUTH_PASS,DB_HOST,DB_PORT,DB_ROOT_HOST,DB_SYNC,DB_LOGGING,DB_DATA_LOCATION,BOT_TOKEN,BOT_VER,BOT_AUTHOR,BOT_OWNERID,BOT_CLIENTID,ABOUT_FUNDING,ABOUT_REPO,BOT_ENV,BOT_ADMINS,DATA_DIR,GDRIVESYNC_AUTO,SERVER_PATH,EXPRESS_PORT,BOT_LOGLEVEL,BOT_LOG_DISCORD_ENABLE,BOT_LOG_DISCORD_LEVEL,BOT_LOG_DISCORD_WEBHOOK,BOT_LOG_DISCORD_SERVICE
         script: |
           source .sshrc \
           && cd /home/vylpes/apps/card-drop/card-drop_stage \

package.json

@@ -31,26 +31,29 @@
     "@types/jest": "^29.0.0",
     "@types/uuid": "^9.0.0",
     "body-parser": "^1.20.2",
+    "canvas": "^2.11.2",
     "clone-deep": "^4.0.1",
     "cron": "^3.1.7",
-    "discord.js": "^14.3.0",
+    "discord.js": "^14.15.3",
     "dotenv": "^16.0.0",
     "express": "^4.18.2",
     "glob": "^10.3.10",
     "jest": "^29.0.0",
     "jest-mock-extended": "^3.0.0",
-    "minimatch": "9.0.4",
+    "minimatch": "9.0.5",
     "mysql": "^2.18.1",
     "ts-jest": "^29.0.0",
     "typeorm": "0.3.20",
-    "winston": "^3.11.0"
+    "winston": "^3.11.0",
+    "winston-daily-rotate-file": "^5.0.0",
+    "winston-discord-transport": "^1.3.0"
   },
   "overrides": {
     "undici": "^5.28.3"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
-    "@typescript-eslint/eslint-plugin": "^6.16.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^6.16.0",
     "eslint": "^8.56.0",
     "np": "^9.0.0",

src/buttonEvents/Claim.ts

@@ -20,6 +20,14 @@ export default class Claim extends ButtonEvent {
         const droppedBy = interaction.customId.split(" ")[3];
         const userId = interaction.user.id;
 
+        const whenDropped = interaction.message.createdAt;
+        const lastClaimableDate = new Date(Date.now() - (1000 * 60 * 5)); // 5 minutes ago
+
+        if (whenDropped < lastClaimableDate) {
+            await interaction.channel.send(`${interaction.user}, Cards can only be claimed within 5 minutes of it being dropped!`);
+            return;
+        }
+
         AppLogger.LogSilly("Button/Claim", `Parameters: cardNumber=${cardNumber}, claimId=${claimId}, droppedBy=${droppedBy}, userId=${userId}`);
 
         const user = await User.FetchOneById(User, userId) || new User(userId, CardConstants.StartingCurrency);

src/buttonEvents/Inventory.ts

@@ -11,6 +11,8 @@ export default class Inventory extends ButtonEvent {
         const page = interaction.customId.split(" ")[2];
 
         AppLogger.LogSilly("Button/Inventory", `Parameters: userid=${userid}, page=${page}`);
+        
+        await interaction.deferUpdate();
 
         const member = interaction.guild.members.cache.find(x => x.id == userid) || await interaction.guild.members.fetch(userid);
 
@@ -24,7 +26,8 @@ export default class Inventory extends ButtonEvent {
 
             const embed = await InventoryHelper.GenerateInventoryPage(member.user.username, member.user.id, Number(page));
 
-            await interaction.update({
+            await interaction.followUp({
+                files: [ embed.image ],
                 embeds: [ embed.embed ],
                 components: [ embed.row ],
             });
@@ -34,4 +37,4 @@ export default class Inventory extends ButtonEvent {
             await interaction.reply("No page for user found.");
         }
     }
-}
+}

src/client/appLogger.ts

@@ -1,4 +1,7 @@
+import path from "path";
 import { Logger, createLogger, format, transports } from "winston";
+import DailyRotateFile from "winston-daily-rotate-file";
+import DiscordTransport from "winston-discord-transport";
 
 export default class AppLogger {
     public static Logger: Logger;
@@ -19,12 +22,21 @@ export default class AppLogger {
                 customFormat,
             ),
             defaultMeta: { service: "bot" },
-            transports: [
-                new transports.File({ filename: "error.log", level: "error" }),
-                new transports.File({ filename: "combined.log" }),
-            ],
+            transports: [],
         });
 
+        if (process.env.DATA_DIR) {
+            const logDir = path.join(process.env.DATA_DIR, "logs");
+
+            logger.add(new DailyRotateFile({
+                filename: "bot-%DATE%.log",
+                dirname: logDir,
+                datePattern: "YYYY-MM-DD-HH",
+                maxSize: "20m",
+                maxFiles: "14d",
+            }));
+        }
+
         if (outputToConsole) {
             logger.add(new transports.Console({
                 format: format.combine(
@@ -34,6 +46,18 @@ export default class AppLogger {
                 )}));
         }
 
+        if (process.env.BOT_LOG_DISCORD_ENABLE == "true") {
+            if (process.env.BOT_LOG_DISCORD_WEBHOOK) {
+                logger.add(new DiscordTransport({
+                    webhook: process.env.BOT_LOG_DISCORD_WEBHOOK.toString(),
+                    defaultMeta: { service: process.env.BOT_LOG_DISCORD_SERVICE },
+                    level: process.env.BOT_LOG_DISCORD_LEVEL,
+                }));
+            } else {
+                throw "BOT_LOG_DISCORD_WEBHOOK is required to enable discord logger support.";
+            }
+        }
+
         AppLogger.Logger = logger;
 
         AppLogger.LogInfo("AppLogger", `Log Level: ${logLevel}`);
@@ -62,4 +86,4 @@ export default class AppLogger {
     public static LogSilly(label: string, message: string) {
         AppLogger.Logger.silly({ label, message });
     }
-}
+}

src/client/client.ts

@@ -16,6 +16,7 @@ import { SeriesMetadata } from "../contracts/SeriesMetadata";
 import AppLogger from "./appLogger";
 import TimerHelper from "../helpers/TimerHelper";
 import GiveCurrency from "../timers/GiveCurrency";
+import PurgeClaims from "../timers/PurgeClaims";
 
 export class CoreClient extends Client {
     private static _commandItems: ICommandItem[];
@@ -79,8 +80,10 @@ export class CoreClient extends Client {
             .then(() => {
                 AppLogger.LogInfo("Client", "App Data Source Initialised");
 
-                const timerId = this._timerHelper.AddTimer("*/20 * * * *", "Europe/London", GiveCurrency, false);
-                this._timerHelper.StartTimer(timerId);
+                this._timerHelper.AddTimer("*/20 * * * *", "Europe/London", GiveCurrency, false);
+                this._timerHelper.AddTimer("0 0 * * *", "Europe/London", PurgeClaims, false);
+
+                this._timerHelper.StartAllTimers();
             })
             .catch(err => {
                 AppLogger.LogError("Client", "App Data Source Initialisation Failed");

src/commands/drop.ts

@@ -88,4 +88,4 @@ export default class Drop extends Command {
         }
 
     }
-}
+}

src/commands/inventory.ts

@@ -26,6 +26,8 @@ export default class Inventory extends Command {
 
         const user = userOption ? userOption.user! : interaction.user;
 
+        await interaction.deferReply();
+
         AppLogger.LogSilly("Commands/Inventory", `Parameters: page=${page?.value}, user=${user.id}`);
 
         try {
@@ -37,14 +39,15 @@ export default class Inventory extends Command {
 
             const embed = await InventoryHelper.GenerateInventoryPage(user.username, user.id, pageNumber);
 
-            await interaction.reply({
+            await interaction.followUp({
+                files: [ embed.image ],
                 embeds: [ embed.embed ],
                 components: [ embed.row ],
             });
         } catch (e) {
             AppLogger.LogError("Commands/Inventory", e as string);
 
-            await interaction.reply("No page for user found.");
+            await interaction.followUp("No page for user found.");
         }
     }
-}
+}

src/contracts/AppBaseEntity.ts

@@ -39,6 +39,12 @@ export default class AppBaseEntity {
         await repository.remove(entity);
     }
 
+    public static async RemoveMany<T extends AppBaseEntity>(target: EntityTarget<T>, entity: T[]): Promise<void> {
+        const repository = AppDataSource.getRepository<T>(target);
+
+        await repository.remove(entity);
+    }
+
     public static async FetchAll<T extends AppBaseEntity>(target: EntityTarget<T>, relations?: string[]): Promise<T[]> {
         const repository = AppDataSource.getRepository<T>(target);
 

src/helpers/InventoryHelper.ts

@@ -1,10 +1,12 @@
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js";
+import { ActionRowBuilder, AttachmentBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js";
 import Inventory from "../database/entities/app/Inventory";
 import { CoreClient } from "../client/client";
 import EmbedColours from "../constants/EmbedColours";
 import { CardRarity, CardRarityToString } from "../constants/CardRarity";
 import cloneDeep from "clone-deep";
 import AppLogger from "../client/appLogger";
+import { createCanvas, loadImage } from "canvas";
+import path from "path";
 
 interface InventoryPage {
     id: number,
@@ -18,13 +20,21 @@ interface InventoryPageCards {
     name: string,
     type: CardRarity,
     quantity: number,
+    path: string,
 }
 
+interface ReturnedInventoryPage {
+    embed: EmbedBuilder,
+    row: ActionRowBuilder<ButtonBuilder>,
+    image: AttachmentBuilder,
+}
+
+
 export default class InventoryHelper {
-    public static async GenerateInventoryPage(username: string, userid: string, page: number): Promise<{ embed: EmbedBuilder, row: ActionRowBuilder<ButtonBuilder> }> {
+    public static async GenerateInventoryPage(username: string, userid: string, page: number): Promise<ReturnedInventoryPage> {
         AppLogger.LogSilly("Helpers/InventoryHelper", `Parameters: username=${username}, userid=${userid}, page=${page}`);
 
-        const cardsPerPage = 15;
+        const cardsPerPage = 9;
 
         const inventory = await Inventory.FetchAllByUserId(userid);
 
@@ -62,6 +72,7 @@ export default class InventoryHelper {
                         name: card.name,
                         type: card.type,
                         quantity: item.Quantity,
+                        path: card.path,
                     });
                 }
 
@@ -85,7 +96,8 @@ export default class InventoryHelper {
             .setTitle(username)
             .setDescription(`**${currentPage.name} (${currentPage.seriesSubpage + 1})**\n${currentPage.cards.map(x => `[${x.id}] ${x.name} (${CardRarityToString(x.type)}) x${x.quantity}`).join("\n")}`)
             .setFooter({ text: `Page ${page + 1} of ${pages.length}` })
-            .setColor(EmbedColours.Ok);
+            .setColor(EmbedColours.Ok)
+            .setImage("attachment://page.png");
 
         const row = new ActionRowBuilder<ButtonBuilder>()
             .addComponents(
@@ -100,6 +112,44 @@ export default class InventoryHelper {
                     .setStyle(ButtonStyle.Primary)
                     .setDisabled(page + 1 == pages.length));
 
-        return { embed, row };
+        const buffer = await this.GenerateInventoryImage(currentPage);
+        const image = new AttachmentBuilder(buffer, { name: "page.png" });
+
+        return { embed, row, image };
     }
-}
+
+    private static async GenerateInventoryImage(page: InventoryPage): Promise<Buffer> {
+        const gridWidth = 3;
+        const gridHeight = Math.ceil(page.cards.length / gridWidth);
+
+        const imageWidth = 526;
+        const imageHeight = 712;
+        
+        const canvasWidth = imageWidth * gridWidth;
+        const canvasHeight = imageHeight * gridHeight; 
+
+        const canvas = createCanvas(canvasWidth, canvasHeight);
+        const ctx = canvas.getContext("2d");
+
+        for (let i = 0; i < page.cards.length; i++) {
+            const card = page.cards[i];
+
+            const image = await loadImage(path.join(process.env.DATA_DIR!, "cards", card.path));
+
+            if (!image) {
+                AppLogger.LogError("InventoryHelper/GenerateInventoryImage", `Failed to load image for card ${card.id}`);
+                continue;
+            }
+
+            const x = i % gridWidth;
+            const y = Math.floor(i / gridWidth);
+
+            const imageX = imageWidth * x;
+            const imageY = imageHeight * y;
+
+            ctx.drawImage(image, imageX, imageY);
+        }
+
+        return canvas.toBuffer();
+    }
+}

src/timers/PurgeClaims.ts

@@ -0,0 +1,14 @@
+import AppLogger from "../client/appLogger";
+import Claim from "../database/entities/app/Claim";
+
+export default async function PurgeClaims() {
+    const claims = await Claim.FetchAll(Claim);
+
+    const whenLastClaimable = new Date(Date.now() - (1000 * 60 * 5)); // 5 minutes ago
+
+    const expiredClaims = claims.filter(x => x.WhenCreated < whenLastClaimable);
+
+    await Claim.RemoveMany(Claim, expiredClaims);
+
+    AppLogger.LogInfo("Timers/PurgeClaims", `Purged ${expiredClaims.length} claims from the database`);
+}