40 changed files with 11945 additions and 7763 deletions
--- a/.env.example
+++ b/.env.example
@ -7,17 +7,13 @@
 # any secret values.
 BOT_TOKEN=
-BOT_VER=0.8.1
+BOT_VER=0.6.0
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 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=
--- a/.forgejo/workflows/production.yml
+++ b/.forgejo/workflows/production.yml
@ -17,10 +17,9 @@ jobs:
      uses: actions/setup-node@v4
      with:
        node-version: 18.x
-    - run: yarn install --frozen-lockfile
+    - run: npm ci
-    - run: yarn build
+    - run: npm run build
-    - run: yarn test
+    - run: npm test
    - run: yarn lint
    - name: "Copy files over to location"
      run: cp -r . ${{ secrets.PROD_REPO_PATH }}
@ -30,7 +29,7 @@ jobs:
    needs: build
    runs-on: node
    steps:
-    - uses: https://github.com/appleboy/ssh-action@v1.0.3
+    - uses: https://github.com/appleboy/ssh-action@v1.0.0
      env:
        DB_NAME: ${{ secrets.PROD_DB_NAME }}
        DB_AUTH_USER: ${{ secrets.PROD_DB_AUTH_USER }}
@ -55,16 +54,12 @@ 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,BOT_LOG_DISCORD_ENABLE,BOT_LOG_DISCORD_LEVEL,BOT_LOG_DISCORD_WEBHOOK,BOT_LOG_DISCORD_SERVICE
+        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
        script: |
          source .sshrc \
          && cd /home/vylpes/apps/card-drop/card-drop_prod \
--- a/.forgejo/workflows/stage.yml
+++ b/.forgejo/workflows/stage.yml
@ -17,10 +17,9 @@ jobs:
      uses: actions/setup-node@v4
      with:
        node-version: 18.x
-    - run: yarn install --frozen-lockfile
+    - run: npm ci
-    - run: yarn build
+    - run: npm run build
-    - run: yarn test
+    - run: npm test
    - run: yarn lint
    - name: "Copy files over to location"
      run: cp -r . ${{ secrets.STAGE_REPO_PATH }}
@ -30,7 +29,7 @@ jobs:
    needs: build
    runs-on: node
    steps:
-    - uses: https://github.com/appleboy/ssh-action@v1.0.3
+    - uses: https://github.com/appleboy/ssh-action@v1.0.0
      env:
        DB_NAME: ${{ secrets.STAGE_DB_NAME }}
        DB_AUTH_USER: ${{ secrets.STAGE_DB_AUTH_USER }}
@ -55,16 +54,12 @@ 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,BOT_LOG_DISCORD_ENABLE,BOT_LOG_DISCORD_LEVEL,BOT_LOG_DISCORD_WEBHOOK,BOT_LOG_DISCORD_SERVICE
+        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
        script: |
          source .sshrc \
          && cd /home/vylpes/apps/card-drop/card-drop_stage \
--- a/.forgejo/workflows/test.yml
+++ b/.forgejo/workflows/test.yml
@ -19,7 +19,6 @@ jobs:
      uses: actions/setup-node@v4
      with:
        node-version: 18.x
-    - run: yarn install --frozen-lockfile
+    - run: npm ci
-    - run: yarn build
+    - run: npm run build
-    - run: yarn test
+    - run: npm test
    - run: yarn lint
--- a/README.md
+++ b/README.md
@ -1,60 +1,2 @@
-# Card Drop
+# card-drop
 Card Drop is a Discord Bot designed to allow users to "drop" random cards into
 a channel and have the ability to claim them for themselves or let others if
 they so choose.
 The cards are randomly chosen based on weights of their card type (i.e. Bronze
 is more common than Gold). The user who ran the drop command has 5 minutes to
 choose if they want the card to themselves before its claimable by anyone, or
 until the drop command is ran again.
 ## Installation
 Downloads of the latest version can be found from the [GitHub Releases](https://github.com/vylpes/card-drop/releases)
 or [Forgejo Releases](https://git.vylpes.xyz/external/card-drop/releases) page.
 Copy the config template file and fill in the strings.
 ## Requirements
 - NodeJS
 - Yarn
 - Docker
 ## Usage
 Install the dependencies and build the app:
 ```bash
 yarn Install
 yarn build
 ```
 Setup the database (Recommended to use the docker-compose file
 ```bash
 docker compose up -d
 ```
 Copy and edit the settings file
 ```bash
 cp .env.template .env
 ```
 > **NOTE:** Make sure you do *not* check in these files! These contain
 sensitive information and should be treated as private.
 If you're not using `DB_SYNC=true` in `.env`, make sure to migrate the database
 ```bash
 yarn db:up
 ```
 Start the bot
 ```bash
 yarn start
 ```
--- a/docs/cards.md
+++ b/docs/cards.md
@ -1,120 +0,0 @@
 # Cards
 This document will describe how to add cards to the bot. This is from the
 perspective of the development side and doesn't go into details of syncing
 from an external place such as with the Google Drive Sync function.
 The cards will be put into the `$DATA_DIR/cards` folder. `$DATA_DIR` is
 configured in the `.env` file.
 ## Folder Structure
 The general structure of the cards folder is as follows:
 ```
 cards           # The main cards folder
 | Series 1      # Series folder
 | | BRONZE      # Type folder
 | | | 1000.jpg  # Card image
 | | | 1001.jpg
 | | 1.json      # Card metadata file
 | Series 2
 | | SILVER
 | | | 2000.jpg
 | | 2.json
 ```
 - The root of the cards folder will have a folder foor each series
 - Each series will contain folders for each of the card types containing the
  card images.
 - The series folder will also contain a metadata JSON folder containing the
  metadata of the cards within that series.
 The bot when loading will search the cards folder recursively for each json,
 and then read them to determine what cards should be used for the bot.
 ## Series Metadata
 An example of what the metadata files could look like are as follows:
 ```json
 [
    {
        "id": 1,
        "name": "Series 1",
        "cards": [
            {
                "id": "1000",
                "name": "Card 1000 of Series 1",
                "type": 1,
                "path": "Series 1/BRONZE/1000.jpg"
            },
            {
                "id": "1001",
                "name": "Card 1001 of Series 1",
                "type": 1,
                "path": "Series 2/BRONZE?1001.jpg",
                "subseries": "Custom Series Name"
            }
        ]
    }
 ]
 ```
 This file will load a series called "Series 1" with the id of 1, containing 2
 cards:
 - Card 1000, with type 1 (Bronze), with its image located at (from root)
  "Series 1/BRONZE/1000.jpg"
 - Card 1001 is the same, except has a custom "subseries" name which will
  override the main series name if shown, helpful for an "other" category.
 ### Card Type
 <table>
    <thead>
        <tr>
            <th>Number</th>
            <th>Name</th>
            <th>Chance</th>
            <th>Sacrifice Cost (Coins)</th>
        </tr>
    </thead>
    <tbody>
        <tr>
            <td>0</td>
            <td>Unknown</td>
            <td>-</td>
            <td>-</td>
        </tr>
        <tr>
            <td>1</td>
            <td>Bronze</td>
            <td>62%</td>
            <td>5</td>
        </tr>
        <tr>
            <td>2</td>
            <td>Silver</td>
            <td>31%</td>
            <td>10</td>
        </tr>
        <tr>
            <td>3</td>
            <td>Gold</td>
            <td>4.4%</td>
            <td>30</td>
        </tr>
        <tr>
            <td>4</td>
            <td>Manga</td>
            <td>2%</td>
            <td>40</td>
        </tr>
        <tr>
            <td>5</td>
            <td>Legendary</td>
            <td>0.6%</td>
            <td>100</td>
        </tr>
    </tbody>
 </table>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,13 +1,13 @@
 {
  "name": "card-drop",
-  "version": "0.8.1",
+  "version": "0.6.0",
  "main": "./dist/bot.js",
  "typings": "./dist",
  "scripts": {
    "clean": "rm -rf node_modules/ dist/",
    "build": "tsc",
    "start": "node ./dist/bot.js",
-    "test": "echo true",
+    "test": "jest --passWithNoTests",
    "lint": "eslint .",
    "lint:fix": "eslint . --fix",
    "db:up": "typeorm migration:run -d dist/database/dataSources/appDataSource.js",
@ -15,11 +15,11 @@
    "db:create": "typeorm migration:create ./src/database/migrations/app/new",
    "release": "np --no-publish"
  },
-  "repository": "https://git.vylpes.xyz/External/card-drop.git",
+  "repository": "https://gitea.vylpes.xyz/External/card-drop.git",
  "author": "Ethan Lane <ethan@vylpes.com>",
  "license": "MIT",
  "bugs": {
-    "url": "https//git.vylpes.xyz/External/card-drop/issues",
+    "url": "https//gitea.vylpes.xyz/External/card-drop/issues",
    "email": "helpdesk@vylpes.com"
  },
  "homepage": "https://gitea.vylpes.xyz/External/card-drop",
@ -31,30 +31,26 @@
    "@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.15.3",
+    "discord.js": "^14.3.0",
    "dotenv": "^16.0.0",
    "express": "^4.18.2",
    "glob": "^10.3.10",
    "jest": "^29.0.0",
    "jest-mock-extended": "^3.0.0",
-    "jimp": "^0.22.12",
+    "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"
  },
-  "resolutions": {
+  "overrides": {
-    "**/ws": "^8.17.1"
+    "undici": "^5.28.3"
  },
  "devDependencies": {
    "@types/node": "^20.0.0",
-    "@typescript-eslint/eslint-plugin": "^7.0.0",
+    "@typescript-eslint/eslint-plugin": "^6.16.0",
    "@typescript-eslint/parser": "^6.16.0",
    "eslint": "^8.56.0",
    "np": "^9.0.0",
--- a/src/Functions/CardMetadataFunction.ts
+++ b/src/Functions/CardMetadataFunction.ts
@ -5,7 +5,6 @@ import { glob } from "glob";
 import { SeriesMetadata } from "../contracts/SeriesMetadata";
 import { CoreClient } from "../client/client";
 import AppLogger from "../client/appLogger";
 import {CardRarity} from "../constants/CardRarity";
 export interface CardMetadataResult {
    IsSuccess: boolean;
@ -38,22 +37,7 @@ export default class CardMetadataFunction {
        if (cardResult.IsSuccess) {
            CoreClient.Cards = cardResult.Result!;
-
+            AppLogger.LogInfo("Functions/CardMetadataFunction", `Loaded ${CoreClient.Cards.flatMap(x => x.cards).length} cards to database`);
            const allCards = CoreClient.Cards.flatMap(x => x.cards);
            const totalCards = allCards.length;
            const bronzeCards = allCards.filter(x => x.type == CardRarity.Bronze)
                .length;
            const silverCards = allCards.filter(x => x.type == CardRarity.Silver)
                .length;
            const goldCards = allCards.filter(x => x.type == CardRarity.Gold)
                .length;
            const mangaCards = allCards.filter(x => x.type == CardRarity.Manga)
                .length;
            const legendaryCards = allCards.filter(x => x.type == CardRarity.Legendary)
                .length;
            AppLogger.LogInfo("Functions/CardMetadataFunction", `Loaded ${totalCards} cards to database (${bronzeCards} bronze, ${silverCards} silver, ${goldCards} gold, ${mangaCards} manga, ${legendaryCards} legendary)`);
            const duplicateCards = CoreClient.Cards.flatMap(x => x.cards)
                .filter((card, index, self) => self.findIndex(c => c.id === card.id) !== index);
--- a/src/buttonEvents/Claim.ts
+++ b/src/buttonEvents/Claim.ts
@ -11,7 +11,6 @@ import CardConstants from "../constants/CardConstants";
 export default class Claim extends ButtonEvent {
    public override async execute(interaction: ButtonInteraction) {
        if (!interaction.guild || !interaction.guildId) return;
        if (!interaction.channel) return;
        await interaction.deferUpdate();
@ -20,39 +19,20 @@ 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);
        AppLogger.LogSilly("Button/Claim", `${user.Id} has ${user.Currency} currency`);
        if (!user.RemoveCurrency(CardConstants.ClaimCost)) {
            await interaction.channel.send(`${interaction.user}, Not enough currency! You need ${CardConstants.ClaimCost} currency, you have ${user.Currency}!`);
            return;
        }
        const claimed = await eClaim.FetchOneByClaimId(claimId);
        if (claimed) {
-            await interaction.channel.send(`${interaction.user}, This card has already been claimed!`);
+            await interaction.reply("This card has already been claimed");
            return;
        }
        if (claimId == CoreClient.ClaimId && userId != droppedBy) {
-            await interaction.channel.send(`${interaction.user}, The latest dropped card can only be claimed by the user who dropped it!`);
+            await interaction.reply("The latest dropped card can only be claimed by the user who dropped it");
            return;
        }
        await user.Save(User, user);
        let inventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber);
        if (!inventory) {
@ -63,6 +43,17 @@ export default class Claim extends ButtonEvent {
        await inventory.Save(Inventory, inventory);
        const user = await User.FetchOneById(User, userId) || new User(userId, CardConstants.StartingCurrency);
        AppLogger.LogSilly("Button/Claim", `${user.Id} has ${user.Currency} currency`);
        if (!user.RemoveCurrency(CardConstants.ClaimCost)) {
            await interaction.reply(`Not enough currency! You need 10 currency, you have ${user.Currency}`);
            return;
        }
        await user.Save(User, user);
        const claim = new eClaim(claimId);
        claim.SetInventory(inventory);
@ -76,7 +67,7 @@ export default class Claim extends ButtonEvent {
        const imageFileName = card.card.path.split("/").pop()!;
-        const embed = CardDropHelperMetadata.GenerateDropEmbed(card, inventory.Quantity, imageFileName, interaction.user.username, user.Currency);
+        const embed = CardDropHelperMetadata.GenerateDropEmbed(card, inventory.Quantity, imageFileName, interaction.user.username);
        const row = CardDropHelperMetadata.GenerateDropButtons(card, claimId, interaction.user.id, true);
        await interaction.editReply({
--- a/src/buttonEvents/Inventory.ts
+++ b/src/buttonEvents/Inventory.ts
@ -12,8 +12,6 @@ export default class Inventory extends ButtonEvent {
        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);
        if (!member) {
@ -26,20 +24,14 @@ export default class Inventory extends ButtonEvent {
            const embed = await InventoryHelper.GenerateInventoryPage(member.user.username, member.user.id, Number(page));
-            if (!embed) {
+            await interaction.update({
                await interaction.followUp("No page for user found.");
                return;
            }
            await interaction.editReply({
                files: [ embed.image ],
                embeds: [ embed.embed ],
                components: [ embed.row ],
            });
        } catch (e) {
            AppLogger.LogError("Button/Inventory", `Error generating inventory page for ${member.user.username} with id ${member.user.id}: ${e}`);
-            await interaction.followUp("An error has occurred running this command.");
+            await interaction.reply("No page for user found.");
        }
    }
 }
--- a/src/buttonEvents/Reroll.ts
+++ b/src/buttonEvents/Reroll.ts
@ -8,8 +8,6 @@ import Config from "../database/entities/app/Config";
 import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
 import path from "path";
 import AppLogger from "../client/appLogger";
 import User from "../database/entities/app/User";
 import CardConstants from "../constants/CardConstants";
 export default class Reroll extends ButtonEvent {
    public override async execute(interaction: ButtonInteraction) {
@ -25,20 +23,6 @@ export default class Reroll extends ButtonEvent {
            return;
        }
        let user = await User.FetchOneById(User, interaction.user.id);
        if (!user) {
            user = new User(interaction.user.id, CardConstants.StartingCurrency);
            await user.Save(User, user);
            AppLogger.LogInfo("Commands/Drop", `New user (${interaction.user.id}) saved to the database`);
        }
        if (user.Currency < CardConstants.ClaimCost) {
            await interaction.reply(`Not enough currency! You need ${CardConstants.ClaimCost} currency, you have ${user.Currency}!`);
            return;
        }
        const randomCard = CardDropHelperMetadata.GetRandomCard();
        if (!randomCard) {
@ -59,7 +43,7 @@ export default class Reroll extends ButtonEvent {
            const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
            const quantityClaimed = inventory ? inventory.Quantity : 0;
-            const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName, undefined, user.Currency);
+            const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName);
            const claimId = v4();
--- a/src/buttonEvents/Series.ts
+++ b/src/buttonEvents/Series.ts
@ -24,14 +24,11 @@ export default class Series extends ButtonEvent {
        const seriesid = interaction.customId.split(" ")[2];
        const page = interaction.customId.split(" ")[3];
-        await interaction.deferUpdate();
+        const embed = SeriesHelper.GenerateSeriesViewPage(Number(seriesid), Number(page));
-        const embed = await SeriesHelper.GenerateSeriesViewPage(Number(seriesid), Number(page), interaction.user.id);
+        await interaction.update({
        await interaction.editReply({
            embeds: [ embed!.embed ],
            components: [ embed!.row ],
            files: [ embed!.image ],
        });
    }
--- a/src/buttonEvents/Trade.ts
+++ b/src/buttonEvents/Trade.ts
@ -22,14 +22,14 @@ export default class Trade extends ButtonEvent {
    }
    private async AcceptTrade(interaction: ButtonInteraction) {
-        const user1UserId = interaction.customId.split(" ")[2];
+        const giveUserId = interaction.customId.split(" ")[2];
-        const user2UserId = interaction.customId.split(" ")[3];
+        const receiveUserId = interaction.customId.split(" ")[3];
-        const user1CardNumber = interaction.customId.split(" ")[4];
+        const giveCardNumber = interaction.customId.split(" ")[4];
-        const user2CardNumber = interaction.customId.split(" ")[5];
+        const receiveCardNumber = interaction.customId.split(" ")[5];
        const expiry = interaction.customId.split(" ")[6];
        const timeoutId = interaction.customId.split(" ")[7];
-        AppLogger.LogSilly("Button/Trade/AcceptTrade", `Parameters: user1UserId=${user1UserId}, user2UserId=${user2UserId}, user1CardNumber=${user1CardNumber}, user2CardNumber=${user2CardNumber}, expiry=${expiry}, timeoutId=${timeoutId}`);
+        AppLogger.LogSilly("Button/Trade/AcceptTrade", `Parameters: giveUserId=${giveUserId}, receiveUserId=${receiveUserId}, giveCardNumber=${giveCardNumber}, receiveCardNumber=${receiveCardNumber}, expiry=${expiry}, timeoutId=${timeoutId}`);
        const expiryDate = new Date(expiry);
@ -38,80 +38,80 @@ export default class Trade extends ButtonEvent {
            return;
        }
-        if (interaction.user.id !== user2UserId) {
+        if (interaction.user.id !== receiveUserId) {
            await interaction.reply("You are not the user who the trade is intended for");
            return;
        }
-        const user1Item = CoreClient.Cards
+        const giveItem = CoreClient.Cards
            .flatMap(x => x.cards)
-            .find(x => x.id === user1CardNumber);
+            .find(x => x.id === giveCardNumber);
-        const user2Item = CoreClient.Cards
+        const receiveItem = CoreClient.Cards
            .flatMap(x => x.cards)
-            .find(x => x.id === user2CardNumber);
+            .find(x => x.id === receiveCardNumber);
-        if (!user1Item || !user2Item) {
+        if (!giveItem || !receiveItem) {
            await interaction.reply("One or more of the items you are trying to trade does not exist.");
            return;
        }
-        const user1User = interaction.client.users.cache.get(user1UserId) || await interaction.client.users.fetch(user1UserId);
+        const giveUser = interaction.client.users.cache.get(giveUserId) || await interaction.client.users.fetch(giveUserId);
-        const user2User = interaction.client.users.cache.get(user2UserId) || await interaction.client.users.fetch(user2UserId);
+        const receiveUser = interaction.client.users.cache.get(receiveUserId) || await interaction.client.users.fetch(receiveUserId);
-        const user1UserInventory1 = await Inventory.FetchOneByCardNumberAndUserId(user1UserId, user1CardNumber);
+        const giveUserInventory1 = await Inventory.FetchOneByCardNumberAndUserId(giveUserId, giveCardNumber);
-        const user2UserInventory1 = await Inventory.FetchOneByCardNumberAndUserId(user2UserId, user2CardNumber);
+        const receiveUserInventory1 = await Inventory.FetchOneByCardNumberAndUserId(receiveUserId, receiveCardNumber);
-        if (!user1UserInventory1 || !user2UserInventory1) {
+        if (!giveUserInventory1 || !receiveUserInventory1) {
            await interaction.reply("One or more of the items you are trying to trade does not exist.");
            return;
        }
-        if (user1UserInventory1.Quantity < 1 || user2UserInventory1.Quantity < 1) {
+        if (giveUserInventory1.Quantity < 1 || receiveUserInventory1.Quantity < 1) {
            await interaction.reply("One or more of the items you are trying to trade does not exist.");
            return;
        }
-        user1UserInventory1.SetQuantity(user1UserInventory1.Quantity - 1);
+        giveUserInventory1.SetQuantity(giveUserInventory1.Quantity - 1);
-        user2UserInventory1.SetQuantity(user2UserInventory1.Quantity - 1);
+        receiveUserInventory1.SetQuantity(receiveUserInventory1.Quantity - 1);
-        await user1UserInventory1.Save(Inventory, user1UserInventory1);
+        await giveUserInventory1.Save(Inventory, giveUserInventory1);
-        await user2UserInventory1.Save(Inventory, user2UserInventory1);
+        await receiveUserInventory1.Save(Inventory, receiveUserInventory1);
-        let user1UserInventory2 = await Inventory.FetchOneByCardNumberAndUserId(user1UserId, user2CardNumber);
+        let giveUserInventory2 = await Inventory.FetchOneByCardNumberAndUserId(receiveUserId, giveCardNumber);
-        let user2UserInventory2 = await Inventory.FetchOneByCardNumberAndUserId(user2UserId, user1CardNumber);
+        let receiveUserInventory2 = await Inventory.FetchOneByCardNumberAndUserId(giveUserId, receiveCardNumber);
-        if (!user1UserInventory2) {
+        if (!giveUserInventory2) {
-            user1UserInventory2 = new Inventory(user1UserId, user1CardNumber, 1);
+            giveUserInventory2 = new Inventory(receiveUserId, giveCardNumber, 1);
        } else {
-            user1UserInventory2.SetQuantity(user1UserInventory2.Quantity + 1);
+            giveUserInventory2.SetQuantity(giveUserInventory2.Quantity + 1);
        }
-        if (!user2UserInventory2) {
+        if (!receiveUserInventory2) {
-            user2UserInventory2 = new Inventory(user2UserId, user2CardNumber, 1);
+            receiveUserInventory2 = new Inventory(giveUserId, receiveCardNumber, 1);
        } else {
-            user2UserInventory2.SetQuantity(user2UserInventory2.Quantity + 1);
+            receiveUserInventory2.SetQuantity(receiveUserInventory2.Quantity + 1);
        }
-        await user1UserInventory2.Save(Inventory, user1UserInventory2);
+        await giveUserInventory2.Save(Inventory, giveUserInventory2);
-        await user2UserInventory2.Save(Inventory, user2UserInventory2);
+        await receiveUserInventory2.Save(Inventory, receiveUserInventory2);
        clearTimeout(timeoutId);
        const tradeEmbed = new EmbedBuilder()
            .setTitle("Trade Accepted")
-            .setDescription(`Trade initiated between ${user1User.username} and ${user2User.username}`)
+            .setDescription(`Trade initiated between ${receiveUser.username} and ${giveUser.username}`)
            .setColor(EmbedColours.Success)
            .setImage("https://i.imgur.com/9w5f1ls.gif")
            .addFields([
                {
-                    name: `${user1User.username} Receives`,
+                    name: "I receieve",
-                    value: `${user2Item.id}: ${user2Item.name}`,
+                    value: `${receiveItem.id}: ${receiveItem.name}`,
                    inline: true,
                },
                {
-                    name: `${user2User.username} Receives`,
+                    name: "You receieve",
-                    value: `${user1Item.id}: ${user1Item.name}`,
+                    value: `${giveItem.id}: ${giveItem.name}`,
                    inline: true,
                },
                {
@ -138,32 +138,32 @@ export default class Trade extends ButtonEvent {
    }
    private async DeclineTrade(interaction: ButtonInteraction) {
-        const user1UserId = interaction.customId.split(" ")[2];
+        const giveUserId = interaction.customId.split(" ")[2];
-        const user2UserId = interaction.customId.split(" ")[3];
+        const receiveUserId = interaction.customId.split(" ")[3];
-        const user1CardNumber = interaction.customId.split(" ")[4];
+        const giveCardNumber = interaction.customId.split(" ")[4];
-        const user2CardNumber = interaction.customId.split(" ")[5];
+        const receiveCardNumber = interaction.customId.split(" ")[5];
        // No need to get expiry date
        const timeoutId = interaction.customId.split(" ")[7];
-        AppLogger.LogSilly("Button/Trade/DeclineTrade", `Parameters: user1UserId=${user1UserId}, user2UserId=${user2UserId}, user1CardNumber=${user1CardNumber}, user2CardNumber=${user2CardNumber}, timeoutId=${timeoutId}`);
+        AppLogger.LogSilly("Button/Trade/DeclineTrade", `Parameters: giveUserId=${giveUserId}, receiveUserId=${receiveUserId}, giveCardNumber=${giveCardNumber}, receiveCardNumber=${receiveCardNumber}, timeoutId=${timeoutId}`);
-        if (interaction.user.id != user1UserId && interaction.user.id !== user2UserId) {
+        if (interaction.user.id != receiveUserId && interaction.user.id !==giveUserId) {
            await interaction.reply("You are not the user who the trade is intended for");
            return;
        }
-        const user1User = interaction.client.users.cache.get(user1UserId) || await interaction.client.users.fetch(user1UserId);
+        const giveUser = interaction.client.users.cache.get(giveUserId) || await interaction.client.users.fetch(giveUserId);
-        const user2User = interaction.client.users.cache.get(user2UserId) || await interaction.client.users.fetch(user2UserId);
+        const receiveUser = interaction.client.users.cache.get(receiveUserId) || await interaction.client.users.fetch(receiveUserId);
-        const user1Item = CoreClient.Cards
+        const giveItem = CoreClient.Cards
            .flatMap(x => x.cards)
-            .find(x => x.id === user1CardNumber);
+            .find(x => x.id === giveCardNumber);
-        const user2Item = CoreClient.Cards
+        const receiveItem = CoreClient.Cards
            .flatMap(x => x.cards)
-            .find(x => x.id === user2CardNumber);
+            .find(x => x.id === receiveCardNumber);
-        if (!user1Item || !user2Item) {
+        if (!giveItem || !receiveItem) {
            await interaction.reply("One or more of the items you are trying to trade does not exist.");
            return;
        }
@ -172,18 +172,18 @@ export default class Trade extends ButtonEvent {
        const tradeEmbed = new EmbedBuilder()
            .setTitle("Trade Declined")
-            .setDescription(`Trade initiated between ${user1User.username} and ${user2User.username}`)
+            .setDescription(`Trade initiated between ${receiveUser.username} and ${giveUser.username}`)
            .setColor(EmbedColours.Error)
            .setImage("https://i.imgur.com/9w5f1ls.gif")
            .addFields([
                {
-                    name: `${user1User.username} Receives`,
+                    name: "I Receive",
-                    value: `${user2Item.id}: ${user2Item.name}`,
+                    value: `${receiveItem.id}: ${receiveItem.name}`,
                    inline: true,
                },
                {
-                    name: `${user2User.username} Receives`,
+                    name: "You Receive",
-                    value: `${user1Item.id}: ${user1Item.name}`,
+                    value: `${giveItem.id}: ${giveItem.name}`,
                    inline: true,
                },
                {
--- a/src/client/appLogger.ts
+++ b/src/client/appLogger.ts
@ -1,7 +1,4 @@
 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;
@ -22,21 +19,12 @@ export default class AppLogger {
                customFormat,
            ),
            defaultMeta: { service: "bot" },
-            transports: [],
+            transports: [
                new transports.File({ filename: "error.log", level: "error" }),
                new transports.File({ filename: "combined.log" }),
            ],
        });
        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(
@ -46,18 +34,6 @@ 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}`);
--- a/src/client/client.ts
+++ b/src/client/client.ts
@ -16,7 +16,6 @@ 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[];
@ -80,10 +79,8 @@ export class CoreClient extends Client {
            .then(() => {
                AppLogger.LogInfo("Client", "App Data Source Initialised");
-                this._timerHelper.AddTimer("*/20 * * * *", "Europe/London", GiveCurrency, false);
+                const timerId = this._timerHelper.AddTimer("*/20 * * * *", "Europe/London", GiveCurrency, false);
-                this._timerHelper.AddTimer("0 0 * * *", "Europe/London", PurgeClaims, false);
+                this._timerHelper.StartTimer(timerId);
                this._timerHelper.StartAllTimers();
            })
            .catch(err => {
                AppLogger.LogError("Client", "App Data Source Initialisation Failed");
--- a/src/client/events.ts
+++ b/src/client/events.ts
@ -2,14 +2,11 @@ import { Interaction } from "discord.js";
 import ChatInputCommand from "./interactionCreate/ChatInputCommand";
 import Button from "./interactionCreate/Button";
 import AppLogger from "./appLogger";
 import NewUserDiscovery from "./interactionCreate/middleware/NewUserDiscovery";
 export class Events {
    public async onInteractionCreate(interaction: Interaction) {
        if (!interaction.guildId) return;
        await NewUserDiscovery(interaction);
        if (interaction.isChatInputCommand()) {
            AppLogger.LogVerbose("Client", `ChatInputCommand: ${interaction.commandName}`);
            ChatInputCommand.onChatInput(interaction);
--- a/src/client/interactionCreate/middleware/NewUserDiscovery.ts
+++ b/src/client/interactionCreate/middleware/NewUserDiscovery.ts
@ -1,15 +0,0 @@
 import { Interaction } from "discord.js";
 import User from "../../../database/entities/app/User";
 import CardConstants from "../../../constants/CardConstants";
 import AppLogger from "../../appLogger";
 export default async function NewUserDiscovery(interaction: Interaction) {
    const existingUser = await User.FetchOneById(User, interaction.user.id);
    if (existingUser) return;
    const newUser = new User(interaction.user.id, CardConstants.StartingCurrency);
    await newUser.Save(User, newUser);
    AppLogger.LogInfo("NewUserDiscovery", `Discovered new user ${interaction.user.id}`);
 }
--- a/src/commands/allbalance.ts
+++ b/src/commands/allbalance.ts
@ -1,29 +0,0 @@
 import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder } from "discord.js";
 import EmbedColours from "../constants/EmbedColours";
 import { Command } from "../type/command";
 import User from "../database/entities/app/User";
 export default class AllBalance extends Command {
    constructor() {
        super();
        this.CommandBuilder = new SlashCommandBuilder()
            .setName("allbalance")
            .setDescription("Get everyone's currency balance")
            .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);
    }
    public override async execute(interaction: CommandInteraction) {
        const users = await User.FetchAll(User);
        const filteredUsers = users.filter(x => x.Currency > 0)
            .sort((a, b) => b.Currency - a.Currency);
        const embed = new EmbedBuilder()
            .setColor(EmbedColours.Ok)
            .setTitle("All Balances")
            .setDescription(filteredUsers.map(x => `<@${x.Id}> ${x.Currency}`).join("\n"));
        await interaction.reply({ embeds: [ embed ], ephemeral: true });
    }
 }
--- a/src/commands/balance.ts
+++ b/src/commands/balance.ts
@ -15,7 +15,7 @@ export default class Balance extends Command {
    public override async execute(interaction: CommandInteraction) {
        const user = await User.FetchOneById(User, interaction.user.id);
-        const userBalance = user != null ? user.Currency : 0;
+        let userBalance = user != null ? user.Currency : 0;
        const embed = new EmbedBuilder()
            .setColor(EmbedColours.Ok)
--- a/src/commands/drop.ts
+++ b/src/commands/drop.ts
@ -8,8 +8,6 @@ import Config from "../database/entities/app/Config";
 import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
 import path from "path";
 import AppLogger from "../client/appLogger";
 import User from "../database/entities/app/User";
 import CardConstants from "../constants/CardConstants";
 export default class Drop extends Command {
    constructor() {
@ -33,20 +31,6 @@ export default class Drop extends Command {
            return;
        }
        let user = await User.FetchOneById(User, interaction.user.id);
        if (!user) {
            user = new User(interaction.user.id, CardConstants.StartingCurrency);
            await user.Save(User, user);
            AppLogger.LogInfo("Commands/Drop", `New user (${interaction.user.id}) saved to the database`);
        }
        if (user.Currency < CardConstants.ClaimCost) {
            await interaction.reply(`Not enough currency! You need ${CardConstants.ClaimCost} currency, you have ${user.Currency}!`);
            return;
        }
        const randomCard = CardDropHelperMetadata.GetRandomCard();
        if (!randomCard) {
@ -67,7 +51,7 @@ export default class Drop extends Command {
            const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
            const quantityClaimed = inventory ? inventory.Quantity : 0;
-            const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName, undefined, user.Currency);
+            const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName);
            const claimId = v4();
--- a/src/commands/give.ts
+++ b/src/commands/give.ts
@ -77,7 +77,7 @@ export default class Give extends Command {
        }
        const cardNumber = interaction.options.get("cardnumber", true);
-        const user = interaction.options.get("user", true).user!;
+        const user = interaction.options.getUser("user", true);
        AppLogger.LogSilly("Commands/Give/GiveCard", `Parameters: cardNumber=${cardNumber.value}, user=${user.id}`);
@ -103,7 +103,7 @@ export default class Give extends Command {
    private async GiveCurrency(interaction: CommandInteraction) {
        const amount = interaction.options.get("amount", true);
-        const user = interaction.options.get("user", true).user!;
+        const user = interaction.options.getUser("user", true);
        AppLogger.LogSilly("Commands/Give/GiveCurrency", `Parameters: amount=${amount.value} user=${user.id}`);
--- a/src/commands/inventory.ts
+++ b/src/commands/inventory.ts
@ -22,11 +22,7 @@ export default class Inventory extends Command {
    public override async execute(interaction: CommandInteraction) {
        const page = interaction.options.get("page");
-        const userOption = interaction.options.get("user");
+        const user = interaction.options.getUser("user") || interaction.user;
        const user = userOption ? userOption.user! : interaction.user;
        await interaction.deferReply();
        AppLogger.LogSilly("Commands/Inventory", `Parameters: page=${page?.value}, user=${user.id}`);
@ -39,20 +35,14 @@ export default class Inventory extends Command {
            const embed = await InventoryHelper.GenerateInventoryPage(user.username, user.id, pageNumber);
-            if (!embed) {
+            await interaction.reply({
                await interaction.followUp("No page for user found.");
                return;
            }
            await interaction.followUp({
                files: [ embed.image ],
                embeds: [ embed.embed ],
                components: [ embed.row ],
            });
        } catch (e) {
            AppLogger.LogError("Commands/Inventory", e as string);
-            await interaction.followUp("An error has occurred running this command.");
+            await interaction.reply("No page for user found.");
        }
    }
 }
--- a/src/commands/series.ts
+++ b/src/commands/series.ts
@ -47,8 +47,6 @@ export default class Series extends Command {
        AppLogger.LogSilly("Commands/Series/View", `Parameters: id=${id?.value}`);
        await interaction.deferReply();
        if (!id) return;
        const series = CoreClient.Cards.find(x => x.id == id.value);
@ -56,17 +54,13 @@ export default class Series extends Command {
        if (!series) {
            AppLogger.LogVerbose("Commands/Series/View", "Series not found.");
-            await interaction.followUp("Series not found.");
+            await interaction.reply("Series not found.");
            return;
        }
-        const embed = await SeriesHelper.GenerateSeriesViewPage(series.id, 0, interaction.user.id);
+        const embed = SeriesHelper.GenerateSeriesViewPage(series.id, 0);
-        await interaction.followUp({
+        await interaction.reply({ embeds: [ embed!.embed ], components: [ embed!.row ]});
            embeds: [ embed!.embed ],
            components: [ embed!.row ],
            files: [ embed!.image ],
        });
    }
    private async ListSeries(interaction: CommandInteraction) {
--- a/src/commands/stats.ts
+++ b/src/commands/stats.ts
@ -1,51 +0,0 @@
 import {CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder} from "discord.js";
 import {Command} from "../type/command";
 import {CoreClient} from "../client/client";
 import {CardRarity} from "../constants/CardRarity";
 import EmbedColours from "../constants/EmbedColours";
 export default class Stats extends Command {
    constructor() {
        super();
        this.CommandBuilder = new SlashCommandBuilder()
            .setName("stats")
            .setDescription("Get bot stats such as card info")
            .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);
    }
    public override async execute(interaction: CommandInteraction) {
        const allCards = CoreClient.Cards.flatMap(x => x.cards);
        const totalCards = allCards.length;
        const bronzeCards = allCards.filter(x => x.type == CardRarity.Bronze)
            .length;
        const silverCards = allCards.filter(x => x.type == CardRarity.Silver)
            .length;
        const goldCards = allCards.filter(x => x.type == CardRarity.Gold)
            .length;
        const mangaCards = allCards.filter(x => x.type == CardRarity.Manga)
            .length;
        const legendaryCards = allCards.filter(x => x.type == CardRarity.Legendary)
            .length;
        const description = [
            `${totalCards} Total`,
            `${bronzeCards} Bronze`,
            `${silverCards} Silver`,
            `${goldCards} Gold`,
            `${mangaCards} Manga`,
            `${legendaryCards} Legendary`,
        ].join("\n");
        const embed = new EmbedBuilder()
            .setTitle("Stats")
            .setDescription(description)
            .setColor(EmbedColours.Ok);
        await interaction.reply({
            embeds: [ embed ],
            ephemeral: true,
        });
    }
 }
--- a/src/commands/trade.ts
+++ b/src/commands/trade.ts
@ -30,39 +30,34 @@ export default class Trade extends Command {
    }
    public override async execute(interaction: CommandInteraction) {
-        const user = interaction.options.get("user", true).user!;
+        const user = interaction.options.getUser("user")!;
-        const give = interaction.options.get("give", true);
+        const give = interaction.options.get("give")!;
-        const receive = interaction.options.get("receive", true);
+        const receive = interaction.options.get("receive")!;
        AppLogger.LogSilly("Commands/Trade", `Parameters: user=${user.id}, give=${give.value}, receive=${receive.value}`);
-        if (interaction.user.id == user.id) {
+        const giveItemEntity = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, give.value!.toString());
-            await interaction.reply("You can not create a trade with yourself.");
+        const receiveItemEntity = await Inventory.FetchOneByCardNumberAndUserId(user.id, receive.value!.toString());
            return;
        }
-        const user1ItemEntity = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, give.value!.toString());
+        if (!giveItemEntity) {
        const user2ItemEntity = await Inventory.FetchOneByCardNumberAndUserId(user.id, receive.value!.toString());
        if (!user1ItemEntity) {
            await interaction.reply("You do not have the item you are trying to trade.");
            return;
        }
-        if (!user2ItemEntity) {
+        if (!receiveItemEntity) {
            await interaction.reply("The user you are trying to trade with does not have the item you are trying to trade for.");
            return;
        }
-        const user1Item = CoreClient.Cards
+        const giveItem = CoreClient.Cards
            .flatMap(x => x.cards)
            .find(x => x.id === give.value!.toString());
-        const user2Item = CoreClient.Cards
+        const receiveItem = CoreClient.Cards
            .flatMap(x => x.cards)
            .find(x => x.id === receive.value!.toString());
-        if (!user1Item || !user2Item) {
+        if (!giveItem || !receiveItem) {
            await interaction.reply("One or more of the items you are trying to trade does not exist.");
            return;
        }
@ -77,13 +72,13 @@ export default class Trade extends Command {
            .setImage("https://media1.tenor.com/m/KkZwKl2AQ2QAAAAd/trade-offer.gif")
            .addFields([
                {
-                    name: `${interaction.user.username} Receives`,
+                    name: "I Receive",
-                    value: `${user2Item.id}: ${user2Item.name}`,
+                    value: `${receiveItem.id}: ${receiveItem.name}`,
                    inline: true,
                },
                {
-                    name: `${user.username} Receives`,
+                    name: "You Receive",
-                    value: `${user1Item.id}: ${user1Item.name}`,
+                    value: `${giveItem.id}: ${giveItem.name}`,
                    inline: true,
                },
                {
@ -92,16 +87,16 @@ export default class Trade extends Command {
                }
            ]);
-        const timeoutId = setTimeout(async () => this.autoDecline(interaction, interaction.user.username, user.username, user1Item.id, user2Item.id, user1Item.name, user2Item.name), 1000 * 60 * 15); // 15 minutes
+        const timeoutId = setTimeout(async () => this.autoDecline(interaction, interaction.user.username, user.username, giveItem.id, receiveItem.id, giveItem.name, receiveItem.name), 1000 * 60 * 15); // 15 minutes
        const row = new ActionRowBuilder<ButtonBuilder>()
            .addComponents([
                new ButtonBuilder()
-                    .setCustomId(`trade accept ${interaction.user.id} ${user.id} ${user1Item.id} ${user2Item.id} ${expiry} ${timeoutId}`)
+                    .setCustomId(`trade accept ${interaction.user.id} ${user.id} ${giveItem.id} ${receiveItem.id} ${expiry} ${timeoutId}`)
                    .setLabel("Accept")
                    .setStyle(ButtonStyle.Success),
                new ButtonBuilder()
-                    .setCustomId(`trade decline ${interaction.user.id} ${user.id} ${user1Item.id} ${user2Item.id} ${expiry} ${timeoutId}`)
+                    .setCustomId(`trade decline ${interaction.user.id} ${user.id} ${giveItem.id} ${receiveItem.id} ${expiry} ${timeoutId}`)
                    .setLabel("Decline")
                    .setStyle(ButtonStyle.Danger),
            ]);
@ -109,23 +104,23 @@ export default class Trade extends Command {
        await interaction.reply({ content: `${user}`, embeds: [ tradeEmbed ], components: [ row ] });
    }
-    private async autoDecline(interaction: CommandInteraction, user1Username: string, user2Username: string, user1CardNumber: string, user2CardNumber: string, user1CardName: string, user2CardName: string) {
+    private async autoDecline(interaction: CommandInteraction, giveUsername: string, receiveUsername: string, giveCardNumber: string, receiveCardNumber: string, giveCardName: string, receiveCardName: string) {
-        AppLogger.LogSilly("Commands/Trade/AutoDecline", `Auto declining trade between ${user1Username} and ${user2Username}`);
+        AppLogger.LogSilly("Commands/Trade/AutoDecline", `Auto declining trade between ${giveUsername} and ${receiveUsername}`);
        const tradeEmbed = new EmbedBuilder()
            .setTitle("Trade Expired")
-            .setDescription(`Trade initiated between ${user1Username} and ${user2Username}`)
+            .setDescription(`Trade initiated between ${receiveUsername} and ${giveUsername}`)
            .setColor(EmbedColours.Error)
            .setImage("https://media1.tenor.com/m/KkZwKl2AQ2QAAAAd/trade-offer.gif")
            .addFields([
                {
-                    name: `${user1Username} Receives`,
+                    name: "I Receive",
-                    value: `${user2CardNumber}: ${user2CardName}`,
+                    value: `${receiveCardNumber}: ${receiveCardName}`,
                    inline: true,
                },
                {
-                    name: `${user2Username} Receives`,
+                    name: "You Receive",
-                    value: `${user1CardNumber}: ${user1CardName}`,
+                    value: `${giveCardNumber}: ${giveCardName}`,
                    inline: true,
                },
                {
--- a/src/constants/CardRarity.ts
+++ b/src/constants/CardRarity.ts
@ -65,11 +65,11 @@ export function GetSacrificeAmount(rarity: CardRarity): number {
    case CardRarity.Bronze:
        return 5;
    case CardRarity.Silver:
-        return 10;
+        return 15;
    case CardRarity.Gold:
        return 30;
    case CardRarity.Manga:
-        return 40;
+        return 50;
    case CardRarity.Legendary:
        return 100;
    default:
--- a/src/contracts/AppBaseEntity.ts
+++ b/src/contracts/AppBaseEntity.ts
@ -39,12 +39,6 @@ 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);
--- a/src/contracts/SeriesMetadata.ts
+++ b/src/contracts/SeriesMetadata.ts
@ -11,8 +11,6 @@ export interface CardMetadata {
    name: string,
    type: CardRarity,
    path: string,
    subseries?: string,
    colour?: string,
 }
 export interface DropResult {
--- a/src/helpers/CardDropHelperMetadata.ts
+++ b/src/helpers/CardDropHelperMetadata.ts
@ -4,8 +4,6 @@ import CardRarityChances from "../constants/CardRarityChances";
 import { DropResult } from "../contracts/SeriesMetadata";
 import { CoreClient } from "../client/client";
 import AppLogger from "../client/appLogger";
 import CardConstants from "../constants/CardConstants";
 import StringTools from "./StringTools";
 export default class CardDropHelperMetadata {
    public static GetRandomCard(): DropResult | undefined {
@ -79,59 +77,25 @@ export default class CardDropHelperMetadata {
        return { card, series };
    }
-    public static GenerateDropEmbed(drop: DropResult, quantityClaimed: number, imageFileName: string, claimedBy?: string, currency?: number): EmbedBuilder {
+    public static GenerateDropEmbed(drop: DropResult, quantityClaimed: number, imageFileName: string, claimedBy?: string): EmbedBuilder {
        AppLogger.LogSilly("CardDropHelperMetadata/GenerateDropEmbed", `Parameters: drop=${drop.card.id}, quantityClaimed=${quantityClaimed}, imageFileName=${imageFileName}`);
-        const description = drop.card.subseries ?? drop.series.name;
+        let description = "";
-        let colour = CardRarityToColour(drop.card.type);
+        description += `Series: ${drop.series.name}\n`;
        description += `Claimed: ${quantityClaimed}\n`;
-        if (drop.card.colour && StringTools.IsHexCode(drop.card.colour)) {
+        if (claimedBy != null) {
-            const hexCode = Number("0x" + drop.card.colour);
+            description += `Claimed by: ${claimedBy}\n`;
            if (hexCode) {
                colour = hexCode; 
        } else {
-                AppLogger.LogWarn("CardDropHelperMetadata/GenerateDropEmbed", `Card's colour override is invalid: ${drop.card.id}, ${drop.card.colour}`);
+            description += "Claimed by: (UNCLAIMED)\n";
            }
        } else if (drop.card.colour) {
            AppLogger.LogWarn("CardDropHelperMetadata/GenerateDropEmbed", `Card's colour override is invalid: ${drop.card.id}, ${drop.card.colour}`);
        }
-        const embed = new EmbedBuilder()
+        return new EmbedBuilder()
            .setTitle(drop.card.name)
            .setDescription(description)
            .setFooter({ text: `${CardRarityToString(drop.card.type)} · ${drop.card.id}` })
-            .setColor(colour)
+            .setColor(CardRarityToColour(drop.card.type))
-            .setImage(`attachment://${imageFileName}`)
+            .setImage(`attachment://${imageFileName}`);
            .addFields([
                {
                    name: "Claimed",
                    value: `${quantityClaimed}`,
                    inline: true,
                }
            ]);
        if (claimedBy != null) {
            embed.addFields([
                {
                    name: "Claimed by",
                    value: claimedBy,
                    inline: true,
                }
            ]);
        }
        if (currency != null) {
            embed.addFields([
                {
                    name: "Currency",
                    value: `${currency}`,
                    inline: true,
                }
            ]);
        }
        return embed;
    }
    public static GenerateDropButtons(drop: DropResult, claimId: string, userId: string, disabled: boolean = false): ActionRowBuilder<ButtonBuilder> {
@ -141,7 +105,7 @@ export default class CardDropHelperMetadata {
            .addComponents(
                new ButtonBuilder()
                    .setCustomId(`claim ${drop.card.id} ${claimId} ${userId}`)
-                    .setLabel(`Claim (${CardConstants.ClaimCost} 🪙)`)
+                    .setLabel("Claim")
                    .setStyle(ButtonStyle.Primary)
                    .setDisabled(disabled),
                new ButtonBuilder()
--- a/src/helpers/ImageHelper.ts
+++ b/src/helpers/ImageHelper.ts
@ -1,62 +0,0 @@
 import {createCanvas, loadImage} from "canvas";
 import path from "path";
 import AppLogger from "../client/appLogger";
 import {existsSync} from "fs";
 import Inventory from "../database/entities/app/Inventory";
 import Jimp from "jimp";
 interface CardInput {
    id: string;
    path: string;
 }
 export default class ImageHelper {
    public static async GenerateCardImageGrid(cards: CardInput[], userId?: string): Promise<Buffer> {
        const gridWidth = 3;
        const gridHeight = Math.ceil(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 < cards.length; i++) {
            const card = cards[i];
            const filePath = path.join(process.env.DATA_DIR!, "cards", card.path);
            const exists = existsSync(filePath);
            if (!exists) {
                AppLogger.LogError("ImageHelper/GenerateCardImageGrid", `Failed to load image from path ${card.path}`);
                continue;
            }
            const imageData = await Jimp.read(filePath);
            if (userId != null) {
                const claimed = await Inventory.FetchOneByCardNumberAndUserId(userId, card.id);
                if (!claimed || claimed.Quantity == 0) {
                    imageData.greyscale();
                }
            }
            const image = await loadImage(await imageData.getBufferAsync("image/png"));
            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();
    }
 }
--- a/src/helpers/InventoryHelper.ts
+++ b/src/helpers/InventoryHelper.ts
@ -1,11 +1,10 @@
-import { ActionRowBuilder, AttachmentBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js";
+import { ActionRowBuilder, 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 ImageHelper from "./ImageHelper";
 interface InventoryPage {
    id: number,
@ -19,26 +18,16 @@ 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<ReturnedInventoryPage | undefined> {
+    public static async GenerateInventoryPage(username: string, userid: string, page: number): Promise<{ embed: EmbedBuilder, row: ActionRowBuilder<ButtonBuilder> }> {
        AppLogger.LogSilly("Helpers/InventoryHelper", `Parameters: username=${username}, userid=${userid}, page=${page}`);
-        const cardsPerPage = 9;
+        const cardsPerPage = 15;
        const inventory = await Inventory.FetchAllByUserId(userid);
        if (!inventory || inventory.length == 0) return undefined;
        const clientCards = cloneDeep(CoreClient.Cards);
        const allSeriesClaimed = clientCards
@ -73,7 +62,6 @@ export default class InventoryHelper {
                        name: card.name,
                        type: card.type,
                        quantity: item.Quantity,
                        path: card.path,
                    });
                }
@ -89,15 +77,15 @@ export default class InventoryHelper {
        const currentPage = pages[page];
        if (!currentPage) {
-            return undefined;
+            AppLogger.LogError("Helpers/InventoryHelper", "Unable to find page");
            return Promise.reject("Unable to find page");
        }
        const embed = new EmbedBuilder()
            .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(
@ -112,9 +100,6 @@ export default class InventoryHelper {
                    .setStyle(ButtonStyle.Primary)
                    .setDisabled(page + 1 == pages.length));
-        const buffer = await ImageHelper.GenerateCardImageGrid(currentPage.cards.map(x => ({ id: x.id, path: x.path })));
+        return { embed, row };
        const image = new AttachmentBuilder(buffer, { name: "page.png" });
        return { embed, row, image };
    }
 }
--- a/src/helpers/SeriesHelper.ts
+++ b/src/helpers/SeriesHelper.ts
@ -1,16 +1,15 @@
-import { ActionRowBuilder, AttachmentBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js";
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js";
 import AppLogger from "../client/appLogger";
 import cloneDeep from "clone-deep";
 import { CoreClient } from "../client/client";
 import EmbedColours from "../constants/EmbedColours";
 import { CardRarityToString } from "../constants/CardRarity";
 import ImageHelper from "./ImageHelper";
 export default class SeriesHelper {
-    public static async GenerateSeriesViewPage(seriesId: number, page: number, userId: string): Promise<{ embed: EmbedBuilder, row: ActionRowBuilder<ButtonBuilder>, image: AttachmentBuilder } | null> {
+    public static GenerateSeriesViewPage(seriesId: number, page: number): { embed: EmbedBuilder, row: ActionRowBuilder<ButtonBuilder> } | null {
        AppLogger.LogSilly("Helpers/SeriesHelper", `Parameters: seriesId=${seriesId}, page=${page}`);
-        const itemsPerPage = 9;
+        const itemsPerPage = 15;
        const series = cloneDeep(CoreClient.Cards)
            .find(x => x.id == seriesId);
@ -21,7 +20,6 @@ export default class SeriesHelper {
        }
        const totalPages = Math.ceil(series.cards.length / itemsPerPage);
        const totalCards = series.cards.length;
        if (page > totalPages) {
            AppLogger.LogVerbose("Helpers/SeriesHelper", `Trying to find page greater than what exists for this series. Page: ${page} but there are only ${totalPages} pages`);
@ -31,15 +29,14 @@ export default class SeriesHelper {
        const cardsOnPage = series.cards.splice(page * itemsPerPage, itemsPerPage);
        const description = cardsOnPage
-            .map(x => `[${x.id}] ${x.name} (${CardRarityToString(x.type)})`)
+            .map(x => `[${x.id}] ${x.name} ${CardRarityToString(x.type).toUpperCase()}`)
            .join("\n");
        const embed = new EmbedBuilder()
            .setTitle(series.name)
            .setColor(EmbedColours.Ok)
            .setDescription(description)
-            .setFooter({ text: `${series.id} · ${totalCards} cards · Page ${page + 1} of ${totalPages}` })
+            .setFooter({ text: `${series.id} · ${series.cards.length} cards · Page ${page + 1} of ${totalPages}` });
            .setImage("attachment://page.png");
        const row = new ActionRowBuilder<ButtonBuilder>()
            .addComponents(
@ -52,12 +49,9 @@ export default class SeriesHelper {
                    .setCustomId(`series view ${seriesId} ${page + 1}`)
                    .setLabel("Next")
                    .setStyle(ButtonStyle.Primary)
-                    .setDisabled(page + 1 == totalPages));
+                    .setDisabled(page + 1 > totalPages));
-        const buffer = await ImageHelper.GenerateCardImageGrid(cardsOnPage.map(x => ({id: x.id, path: x.path})), userId);
+        return { embed, row };
        const image = new AttachmentBuilder(buffer, { name: "page.png" });
        return { embed, row, image };
    }
    public static GenerateSeriesListPage(page: number): { embed: EmbedBuilder, row: ActionRowBuilder<ButtonBuilder> } | null {
@ -78,7 +72,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}`)
            .join("\n");
        const embed = new EmbedBuilder()
@ -98,7 +92,7 @@ export default class SeriesHelper {
                    .setCustomId(`series list ${page + 1}`)
                    .setLabel("Next")
                    .setStyle(ButtonStyle.Primary)
-                    .setDisabled(page + 1 == totalPages));
+                    .setDisabled(page + 1 > totalPages));
        return { embed, row };
    }
--- a/src/helpers/StringTools.ts
+++ b/src/helpers/StringTools.ts
@ -39,18 +39,4 @@ export default class StringTools {
    public static ReplaceAll(str: string, find: string, replace: string) {
        return str.replace(new RegExp(find, "g"), replace);
    }
    public static IsHexCode(str: string): boolean {
        if (str.length != 6) return false;
        const characters = "0123456789abcdefABCDEF";
        for (let i = 0; i < 6; i++) {
            const char = str[i];
            if (!characters.includes(char)) return false;
        }
        return true;
    }
 }
--- a/src/registry.ts
+++ b/src/registry.ts
@ -3,7 +3,6 @@ import { Environment } from "./constants/Environment";
 // Global Command Imports
 import About from "./commands/about";
 import AllBalance from "./commands/allbalance";
 import Balance from "./commands/balance";
 import Daily from "./commands/daily";
 import Drop from "./commands/drop";
@ -13,7 +12,6 @@ import Inventory from "./commands/inventory";
 import Resync from "./commands/resync";
 import Sacrifice from "./commands/sacrifice";
 import Series from "./commands/series";
 import Stats from "./commands/stats";
 import Trade from "./commands/trade";
 import View from "./commands/view";
@ -33,7 +31,6 @@ export default class Registry {
    public static RegisterCommands() {
        // Global Commands
        CoreClient.RegisterCommand("about", new About());
        CoreClient.RegisterCommand("allbalance", new AllBalance());
        CoreClient.RegisterCommand("balance", new Balance());
        CoreClient.RegisterCommand("daily", new Daily());
        CoreClient.RegisterCommand("drop", new Drop());
@ -43,7 +40,6 @@ export default class Registry {
        CoreClient.RegisterCommand("resync", new Resync());
        CoreClient.RegisterCommand("sacrifice", new Sacrifice());
        CoreClient.RegisterCommand("series", new Series());
        CoreClient.RegisterCommand("stats", new Stats());
        CoreClient.RegisterCommand("trade", new Trade());
        CoreClient.RegisterCommand("view", new View());
--- a/src/timers/GiveCurrency.ts
+++ b/src/timers/GiveCurrency.ts
@ -3,17 +3,15 @@ import CardConstants from "../constants/CardConstants";
 import User from "../database/entities/app/User";
 export default async function GiveCurrency() {
-    AppLogger.LogDebug("Timers/GiveCurrency", "Giving currency to every known user");
+    AppLogger.LogInfo("Timers/GiveCurrency", "Giving currency to every known user");
    const users = await User.FetchAll(User);
-    const usersFiltered = users.filter(x => x.Currency < 1000);
+    for (const user of users) {
    for (const user of usersFiltered) {
        user.AddCurrency(CardConstants.TimerGiveAmount);
    }
    User.SaveAll(User, users);
-    AppLogger.LogDebug("Timers/GiveCurrency", `Successfully gave +${CardConstants.TimerGiveAmount} currency to ${usersFiltered.length} users`);
+    AppLogger.LogInfo("Timers/GiveCurrency", `Successfully gave +${CardConstants.TimerGiveAmount} currency to ${users.length} users`);
 }
--- a/src/timers/PurgeClaims.ts
+++ b/src/timers/PurgeClaims.ts
@ -1,14 +0,0 @@
 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`);
 }
--- a/tests/registry.test.ts
+++ b/tests/registry.test.ts
@ -1,66 +0,0 @@
 import {CoreClient} from "../src/client/client";
 import Registry from "../src/registry";
 import fs from "fs";
 import path from "path";
 describe("RegisterCommands", () => {
    test("EXPECT every command in the commands folder to be registered", () => {
        const registeredCommands: string[] = [];
        CoreClient.RegisterCommand = jest.fn().mockImplementation((name: string) => {
            registeredCommands.push(name);
        });
        Registry.RegisterCommands();
        const commandFiles = getFilesInDirectory(path.join(process.cwd(), "src", "commands"))
            .filter(x => x.endsWith(".ts"));
        for (const file of commandFiles) {
            expect(registeredCommands).toContain(file.split("/").pop()!.split(".")[0]);
        }
        expect(commandFiles.length).toBe(registeredCommands.length);
    });
 });
 describe("RegisterButtonEvents", () => {
    test("EXEPCT every button event in the button events folder to be registered", () => {
        const registeredButtonEvents: string[] = [];
        CoreClient.RegisterButtonEvent = jest.fn().mockImplementation((name: string) => {
            registeredButtonEvents.push(name);
        });
        Registry.RegisterButtonEvents();
        const eventFiles = getFilesInDirectory(path.join(process.cwd(), "src", "buttonEvents"))
            .filter(x => x.endsWith(".ts"));
        for (const file of eventFiles) {
            expect(registeredButtonEvents).toContain(file.split("/").pop()!.split(".")[0].toLowerCase());
        }
        expect(eventFiles.length).toBe(registeredButtonEvents.length);
    });
 });
 function getFilesInDirectory(dir: string): string[] {
    let results: string[] = [];
    const list = fs.readdirSync(dir);
    list.forEach(file => {
        file = path.join(dir, file);
        const stat = fs.statSync(file);
        if (stat && stat.isDirectory()) {
            /* recurse into a subdirectory */
            results = results.concat(getFilesInDirectory(file));
        } else {
            /* is a file */
            results.push(file);
        }
    });
    return results;
 }
--- a/yarn.lock
+++ b/yarn.lock