v0.6.4

# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

- Make the bot log a warning if the card metadata function finds duplicated ids

#233

## Type of change

Please delete options that are not relevant.

- [x] New feature (non-breaking change which adds functionality)

# How Has This Been Tested?

Please describe the tests that you ran to verify the changes. Provide instructions so we can reproduce. Please also list any relevant details to your test configuration.

# Checklist

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that provde my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream modules

Reviewed-on: #248
Reviewed-by: VylpesTester <tester@vylpes.com>
Co-authored-by: Ethan Lane <ethan@vylpes.com>
Co-committed-by: Ethan Lane <ethan@vylpes.com>

.drone.yml

@@ -4,16 +4,36 @@ kind: pipeline
 name: deployment
 
 steps:
-- name: deploy
-  image: appleboy/drone-ssh
+- name: build
+  image: node
+  commands:
+  - npm ci
+  - npm run build
+- name: test
+  image: node
+  commands:
+  - npm test
+- name: deploy to prod
+  image: drillster/drone-rsync
+  secrets: [ ssh_key, bot_token_prod ]
   settings:
-    host: 192.168.68.120
-    username: vylpes
-    password:
-      from_secret: ssh_password
-    port: 22
+    hosts:
+      - 192.168.68.120
+    user: vylpes
+    key:
+      from_secret: ssh_key
+    source: .
+    target: ~/apps/card-drop/card-drop_prod
+    recursive: true
     script:
-      - sh /home/vylpes/scripts/card-drop/deploy_prod.sh
+      - export PATH="$HOME/.yarn/bin:$PATH"
+      - export PATH="$HOME/.nodeuse/bin:$PATH"
+      - export BOT_TOKEN="$BOT_TOKEN_PROD"
+      - cd ~/apps/card-drop/card-drop_prod
+      - docker compose --file docker-compose.prod.yml up -d
+      - sleep 10
+      - cp .prod.env .env
+      - pm2 restart card-drop_prod || pm2 start --name card-drop_prod dist/bot.js
 
 trigger:
   event:
@@ -25,16 +45,36 @@ kind: pipeline
 name: staging
 
 steps:
-- name: stage
-  image: appleboy/drone-ssh
+- name: build
+  image: node
+  commands:
+  - npm ci
+  - npm run build
+- name: test
+  image: node
+  commands:
+  - npm test
+- name: deploy to stage
+  image: drillster/drone-rsync
+  secrets: [ ssh_key, bot_token_stage ]
   settings:
-    host: 192.168.68.120
-    username: vylpes
-    password:
-      from_secret: ssh_password
-    port: 22
+    hosts:
+      - 192.168.68.120
+    user: vylpes
+    key:
+      from_secret: ssh_key
+    source: .
+    target: ~/apps/card-drop/card-drop_stage
+    recursive: true
     script:
-      - sh /home/vylpes/scripts/card-drop/deploy_stage.sh
+      - export PATH="$HOME/.yarn/bin:$PATH"
+      - export PATH="$HOME/.nodeuse/bin:$PATH"
+      - export BOT_TOKEN="$BOT_TOKEN_STAGE"
+      - cd ~/apps/card-drop/card-drop_stage
+      - docker compose --file docker-compose.stage.yml up -d
+      - sleep 10
+      - cp .stage.env .env
+      - pm2 restart card-drop_stage || pm2 start --name card-drop_stage dist/bot.js
 
 trigger:
   branch:
@@ -54,16 +94,18 @@ steps:
   - npm ci
   - npm run build
 
+- name: lint
+  image: node
+  commands:
+  - npm run lint
+
 - name: test
   image: node
   commands:
-  - npm ci
   - npm test
 
 trigger:
   branch:
-  - main
-  - develop
   - hotfix/*
   - feature/*
   - renovate/*

.env.example

@@ -7,26 +7,30 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=0.3.0 DEV
+BOT_VER=0.6.4
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=682942374040961060
 BOT_ENV=4
+BOT_ADMINS=147392775707426816,887272961504071690
+BOT_LOGLEVEL=info
 
 ABOUT_FUNDING=
 ABOUT_REPO=
 
+DATA_DIR=./.temp
+
 DB_HOST=127.0.0.1
 DB_PORT=3301
 DB_NAME=carddrop
-DB_AUTH_USER=dev
-DB_AUTH_PASS=dev
-DB_SYNC=true
-DB_LOGGING=true
+DB_AUTH_USER=
+DB_AUTH_PASS=
+DB_SYNC=
+DB_LOGGING=
+DB_DATA_LOCATION=./.temp/database
 
 DB_CARD_FILE=:memory:
 
-EXPRESS_PORT=3303
+EXPRESS_PORT=3302
 
-GDRIVESYNC_WHITELIST=147392775707426816,887272961504071690
-GDRIVESYNC_AUTO=true
+GDRIVESYNC_AUTO=true

.eslintrc.json

@@ -0,0 +1,45 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "rules": {
+        "indent": [
+            "error",
+            4
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "double"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ]
+    },
+    "globals": {
+        "jest": true,
+        "require": true,
+        "exports": true,
+        "process": true
+    },
+    "ignorePatterns": [
+        "dist/**/*"
+    ]
+}

.forgejo/workflows/production.yml

@@ -0,0 +1,73 @@
+name: Deploy To Production
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    environment: prod
+
+    runs-on: node
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 18.x
+    - run: yarn install --frozen-lockfile
+    - run: yarn build
+    - run: yarn test
+    - run: yarn lint
+
+    - name: "Copy files over to location"
+      run: cp -r . ${{ secrets.PROD_REPO_PATH }}
+
+  deploy:
+    environment: prod
+    needs: build
+    runs-on: node
+    steps:
+    - 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 }}
+        DB_AUTH_PASS: ${{ secrets.PROD_DB_AUTH_PASS }}
+        DB_HOST: ${{ secrets.PROD_DB_HOST }}
+        DB_PORT: ${{ secrets.PROD_DB_PORT }}
+        DB_ROOT_HOST: ${{ secrets.PROD_DB_ROOT_HOST }}
+        DB_SYNC: ${{ secrets.PROD_DB_SYNC }}
+        DB_LOGGING: ${{ secrets.PROD_DB_LOGGING }}
+        DB_DATA_LOCATION: ${{ secrets.PROD_DB_DATA_LOCATION }}
+        SERVER_PATH: ${{ secrets.PROD_SSH_SERVER_PATH }}
+        BOT_TOKEN: ${{ secrets.PROD_BOT_TOKEN }}
+        BOT_VER: ${{ vars.PROD_BOT_VER }}
+        BOT_AUTHOR: ${{ vars.PROD_BOT_AUTHOR }}
+        BOT_OWNERID: ${{ vars.PROD_BOT_OWNERID }}
+        BOT_CLIENTID: ${{ vars.PROD_BOT_CLIENTID }}
+        BOT_ENV: ${{ vars.PROD_BOT_ENV }}
+        BOT_ADMINS: ${{ vars.PROD_BOT_ADMINS }}
+        ABOUT_FUNDING: ${{ vars.PROD_ABOUT_FUNDING }}
+        ABOUT_REPO: ${{ vars.PROD_ABOUT_REPO }}
+        DATA_DIR: ${{ secrets.PROD_DATA_DIR }}
+        GDRIVESYNC_AUTO: ${{ vars.PROD_GDRIVESYNC_AUTO }}
+        EXPRESS_PORT: ${{ secrets.PROD_EXPRESS_PORT }}
+        BOT_LOGLEVEL: ${{ vars.PROD_BOT_LOGLEVEL }}
+      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
+        script: |
+          source .sshrc \
+          && cd /home/vylpes/apps/card-drop/card-drop_prod \
+          && docker compose down \
+          && (pm2 stop card-drop_prod || true) \
+          && (pm2 delete card-drop_prod || true) \
+          && docker compose up -d \
+          && sleep 10 \
+          && yarn run db:up \
+          && pm2 start --name card-drop_prod dist/bot.js

.forgejo/workflows/stage.yml

@@ -0,0 +1,73 @@
+name: Deploy To Stage
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  build:
+    environment: stage
+
+    runs-on: node
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 18.x
+    - run: yarn install --frozen-lockfile
+    - run: yarn build
+    - run: yarn test
+    - run: yarn lint
+
+    - name: "Copy files over to location"
+      run: cp -r . ${{ secrets.STAGE_REPO_PATH }}
+
+  deploy:
+    environment: prod
+    needs: build
+    runs-on: node
+    steps:
+    - 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 }}
+        DB_AUTH_PASS: ${{ secrets.STAGE_DB_AUTH_PASS }}
+        DB_HOST: ${{ secrets.STAGE_DB_HOST }}
+        DB_PORT: ${{ secrets.STAGE_DB_PORT }}
+        DB_ROOT_HOST: ${{ secrets.STAGE_DB_ROOT_HOST }}
+        DB_SYNC: ${{ secrets.STAGE_DB_SYNC }}
+        DB_LOGGING: ${{ secrets.STAGE_DB_LOGGING }}
+        DB_DATA_LOCATION: ${{ secrets.STAGE_DB_DATA_LOCATION }}
+        SERVER_PATH: ${{ secrets.STAGE_SSH_SERVER_PATH }}
+        BOT_TOKEN: ${{ secrets.STAGE_BOT_TOKEN }}
+        BOT_VER: ${{ vars.STAGE_BOT_VER }}
+        BOT_AUTHOR: ${{ vars.STAGE_BOT_AUTHOR }}
+        BOT_OWNERID: ${{ vars.STAGE_BOT_OWNERID }}
+        BOT_CLIENTID: ${{ vars.STAGE_BOT_CLIENTID }}
+        BOT_ENV: ${{ vars.STAGE_BOT_ENV }}
+        BOT_ADMINS: ${{ vars.STAGE_BOT_ADMINS }}
+        ABOUT_FUNDING: ${{ vars.STAGE_ABOUT_FUNDING }}
+        ABOUT_REPO: ${{ vars.STAGE_ABOUT_REPO }}
+        DATA_DIR: ${{ secrets.STAGE_DATA_DIR }}
+        GDRIVESYNC_AUTO: ${{ vars.STAGE_GDRIVESYNC_AUTO }}
+        EXPRESS_PORT: ${{ secrets.STAGE_EXPRESS_PORT }}
+        BOT_LOGLEVEL: ${{ vars.STAGE_BOT_LOGLEVEL }}
+      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
+        script: |
+          source .sshrc \
+          && cd /home/vylpes/apps/card-drop/card-drop_stage \
+          && docker compose down \
+          && (pm2 stop card-drop_stage || true) \
+          && (pm2 delete card-drop_stage || true) \
+          && docker compose up -d \
+          && sleep 10 \
+          && yarn run db:up \
+          && pm2 start --name card-drop_stage dist/bot.js

.forgejo/workflows/test.yml

@@ -0,0 +1,25 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - feature/*
+      - hotfix/*
+      - renovate/*
+
+jobs:
+  build:
+    environment: stage
+
+    runs-on: node
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Use Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 18.x
+    - run: yarn install --frozen-lockfile
+    - run: yarn build
+    - run: yarn test
+    - run: yarn lint

.gitignore

@@ -107,5 +107,6 @@ config.json
 .DS_Store
 ormconfig.json
 gdrive-credentials.json
-cards/
-*.db
+data/
+*.db
+.temp/

.prod.env

@@ -1,32 +0,0 @@
-# Security Warning! Do not commit this file to any VCS!
-# This is a local file to speed up development process,
-# so you don't have to change your environment variables.
-#
-# This is not applied to `.env.template`!
-# Template files must be committed to the VCS, but must not contain
-# any secret values.
-
-BOT_TOKEN=
-BOT_VER=0.3.0
-BOT_AUTHOR=Vylpes
-BOT_OWNERID=147392775707426816
-BOT_CLIENTID=1093810443589529631
-BOT_ENV=1
-
-ABOUT_FUNDING=
-ABOUT_REPO=
-
-DB_HOST=127.0.0.1
-DB_PORT=3321
-DB_NAME=carddrop
-DB_AUTH_USER=prod
-DB_AUTH_PASS=prod
-DB_SYNC=false
-DB_LOGGING=false
-
-DB_CARD_FILE=:memory:
-
-EXPRESS_PORT=3323
-
-GDRIVESYNC_WHITELIST=147392775707426816,887272961504071690
-GDRIVESYNC_AUTO=false

.stage.env

@@ -1,32 +0,0 @@
-# Security Warning! Do not commit this file to any VCS!
-# This is a local file to speed up development process,
-# so you don't have to change your environment variables.
-#
-# This is not applied to `.env.template`!
-# Template files must be committed to the VCS, but must not contain
-# any secret values.
-
-BOT_TOKEN=
-BOT_VER=0.3.0 BETA
-BOT_AUTHOR=Vylpes
-BOT_OWNERID=147392775707426816
-BOT_CLIENTID=1147976642942214235
-BOT_ENV=2
-
-ABOUT_FUNDING=
-ABOUT_REPO=
-
-DB_HOST=127.0.0.1
-DB_PORT=3311
-DB_NAME=carddrop
-DB_AUTH_USER=stage
-DB_AUTH_PASS=stage
-DB_SYNC=false
-DB_LOGGING=false
-
-DB_CARD_FILE=:memory:
-
-EXPRESS_PORT=3313
-
-GDRIVESYNC_WHITELIST=147392775707426816,887272961504071690
-GDRIVESYNC_AUTO=false

.woodpecker.yml

@@ -0,0 +1,47 @@
+steps:
+  build:
+    image: node
+    commands:
+    - npm ci
+    - npm run build
+    when:
+      event: push
+      branch: [ hotfix/*, feature/*, renovate/*, develop, main ]
+  lint:
+    image: node
+    commands:
+    - npm run lint
+    when:
+      event: push
+      branch: [ hotfix/*, feature/*, renovate/*, develop, main ]
+  test:
+    image: node
+    commands:
+    - npm test
+    when:
+      event: push
+      branch: [ hotfix/*, feature/*, renovate/*, develop, main ]
+  stage:
+    image: alpine
+    secrets: [ ssh_key, stage_bot_token ]
+    commands:
+      - apk add rsync openssh-client
+      - eval `ssh-agent -s`
+      - echo "$SSH_KEY" | tr -d '\r' | ssh-add -
+      - rsync -e "ssh -o StrictHostKeyChecking=no" -r ./* vylpes@192.168.1.115:/home/vylpes/apps/card-drop/card-drop_stage
+      - ssh vylpes@192.168.1.115 BOT_TOKEN='$${stage_bot_token}' 'bash -s' < ./scripts/deploy_stage.sh
+    when:
+      event: push
+      branch: [ develop ]
+  deploy:
+    image: alpine
+    secrets: [ ssh_key, prod_bot_token ]
+    commands:
+      - apk add rsync openssh-client
+      - eval `ssh-agent -s`
+      - echo "$SSH_KEY" | tr -d '\r' | ssh-add -
+      - rsync -e "ssh -o StrictHostKeyChecking=no" -r ./* vylpes@192.168.1.115:/home/vylpes/apps/card-drop/card-drop_prod
+      - ssh vylpes@192.168.1.115 BOT_TOKEN='$${prod_bot_token}' 'bash -s' < ./scripts/deploy_prod.sh
+    when:
+      event: push
+      branch: [ main ]

database/0.6/1713289062969-user/Up/01-table/User.sql

@@ -0,0 +1,7 @@
+CREATE TABLE `user` (
+  `Id` varchar(255) NOT NULL,
+  `WhenCreated` datetime NOT NULL,
+  `WhenUpdated` datetime NOT NULL,
+  `Currency` int NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

database/0.6/1715967355818-daily/Up/01-table/User.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `user`
+ADD LastUsedDaily datetime null;

docker-compose.prod.yml

@@ -1,31 +0,0 @@
-version: "3.9"
-
-volumes:
-  prod_database_data:
-
-services:
-  # discord:
-  #   build: .
-
-  database:
-    image: mysql/mysql-server
-    command: --default-authentication-plugin=mysql_native_password
-    restart: always
-    environment:
-      - MYSQL_DATABASE=carddrop
-      - MYSQL_USER=prod
-      - MYSQL_PASSWORD=prod
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_ROOT_HOST=0.0.0.0
-    ports:
-      - "3321:3306"
-    volumes:
-      - prod_database_data:/var/lib/mysql
-
-  phpmyadmin:
-    image: phpmyadmin
-    restart: always
-    ports:
-      - "3322:80"
-    environment:
-      - PMA_ARBITRARY=1

docker-compose.stage.yml

@@ -1,31 +0,0 @@
-version: "3.9"
-
-volumes:
-  stage_database_data:
-
-services:
-  # discord:
-  #   build: .
-
-  database:
-    image: mysql/mysql-server
-    command: --default-authentication-plugin=mysql_native_password
-    restart: always
-    environment:
-      - MYSQL_DATABASE=carddrop
-      - MYSQL_USER=stage
-      - MYSQL_PASSWORD=stage
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_ROOT_HOST=0.0.0.0
-    ports:
-      - "3311:3306"
-    volumes:
-      - stage_database_data:/var/lib/mysql
-
-  phpmyadmin:
-    image: phpmyadmin
-    restart: always
-    ports:
-      - "3312:80"
-    environment:
-      - PMA_ARBITRARY=1

docker-compose.yml

@@ -1,31 +1,17 @@
 version: "3.9"
 
-volumes:
-  dev_database_data:
-
 services:
-  # discord:
-  #   build: .
-
   database:
     image: mysql/mysql-server
     command: --default-authentication-plugin=mysql_native_password
     restart: always
     environment:
-      - MYSQL_DATABASE=carddrop
-      - MYSQL_USER=dev
-      - MYSQL_PASSWORD=dev
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_ROOT_HOST=0.0.0.0
+      - MYSQL_DATABASE=$DB_NAME
+      - MYSQL_USER=$DB_AUTH_USER
+      - MYSQL_PASSWORD=$DB_AUTH_PASS
+      - MYSQL_ROOT_PASSWORD=$DB_AUTH_PASS
+      - MYSQL_ROOT_HOST=$DB_ROOT_HOST
     ports:
-      - "3301:3306"
+      - "$DB_PORT:3306"
     volumes:
-      - dev_database_data:/var/lib/mysql
-
-  phpmyadmin:
-    image: phpmyadmin
-    restart: always
-    ports:
-      - "3302:80"
-    environment:
-      - PMA_ARBITRARY=1
+      - $DB_DATA_LOCATION:/var/lib/mysql

package.json

@@ -1,6 +1,6 @@
 {
   "name": "card-drop",
-  "version": "0.3.0",
+  "version": "0.6.4",
   "main": "./dist/bot.js",
   "typings": "./dist",
   "scripts": {
@@ -8,6 +8,8 @@
     "build": "tsc",
     "start": "node ./dist/bot.js",
     "test": "jest --passWithNoTests",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "db:up": "typeorm migration:run -d dist/database/dataSources/appDataSource.js",
     "db:down": "typeorm migration:revert -d dist/database/dataSources/appDataSource.js",
     "db:create": "typeorm migration:create ./src/database/migrations/app/new",
@@ -24,27 +26,34 @@
   "funding": "https://ko-fi.com/vylpes",
   "dependencies": {
     "@discordjs/rest": "^2.0.0",
+    "@types/clone-deep": "^4.0.4",
     "@types/express": "^4.17.20",
     "@types/jest": "^29.0.0",
     "@types/uuid": "^9.0.0",
     "body-parser": "^1.20.2",
+    "clone-deep": "^4.0.1",
+    "cron": "^3.1.7",
     "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",
-    "minimatch": "9.0.3",
+    "minimatch": "9.0.4",
     "mysql": "^2.18.1",
     "ts-jest": "^29.0.0",
-    "typeorm": "0.3.17"
+    "typeorm": "0.3.20",
+    "winston": "^3.11.0"
   },
-  "resolutions": {
-    "**/undici": "^5.26.2"
+  "overrides": {
+    "undici": "^5.28.3"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
-    "np": "^8.0.4",
+    "@typescript-eslint/eslint-plugin": "^6.16.0",
+    "@typescript-eslint/parser": "^6.16.0",
+    "eslint": "^8.56.0",
+    "np": "^9.0.0",
     "typescript": "^5.0.0"
   }
 }

renovate.json

@@ -1,4 +1,5 @@
 {
     "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "baseBranches": ["develop"]
+    "baseBranches": ["develop"],
+    "labels": ["type/dependencies"]
   }

scripts/deploy_prod.sh

@@ -3,21 +3,8 @@
 export PATH="$HOME/.yarn/bin:$PATH"
 export PATH="$HOME/.nodeuse/bin:$PATH"
 
-export BOT_TOKEN=$(cat $HOME/scripts/card-drop/prod_key.txt)
-
-cd ~/apps/card-drop/card-drop_prod \
-&& git checkout main \
-&& git fetch \
-&& git pull \
-&& docker compose --file docker-compose.prod.yml down \
-&& (pm2 stop card-drop_prod || true) \
-&& (pm2 delete card-drop_prod || true) \
-&& cp .prod.env .env \
-&& npm run clean \
-&& npm ci \
-&& npm run build \
-&& docker compose --file docker-compose.prod.yml up -d \
-&& echo "Sleeping for 10 seconds to let database load..." \
-&& sleep 10 \
-&& npm run db:up \
-&& NODE_ENV=production pm2 start --name card-drop_prod dist/bot.js
+cd ~/apps/card-drop/card-drop_prod
+docker compose --file docker-compose.prod.yml up -d
+sleep 10
+cp .prod.env .env
+pm2 restart card-drop_prod || pm2 start --name card-drop_prod dist/bot.js

scripts/deploy_stage.sh

@@ -3,21 +3,8 @@
 export PATH="$HOME/.yarn/bin:$PATH"
 export PATH="$HOME/.nodeuse/bin:$PATH"
 
-export BOT_TOKEN=$(cat $HOME/scripts/card-drop/stage_key.txt)
-
-cd ~/apps/card-drop/card-drop_stage \
-&& git checkout develop \
-&& git fetch \
-&& git pull \
-&& docker compose --file docker-compose.stage.yml down \
-&& (pm2 stop card-drop_stage || true) \
-&& (pm2 delete card-drop_stage || true) \
-&& cp .stage.env .env \
-&& npm run clean \
-&& npm ci \
-&& npm run build \
-&& docker compose --file docker-compose.stage.yml up -d \
-&& echo "Sleeping for 10 seconds to let database load..." \
-&& sleep 10 \
-&& npm run db:up \
-&& NODE_ENV=production pm2 start --name card-drop_stage dist/bot.js
+cd ~/apps/card-drop/card-drop_stage
+docker compose --file docker-compose.stage.yml up -d
+sleep 10
+cp .stage.env .env
+pm2 restart card-drop_stage || pm2 start --name card-drop_stage dist/bot.js

src/Functions/CardMetadataFunction.ts

@@ -2,40 +2,92 @@ import { readFileSync } from "fs";
 import path from "path";
 import Config from "../database/entities/app/Config";
 import { glob } from "glob";
-import SeriesMetadata from "../contracts/SeriesMetadata";
+import { SeriesMetadata } from "../contracts/SeriesMetadata";
 import { CoreClient } from "../client/client";
+import AppLogger from "../client/appLogger";
+
+export interface CardMetadataResult {
+    IsSuccess: boolean;
+    ErrorMessage?: string;
+}
+
+export interface FindMetadataResult {
+    IsSuccess: boolean;
+    Result?: SeriesMetadata[];
+    Error?: {
+        File: string;
+        Message: string;
+    };
+}
 
 export default class CardMetadataFunction {
-    public static async Execute(overrideSafeMode: boolean = false): Promise<boolean> {
-        if (!overrideSafeMode && await Config.GetValue('safemode') == "true") return false;
+    public static async Execute(overrideSafeMode: boolean = false): Promise<CardMetadataResult> {
+        AppLogger.LogInfo("Functions/CardMetadataFunction", "Executing");
 
-        try {
-            CoreClient.Cards = await this.FindMetadataJSONs();
+        if (!overrideSafeMode && await Config.GetValue("safemode") == "true") {
+            AppLogger.LogWarn("Functions/CardMetadataFunction", "Safe Mode is active, refusing to resync");
 
-            console.log(`Loaded ${CoreClient.Cards.flatMap(x => x.cards).length} cards to database`);
-        } catch (e) {
-            console.error(e);
-
-            await Config.SetValue('safemode', 'true');
-            return false;
+            return {
+                IsSuccess: false,
+                ErrorMessage: "Safe mode is on and not overridden",
+            };
         }
 
-        return true;
+        const cardResult = await this.FindMetadataJSONs();
+
+        if (cardResult.IsSuccess) {
+            CoreClient.Cards = cardResult.Result!;
+            AppLogger.LogInfo("Functions/CardMetadataFunction", `Loaded ${CoreClient.Cards.flatMap(x => x.cards).length} cards to database`);
+
+            const duplicateCards = CoreClient.Cards.flatMap(x => x.cards)
+                .filter((card, index, self) => self.findIndex(c => c.id === card.id) !== index);
+
+            if (duplicateCards.length > 0) {
+                AppLogger.LogWarn("Functions/CardMetadataFunction", `Duplicate card ids found: ${duplicateCards.flatMap(x => x.id).join(", ")}`);
+            }
+
+            return {
+                IsSuccess: true,
+            };
+        }
+
+        await Config.SetValue("safemode", "true");
+        AppLogger.LogError("Functions/CardMetadataFunction", `Safe Mode activated due to error: ${cardResult.Error!.Message}`);
+
+        return {
+            IsSuccess: false,
+            ErrorMessage: `${cardResult.Error!.File}: ${cardResult.Error!.Message}`,
+        };
     }
 
-    private static async FindMetadataJSONs(): Promise<SeriesMetadata[]> {
+    private static async FindMetadataJSONs(): Promise<FindMetadataResult> {
         const res: SeriesMetadata[] = [];
 
-        const seriesJSONs = await glob(path.join(process.cwd(), 'cards', '/**/*.json'));
+        const seriesJSONs = await glob(path.join(process.env.DATA_DIR!, "cards", "/**/*.json"));
 
-        for (let jsonPath of seriesJSONs) {
-            console.log(`Reading file ${jsonPath}`);
-            const jsonFile = readFileSync(jsonPath);
-            const parsedJson: SeriesMetadata[] = JSON.parse(jsonFile.toString());
+        for (const jsonPath of seriesJSONs) {
+            try {
+                AppLogger.LogVerbose("Functions/CardMetadataFunction", `Reading file ${jsonPath}`);
+                const jsonFile = readFileSync(jsonPath);
+                const parsedJson: SeriesMetadata[] = JSON.parse(jsonFile.toString());
 
-            res.push(...parsedJson);
+                res.push(...parsedJson);
+            } catch (e) {
+                AppLogger.LogError("Functions/CardMetadataFunction", `Error reading file ${jsonPath}: ${e}`);
+
+                return {
+                    IsSuccess: false,
+                    Error: {
+                        File: jsonPath,
+                        Message: `${e}`,
+                    }
+                };
+            }
         }
 
-        return res;
+        return {
+            IsSuccess: true,
+            Result: res,
+        };
     }
 }

src/bot.ts

@@ -14,6 +14,8 @@ const requiredConfigs: string[] = [
     "BOT_OWNERID",
     "BOT_CLIENTID",
     "BOT_ENV",
+    "BOT_ADMINS",
+    "DATA_DIR",
     "DB_HOST",
     "DB_PORT",
     "DB_AUTH_USER",
@@ -21,8 +23,7 @@ const requiredConfigs: string[] = [
     "DB_SYNC",
     "DB_LOGGING",
     "EXPRESS_PORT",
-    "GDRIVESYNC_WHITELIST",
-]
+];
 
 requiredConfigs.forEach(config => {
     if (!process.env[config]) {
@@ -36,10 +37,9 @@ const client = new CoreClient([
 ]);
 
 Registry.RegisterCommands();
-Registry.RegisterEvents();
 Registry.RegisterButtonEvents();
 
-if (!existsSync(`${process.cwd()}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == 'true') {
+if (!existsSync(`${process.env.DATA_DIR}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == "true") {
     console.log("Card directory not found, syncing...");
 
     CoreClient.AllowDrops = false;
@@ -49,7 +49,7 @@ if (!existsSync(`${process.cwd()}/cards`) && process.env.GDRIVESYNC_AUTO && proc
             console.error(error.code);
             throw `Error while running sync command. Code: ${error.code}`;
         } else {
-            console.log('Synced successfully.');
+            console.log("Synced successfully.");
             CoreClient.AllowDrops = true;
         }
     });

src/buttonEvents/Claim.ts

@@ -3,28 +3,48 @@ import { ButtonEvent } from "../type/buttonEvent";
 import Inventory from "../database/entities/app/Inventory";
 import { CoreClient } from "../client/client";
 import { default as eClaim } from "../database/entities/app/Claim";
+import AppLogger from "../client/appLogger";
+import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
+import User from "../database/entities/app/User";
+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;
 
-        const cardNumber = interaction.customId.split(' ')[1];
-        const claimId = interaction.customId.split(' ')[2];
-        const droppedBy = interaction.customId.split(' ')[3];
+        await interaction.deferUpdate();
+
+        const cardNumber = interaction.customId.split(" ")[1];
+        const claimId = interaction.customId.split(" ")[2];
+        const droppedBy = interaction.customId.split(" ")[3];
         const userId = interaction.user.id;
 
+        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.reply('This card has already been claimed');
+            await interaction.channel.send(`${interaction.user}, This card has already been claimed!`);
             return;
         }
 
         if (claimId == CoreClient.ClaimId && userId != droppedBy) {
-            await interaction.reply('The latest dropped card can only be claimed by the user who dropped it');
+            await interaction.channel.send(`${interaction.user}, 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) {
@@ -40,6 +60,20 @@ export default class Claim extends ButtonEvent {
 
         await claim.Save(eClaim, claim);
 
-        await interaction.reply(`Card claimed by ${interaction.user}`);
+        const card = CardDropHelperMetadata.GetCardByCardNumber(cardNumber);
+
+        if (!card) {
+            return;
+        }
+
+        const imageFileName = card.card.path.split("/").pop()!;
+
+        const embed = CardDropHelperMetadata.GenerateDropEmbed(card, inventory.Quantity, imageFileName, interaction.user.username);
+        const row = CardDropHelperMetadata.GenerateDropButtons(card, claimId, interaction.user.id, true);
+
+        await interaction.editReply({
+            embeds: [ embed ],
+            components: [ row ],
+        });
     }
 }

src/buttonEvents/Inventory.ts

@@ -0,0 +1,37 @@
+import { ButtonInteraction } from "discord.js";
+import { ButtonEvent } from "../type/buttonEvent";
+import InventoryHelper from "../helpers/InventoryHelper";
+import AppLogger from "../client/appLogger";
+
+export default class Inventory extends ButtonEvent {
+    public override async execute(interaction: ButtonInteraction) {
+        if (!interaction.guild) return;
+
+        const userid = interaction.customId.split(" ")[1];
+        const page = interaction.customId.split(" ")[2];
+
+        AppLogger.LogSilly("Button/Inventory", `Parameters: userid=${userid}, page=${page}`);
+
+        const member = interaction.guild.members.cache.find(x => x.id == userid) || await interaction.guild.members.fetch(userid);
+
+        if (!member) {
+            await interaction.reply("Unable to find user.");
+            return;
+        }
+
+        try {
+            AppLogger.LogVerbose("Button/Inventory", `Generating inventory page ${page} for ${member.user.username} with id ${member.user.id}`);
+
+            const embed = await InventoryHelper.GenerateInventoryPage(member.user.username, member.user.id, Number(page));
+
+            await interaction.update({
+                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.reply("No page for user found.");
+        }
+    }
+}

src/buttonEvents/Reroll.ts

@@ -1,4 +1,4 @@
-import { AttachmentBuilder, ButtonInteraction, DiscordAPIError } from "discord.js";
+import { AttachmentBuilder, ButtonInteraction } from "discord.js";
 import { ButtonEvent } from "../type/buttonEvent";
 import { readFileSync } from "fs";
 import { v4 } from "uuid";
@@ -7,65 +7,75 @@ import Inventory from "../database/entities/app/Inventory";
 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) {
         if (!CoreClient.AllowDrops) {
-            await interaction.reply('Bot is currently syncing, please wait until its done.');
+            await interaction.reply("Bot is currently syncing, please wait until its done.");
             return;
         }
 
-        if (await Config.GetValue('safemode') == "true") {
-            await interaction.reply('Safe Mode has been activated, please resync to continue.');
+        if (await Config.GetValue("safemode") == "true") {
+            AppLogger.LogWarn("Button/Reroll", "Safe Mode is active, refusing to send next drop.");
+
+            await interaction.reply("Safe Mode has been activated, please resync to continue.");
+            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) {
-            await interaction.reply('Unable to fetch card, please try again.');
-            return;
-        }
-
-        let image: Buffer;
-        const imageFileName = randomCard.card.path.split("/").pop()!;
-
-        try {
-            image = readFileSync(path.join(process.cwd(), 'cards', randomCard.card.path));
-        } catch {
-            await interaction.reply(`Unable to fetch image for card ${randomCard.card.id}`);
+            await interaction.reply("Unable to fetch card, please try again.");
             return;
         }
 
         await interaction.deferReply();
 
-        const attachment = new AttachmentBuilder(image, { name: imageFileName });
-
-        const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
-        const quantityClaimed = inventory ? inventory.Quantity : 0;
-
-        const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName);
-
-        const claimId = v4();
-
-        const row = CardDropHelperMetadata.GenerateDropButtons(randomCard, claimId, interaction.user.id);
-
         try {
+            AppLogger.LogVerbose("Button/Reroll", `Sending next drop: ${randomCard.card.id} (${randomCard.card.name})`);
+
+            const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path));
+            const imageFileName = randomCard.card.path.split("/").pop()!;
+
+            const attachment = new AttachmentBuilder(image, { name: imageFileName });
+
+            const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
+            const quantityClaimed = inventory ? inventory.Quantity : 0;
+
+            const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName);
+
+            const claimId = v4();
+
+            const row = CardDropHelperMetadata.GenerateDropButtons(randomCard, claimId, interaction.user.id);
+
             await interaction.editReply({
                 embeds: [ embed ],
                 files: [ attachment ],
                 components: [ row ],
             });
+
+            CoreClient.ClaimId = claimId;
         } catch (e) {
-            console.error(e);
+            AppLogger.LogError("Button/Reroll", `Error sending next drop for card ${randomCard.card.id}: ${e}`);
 
-            if (e instanceof DiscordAPIError) {
-                await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: ${e.code}`);
-            } else {
-                await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN`);
-            }
+            await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. (${randomCard.card.id})`);
         }
-
-        CoreClient.ClaimId = claimId;
     }
 }

src/buttonEvents/Sacrifice.ts

@@ -0,0 +1,157 @@
+import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, ButtonStyle, EmbedBuilder } from "discord.js";
+import { ButtonEvent } from "../type/buttonEvent";
+import Inventory from "../database/entities/app/Inventory";
+import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
+import { CardRarityToString, GetSacrificeAmount } from "../constants/CardRarity";
+import EmbedColours from "../constants/EmbedColours";
+import User from "../database/entities/app/User";
+
+export default class Sacrifice extends ButtonEvent {
+    public override async execute(interaction: ButtonInteraction) {
+        const subcommand = interaction.customId.split(" ")[1];
+
+        switch(subcommand) {
+        case "confirm":
+            await this.confirm(interaction);
+            break;
+        case "cancel":
+            await this.cancel(interaction);
+            break;
+        }
+    }
+
+    private async confirm(interaction: ButtonInteraction) {
+        const userId = interaction.customId.split(" ")[2];
+        const cardNumber = interaction.customId.split(" ")[3];
+
+        if (userId != interaction.user.id) {
+            await interaction.reply("Only the user who created this sacrifice can confirm it.");
+            return;
+        }
+
+        const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber);
+
+        if (!cardInInventory) {
+            await interaction.reply("Unable to find card in inventory.");
+            return;
+        }
+
+        const cardData = CardDropHelperMetadata.GetCardByCardNumber(cardNumber);
+
+        if (!cardData) {
+            await interaction.reply("Unable to find card in the database.");
+            return;
+        }
+
+        const user = await User.FetchOneById(User, userId);
+
+        if (!user) {
+            await interaction.reply("Unable to find user in database.");
+            return;
+        }
+
+        cardInInventory.RemoveQuantity(1);
+
+        await cardInInventory.Save(Inventory, cardInInventory);
+
+        const cardValue = GetSacrificeAmount(cardData.card.type);
+        const cardRarityString = CardRarityToString(cardData.card.type);
+
+        user.AddCurrency(cardValue);
+
+        await user.Save(User, user);
+
+        const description = [
+            `Card: ${cardData.card.name}`,
+            `Series: ${cardData.series.name}`,
+            `Rarity: ${cardRarityString}`,
+            `Quantity Owned: ${cardInInventory.Quantity}`,
+            `Sacrifice Amount: ${cardValue}`,
+        ];
+
+        const embed = new EmbedBuilder()
+            .setTitle("Card Sacrificed")
+            .setDescription(description.join("\n"))
+            .setColor(EmbedColours.Green)
+            .setFooter({ text: `${interaction.user.username}` });
+
+        const row = new ActionRowBuilder<ButtonBuilder>()
+            .addComponents([
+                new ButtonBuilder()
+                    .setCustomId(`sacrifice confirm ${interaction.user.id} ${cardNumber}`)
+                    .setLabel("Confirm")
+                    .setStyle(ButtonStyle.Success)
+                    .setDisabled(true),
+                new ButtonBuilder()
+                    .setCustomId("sacrifice cancel")
+                    .setLabel("Cancel")
+                    .setStyle(ButtonStyle.Secondary)
+                    .setDisabled(true),
+            ]);
+
+        await interaction.update({
+            embeds: [ embed ],
+            components: [ row ],
+        });
+    }
+
+    private async cancel(interaction: ButtonInteraction) {
+        const userId = interaction.customId.split(" ")[2];
+        const cardNumber = interaction.customId.split(" ")[3];
+
+        if (userId != interaction.user.id) {
+            await interaction.reply("Only the user who created this sacrifice can cancel it.");
+            return;
+        }
+
+        const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(userId, cardNumber);
+
+        if (!cardInInventory) {
+            await interaction.reply("Unable to find card in inventory.");
+            return;
+        }
+
+        const cardData = CardDropHelperMetadata.GetCardByCardNumber(cardNumber);
+
+        if (!cardData) {
+            await interaction.reply("Unable to find card in the database.");
+            return;
+        }
+
+        const cardValue = GetSacrificeAmount(cardData.card.type);
+        const cardRarityString = CardRarityToString(cardData.card.type);
+
+        const description = [
+            `Card: ${cardData.card.name}`,
+            `Series: ${cardData.series.name}`,
+            `Rarity: ${cardRarityString}`,
+            `Quantity Owned: ${cardInInventory.Quantity}`,
+            `Sacrifice Amount: ${cardValue}`,
+        ];
+
+        const embed = new EmbedBuilder()
+            .setTitle("Sacrifice Cancelled")
+            .setDescription(description.join("\n"))
+            .setColor(EmbedColours.Grey)
+            .setFooter({ text: `${interaction.user.username}` });
+
+        const row = new ActionRowBuilder<ButtonBuilder>()
+            .addComponents([
+                new ButtonBuilder()
+                    .setCustomId(`sacrifice confirm ${interaction.user.id} ${cardNumber}`)
+                    .setLabel("Confirm")
+                    .setStyle(ButtonStyle.Success)
+                    .setDisabled(true),
+                new ButtonBuilder()
+                    .setCustomId("sacrifice cancel")
+                    .setLabel("Cancel")
+                    .setStyle(ButtonStyle.Secondary)
+                    .setDisabled(true),
+            ]);
+
+        await interaction.update({
+            embeds: [ embed ],
+            components: [ row ],
+        });
+    }
+}

src/buttonEvents/Series.ts

@@ -0,0 +1,45 @@
+import { ButtonInteraction } from "discord.js";
+import { ButtonEvent } from "../type/buttonEvent";
+import AppLogger from "../client/appLogger";
+import SeriesHelper from "../helpers/SeriesHelper";
+
+export default class Series extends ButtonEvent {
+    public override async execute(interaction: ButtonInteraction) {
+        const subaction = interaction.customId.split(" ")[1];
+
+        switch(subaction) {
+        case "view":
+            await this.ViewSeries(interaction);
+            break;
+        case "list":
+            await this.ListSeries(interaction);
+            break;
+        default:
+            AppLogger.LogWarn("Commands/Series", `Subaction doesn't exist: ${subaction}`);
+            interaction.reply("Subaction doesn't exist.");
+        }
+    }
+
+    private async ViewSeries(interaction: ButtonInteraction) {
+        const seriesid = interaction.customId.split(" ")[2];
+        const page = interaction.customId.split(" ")[3];
+
+        const embed = SeriesHelper.GenerateSeriesViewPage(Number(seriesid), Number(page));
+
+        await interaction.update({
+            embeds: [ embed!.embed ],
+            components: [ embed!.row ],
+        });
+    }
+
+    private async ListSeries(interaction: ButtonInteraction) {
+        const page = interaction.customId.split(" ")[2];
+
+        const embed = SeriesHelper.GenerateSeriesListPage(Number(page));
+
+        await interaction.update({
+            embeds: [ embed!.embed ],
+            components: [ embed!.row ],
+        });
+    }
+}

src/buttonEvents/Trade.ts

@@ -0,0 +1,211 @@
+import { ActionRowBuilder, ButtonBuilder, ButtonInteraction, ButtonStyle, EmbedBuilder } from "discord.js";
+import { ButtonEvent } from "../type/buttonEvent";
+import { CoreClient } from "../client/client";
+import Inventory from "../database/entities/app/Inventory";
+import EmbedColours from "../constants/EmbedColours";
+import AppLogger from "../client/appLogger";
+
+export default class Trade extends ButtonEvent {
+    public override async execute(interaction: ButtonInteraction) {
+        const action = interaction.customId.split(" ")[1];
+
+        AppLogger.LogSilly("Button/Trade", `Parameters: action=${action}`);
+
+        switch (action) {
+        case "accept":
+            await this.AcceptTrade(interaction);
+            break;
+        case "decline":
+            await this.DeclineTrade(interaction);
+            break;
+        }
+    }
+
+    private async AcceptTrade(interaction: ButtonInteraction) {
+        const user1UserId = interaction.customId.split(" ")[2];
+        const user2UserId = interaction.customId.split(" ")[3];
+        const user1CardNumber = interaction.customId.split(" ")[4];
+        const user2CardNumber = 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}`);
+
+        const expiryDate = new Date(expiry);
+
+        if (expiryDate < new Date()) {
+            await interaction.reply("Trade has expired");
+            return;
+        }
+
+        if (interaction.user.id !== user2UserId) {
+            await interaction.reply("You are not the user who the trade is intended for");
+            return;
+        }
+
+        const user1Item = CoreClient.Cards
+            .flatMap(x => x.cards)
+            .find(x => x.id === user1CardNumber);
+
+        const user2Item = CoreClient.Cards
+            .flatMap(x => x.cards)
+            .find(x => x.id === user2CardNumber);
+
+        if (!user1Item || !user2Item) {
+            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 user2User = interaction.client.users.cache.get(user2UserId) || await interaction.client.users.fetch(user2UserId);
+
+        const user1UserInventory1 = await Inventory.FetchOneByCardNumberAndUserId(user1UserId, user1CardNumber);
+        const user2UserInventory1 = await Inventory.FetchOneByCardNumberAndUserId(user2UserId, user2CardNumber);
+
+        if (!user1UserInventory1 || !user2UserInventory1) {
+            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) {
+            await interaction.reply("One or more of the items you are trying to trade does not exist.");
+            return;
+        }
+
+        user1UserInventory1.SetQuantity(user1UserInventory1.Quantity - 1);
+        user2UserInventory1.SetQuantity(user2UserInventory1.Quantity - 1);
+
+        await user1UserInventory1.Save(Inventory, user1UserInventory1);
+        await user2UserInventory1.Save(Inventory, user2UserInventory1);
+
+        let user1UserInventory2 = await Inventory.FetchOneByCardNumberAndUserId(user1UserId, user2CardNumber);
+        let user2UserInventory2 = await Inventory.FetchOneByCardNumberAndUserId(user2UserId, user1CardNumber);
+
+        if (!user1UserInventory2) {
+            user1UserInventory2 = new Inventory(user1UserId, user1CardNumber, 1);
+        } else {
+            user1UserInventory2.SetQuantity(user1UserInventory2.Quantity + 1);
+        }
+
+        if (!user2UserInventory2) {
+            user2UserInventory2 = new Inventory(user2UserId, user2CardNumber, 1);
+        } else {
+            user2UserInventory2.SetQuantity(user2UserInventory2.Quantity + 1);
+        }
+
+        await user1UserInventory2.Save(Inventory, user1UserInventory2);
+        await user2UserInventory2.Save(Inventory, user2UserInventory2);
+
+        clearTimeout(timeoutId);
+
+        const tradeEmbed = new EmbedBuilder()
+            .setTitle("Trade Accepted")
+            .setDescription(`Trade initiated between ${user1User.username} and ${user2User.username}`)
+            .setColor(EmbedColours.Success)
+            .setImage("https://i.imgur.com/9w5f1ls.gif")
+            .addFields([
+                {
+                    name: `${user1User.username} Receives`,
+                    value: `${user2Item.id}: ${user2Item.name}`,
+                    inline: true,
+                },
+                {
+                    name: `${user2User.username} Receives`,
+                    value: `${user1Item.id}: ${user1Item.name}`,
+                    inline: true,
+                },
+                {
+                    name: "Complete",
+                    value: new Date().toLocaleString(),
+                }
+            ]);
+
+        const row = new ActionRowBuilder<ButtonBuilder>()
+            .addComponents([
+                new ButtonBuilder()
+                    .setCustomId("trade expired accept")
+                    .setLabel("Accept")
+                    .setStyle(ButtonStyle.Success)
+                    .setDisabled(true),
+                new ButtonBuilder()
+                    .setCustomId("trade expired decline")
+                    .setLabel("Decline")
+                    .setStyle(ButtonStyle.Danger)
+                    .setDisabled(true),
+            ]);
+
+        await interaction.update({ embeds: [ tradeEmbed ], components: [ row ]});
+    }
+
+    private async DeclineTrade(interaction: ButtonInteraction) {
+        const user1UserId = interaction.customId.split(" ")[2];
+        const user2UserId = interaction.customId.split(" ")[3];
+        const user1CardNumber = interaction.customId.split(" ")[4];
+        const user2CardNumber = 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}`);
+
+        if (interaction.user.id != user1UserId && interaction.user.id !== user2UserId) {
+            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 user2User = interaction.client.users.cache.get(user2UserId) || await interaction.client.users.fetch(user2UserId);
+
+        const user1Item = CoreClient.Cards
+            .flatMap(x => x.cards)
+            .find(x => x.id === user1CardNumber);
+
+        const user2Item = CoreClient.Cards
+            .flatMap(x => x.cards)
+            .find(x => x.id === user2CardNumber);
+
+        if (!user1Item || !user2Item) {
+            await interaction.reply("One or more of the items you are trying to trade does not exist.");
+            return;
+        }
+
+        clearTimeout(timeoutId);
+
+        const tradeEmbed = new EmbedBuilder()
+            .setTitle("Trade Declined")
+            .setDescription(`Trade initiated between ${user1User.username} and ${user2User.username}`)
+            .setColor(EmbedColours.Error)
+            .setImage("https://i.imgur.com/9w5f1ls.gif")
+            .addFields([
+                {
+                    name: `${user1User.username} Receives`,
+                    value: `${user2Item.id}: ${user2Item.name}`,
+                    inline: true,
+                },
+                {
+                    name: `${user2User.username} Receives`,
+                    value: `${user1Item.id}: ${user1Item.name}`,
+                    inline: true,
+                },
+                {
+                    name: "Declined",
+                    value: new Date().toLocaleString(),
+                }
+            ]);
+
+        const row = new ActionRowBuilder<ButtonBuilder>()
+            .addComponents([
+                new ButtonBuilder()
+                    .setCustomId("trade expired accept")
+                    .setLabel("Accept")
+                    .setStyle(ButtonStyle.Success)
+                    .setDisabled(true),
+                new ButtonBuilder()
+                    .setCustomId("trade expired decline")
+                    .setLabel("Decline")
+                    .setStyle(ButtonStyle.Danger)
+                    .setDisabled(true),
+            ]);
+
+        await interaction.update({ embeds: [ tradeEmbed ], components: [ row ]});
+    }
+}

src/client/appLogger.ts

@@ -0,0 +1,65 @@
+import { Logger, createLogger, format, transports } from "winston";
+
+export default class AppLogger {
+    public static Logger: Logger;
+
+    public static InitialiseLogger(logLevel: string, outputToConsole: boolean) {
+        const customFormat = format.printf(({ level, message, timestamp, label }) => {
+            return `${timestamp} [${label}] ${level}: ${message}`;
+        });
+
+        const logger = createLogger({
+            level: logLevel,
+            format: format.combine(
+                format.timestamp({
+                    format: "YYYY-MM-DD HH:mm:ss"
+                }),
+                format.errors({ stack: true }),
+                format.splat(),
+                customFormat,
+            ),
+            defaultMeta: { service: "bot" },
+            transports: [
+                new transports.File({ filename: "error.log", level: "error" }),
+                new transports.File({ filename: "combined.log" }),
+            ],
+        });
+
+        if (outputToConsole) {
+            logger.add(new transports.Console({
+                format: format.combine(
+                    format.colorize(),
+                    format.timestamp(),
+                    customFormat,
+                )}));
+        }
+
+        AppLogger.Logger = logger;
+
+        AppLogger.LogInfo("AppLogger", `Log Level: ${logLevel}`);
+    }
+
+    public static LogError(label: string, message: string) {
+        AppLogger.Logger.error({ label, message });
+    }
+
+    public static LogWarn(label: string, message: string) {
+        AppLogger.Logger.warn({ label, message });
+    }
+
+    public static LogInfo(label: string, message: string) {
+        AppLogger.Logger.info({ label, message });
+    }
+
+    public static LogVerbose(label: string, message: string) {
+        AppLogger.Logger.verbose({ label, message });
+    }
+
+    public static LogDebug(label: string, message: string) {
+        AppLogger.Logger.debug({ label, message });
+    }
+
+    public static LogSilly(label: string, message: string) {
+        AppLogger.Logger.silly({ label, message });
+    }
+}

src/client/client.ts

@@ -1,28 +1,31 @@
-import { Client } from "discord.js";
+import { Client, DMChannel, Guild, GuildBan, GuildMember, Message, NonThreadGuildBasedChannel, PartialGuildMember, PartialMessage } from "discord.js";
 import * as dotenv from "dotenv";
-import { EventType } from "../constants/EventType";
 import ICommandItem from "../contracts/ICommandItem";
-import IEventItem from "../contracts/IEventItem";
+import EventExecutors from "../contracts/EventExecutors";
 import { Command } from "../type/command";
 
 import { Events } from "./events";
 import { Util } from "./util";
-import IButtonEventItem from "../contracts/IButtonEventItem";
+import IButtonEventItem from "../contracts/ButtonEventItem";
 import { ButtonEvent } from "../type/buttonEvent";
 import AppDataSource from "../database/dataSources/appDataSource";
 import { Environment } from "../constants/Environment";
 import Webhooks from "../webhooks";
 import CardMetadataFunction from "../Functions/CardMetadataFunction";
-import SeriesMetadata from "../contracts/SeriesMetadata";
+import { SeriesMetadata } from "../contracts/SeriesMetadata";
+import AppLogger from "./appLogger";
+import TimerHelper from "../helpers/TimerHelper";
+import GiveCurrency from "../timers/GiveCurrency";
 
 export class CoreClient extends Client {
     private static _commandItems: ICommandItem[];
-    private static _eventItems: IEventItem[];
+    private static _eventExecutors: EventExecutors;
     private static _buttonEvents: IButtonEventItem[];
 
     private _events: Events;
     private _util: Util;
     private _webhooks: Webhooks;
+    private _timerHelper: TimerHelper;
 
     public static ClaimId: string;
     public static Environment: Environment;
@@ -33,8 +36,8 @@ export class CoreClient extends Client {
         return this._commandItems;
     }
 
-    public static get eventItems(): IEventItem[] {
-        return this._eventItems;
+    public static get eventExecutors(): EventExecutors {
+        return this._eventExecutors;
     }
 
     public static get buttonEvents(): IButtonEventItem[] {
@@ -45,44 +48,56 @@ export class CoreClient extends Client {
         super({ intents: intents });
         dotenv.config();
 
+        CoreClient.Environment = Number(process.env.BOT_ENV);
+
+        const loglevel = process.env.BOT_LOGLEVEL ?? "info";
+
+        AppLogger.InitialiseLogger(loglevel, CoreClient.Environment == Environment.Local);
+
+        AppLogger.LogInfo("Client", "Initialising Client");
+
         CoreClient._commandItems = [];
-        CoreClient._eventItems = [];
         CoreClient._buttonEvents = [];
 
         this._events = new Events();
         this._util = new Util();
         this._webhooks = new Webhooks();
+        this._timerHelper = new TimerHelper();
 
-        CoreClient.Environment = Number(process.env.BOT_ENV);
-        console.log(`Bot Environment: ${CoreClient.Environment}`);
+        AppLogger.LogInfo("Client", `Environment: ${CoreClient.Environment}`);
 
         CoreClient.AllowDrops = true;
     }
 
     public async start() {
         if (!process.env.BOT_TOKEN) {
-            console.error("BOT_TOKEN is not defined in .env");
+            AppLogger.LogError("Client", "BOT_TOKEN is not defined in .env");
             return;
         }
 
         await AppDataSource.initialize()
-            .then(() => console.log("App Data Source Initialised"))
-            .catch(err => console.error("Error initialising App Data Source", err));
+            .then(() => {
+                AppLogger.LogInfo("Client", "App Data Source Initialised");
+
+                const timerId = this._timerHelper.AddTimer("*/20 * * * *", "Europe/London", GiveCurrency, false);
+                this._timerHelper.StartTimer(timerId);
+            })
+            .catch(err => {
+                AppLogger.LogError("Client", "App Data Source Initialisation Failed");
+                AppLogger.LogError("Client", err);
+                throw err;
+            });
 
         super.on("interactionCreate", this._events.onInteractionCreate);
         super.on("ready", this._events.onReady);
 
         await CardMetadataFunction.Execute(true);
 
-        this._util.loadEvents(this, CoreClient._eventItems);
+        this._util.loadEvents(this, CoreClient._eventExecutors);
         this._util.loadSlashCommands(this);
 
         this._webhooks.start();
 
-        console.log(`Registered Commands: ${CoreClient._commandItems.flatMap(x => x.Name).join(", ")}`);
-        console.log(`Registered Events: ${CoreClient._eventItems.flatMap(x => x.EventType).join(", ")}`);
-        console.log(`Registered Buttons: ${CoreClient._buttonEvents.flatMap(x => x.ButtonId).join(", ")}`);
-
         await super.login(process.env.BOT_TOKEN);
     }
 
@@ -94,21 +109,287 @@ export class CoreClient extends Client {
             ServerId: serverId,
         };
 
-        if (environment &= CoreClient.Environment) {
+        if ((environment & CoreClient.Environment) == CoreClient.Environment) {
             CoreClient._commandItems.push(item);
+
+            AppLogger.LogVerbose("Client", `Registered Command: ${name}`);
         }
     }
 
-    public static RegisterEvent(eventType: EventType, func: Function, environment: Environment = Environment.All) {
-        const item: IEventItem = {
-            EventType: eventType,
-            ExecutionFunction: func,
-            Environment: environment,
-        };
-
-        if (environment &= CoreClient.Environment) {
-            CoreClient._eventItems.push(item);
+    public static RegisterChannelCreateEvent(fn: (channel: NonThreadGuildBasedChannel) => void) {
+        if (this._eventExecutors) {
+            this._eventExecutors.ChannelCreate.push(fn);
+        } else {
+            this._eventExecutors = {
+                ChannelCreate: [ fn ],
+                ChannelDelete: [],
+                ChannelUpdate: [],
+                GuildBanAdd: [],
+                GuildBanRemove: [],
+                GuildCreate: [],
+                GuildMemberAdd: [],
+                GuildMemberRemove: [],
+                GuildMemebrUpdate: [],
+                MessageCreate: [],
+                MessageDelete: [],
+                MessageUpdate: [],
+            };
         }
+
+        AppLogger.LogVerbose("Client", "Registered Channel Create Event");
+    }
+
+    public static RegisterChannelDeleteEvent(fn: (channel: DMChannel | NonThreadGuildBasedChannel) => void) {
+        if (this._eventExecutors) {
+            this._eventExecutors.ChannelDelete.push(fn);
+        } else {
+            this._eventExecutors = {
+                ChannelCreate: [],
+                ChannelDelete: [ fn ],
+                ChannelUpdate: [],
+                GuildBanAdd: [],
+                GuildBanRemove: [],
+                GuildCreate: [],
+                GuildMemberAdd: [],
+                GuildMemberRemove: [],
+                GuildMemebrUpdate: [],
+                MessageCreate: [],
+                MessageDelete: [],
+                MessageUpdate: [],
+            };
+        }
+
+        AppLogger.LogVerbose("Client", "Registered Channel Delete Event");
+    }
+
+    public static RegisterChannelUpdateEvent(fn: (channel: DMChannel | NonThreadGuildBasedChannel) => void) {
+        if (this._eventExecutors) {
+            this._eventExecutors.ChannelCreate.push(fn);
+        } else {
+            this._eventExecutors = {
+                ChannelCreate: [],
+                ChannelDelete: [],
+                ChannelUpdate: [ fn ],
+                GuildBanAdd: [],
+                GuildBanRemove: [],
+                GuildCreate: [],
+                GuildMemberAdd: [],
+                GuildMemberRemove: [],
+                GuildMemebrUpdate: [],
+                MessageCreate: [],
+                MessageDelete: [],
+                MessageUpdate: [],
+            };
+        }
+
+        AppLogger.LogVerbose("Client", "Registered Channel Update Event");
+    }
+
+    public static RegisterGuildBanAddEvent(fn: (ban: GuildBan) => void) {
+        if (this._eventExecutors) {
+            this._eventExecutors.GuildBanAdd.push(fn);
+        } else {
+            this._eventExecutors = {
+                ChannelCreate: [],
+                ChannelDelete: [],
+                ChannelUpdate: [],
+                GuildBanAdd: [ fn ],
+                GuildBanRemove: [],
+                GuildCreate: [],
+                GuildMemberAdd: [],
+                GuildMemberRemove: [],
+                GuildMemebrUpdate: [],
+                MessageCreate: [],
+                MessageDelete: [],
+                MessageUpdate: [],
+            };
+        }
+
+        AppLogger.LogVerbose("Client", "Registered Guild Ban Add Event");
+    }
+
+    public static RegisterGuildBanRemoveEvent(fn: (channel: GuildBan) => void) {
+        if (this._eventExecutors) {
+            this._eventExecutors.GuildBanRemove.push(fn);
+        } else {
+            this._eventExecutors = {
+                ChannelCreate: [],
+                ChannelDelete: [],
+                ChannelUpdate: [],
+                GuildBanAdd: [],
+                GuildBanRemove: [ fn ],
+                GuildCreate: [],
+                GuildMemberAdd: [],
+                GuildMemberRemove: [],
+                GuildMemebrUpdate: [],
+                MessageCreate: [],
+                MessageDelete: [],
+                MessageUpdate: [],
+            };
+        }
+
+        AppLogger.LogVerbose("Client", "Registered Guild Ban Remove Event");
+    }
+
+    public static RegisterGuildCreateEvent(fn: (guild: Guild) => void) {
+        if (this._eventExecutors) {
+            this._eventExecutors.GuildCreate.push(fn);
+        } else {
+            this._eventExecutors = {
+                ChannelCreate: [],
+                ChannelDelete: [],
+                ChannelUpdate: [],
+                GuildBanAdd: [],
+                GuildBanRemove: [],
+                GuildCreate: [ fn ],
+                GuildMemberAdd: [],
+                GuildMemberRemove: [],
+                GuildMemebrUpdate: [],
+                MessageCreate: [],
+                MessageDelete: [],
+                MessageUpdate: [],
+            };
+        }
+
+        AppLogger.LogVerbose("Client", "Registered Guild Create Event");
+    }
+
+    public static RegisterGuildMemberAddEvent(fn: (member: GuildMember) => void) {
+        if (this._eventExecutors) {
+            this._eventExecutors.GuildMemberAdd.push(fn);
+        } else {
+            this._eventExecutors = {
+                ChannelCreate: [],
+                ChannelDelete: [],
+                ChannelUpdate: [],
+                GuildBanAdd: [],
+                GuildBanRemove: [],
+                GuildCreate: [],
+                GuildMemberAdd: [ fn ],
+                GuildMemberRemove: [],
+                GuildMemebrUpdate: [],
+                MessageCreate: [],
+                MessageDelete: [],
+                MessageUpdate: [],
+            };
+        }
+
+        AppLogger.LogVerbose("Client", "Registered Guild Member Add Event");
+    }
+
+    public static RegisterGuildMemberRemoveEvent(fn: (member: GuildMember | PartialGuildMember) => void) {
+        if (this._eventExecutors) {
+            this._eventExecutors.GuildMemberRemove.push(fn);
+        } else {
+            this._eventExecutors = {
+                ChannelCreate: [],
+                ChannelDelete: [],
+                ChannelUpdate: [],
+                GuildBanAdd: [],
+                GuildBanRemove: [],
+                GuildCreate: [],
+                GuildMemberAdd: [],
+                GuildMemberRemove: [ fn ],
+                GuildMemebrUpdate: [],
+                MessageCreate: [],
+                MessageDelete: [],
+                MessageUpdate: [],
+            };
+        }
+
+        AppLogger.LogVerbose("Client", "Registered Guild Member Remove Event");
+    }
+
+    public static GuildMemebrUpdate(fn: (oldMember: GuildMember | PartialGuildMember, newMember: GuildMember) => void) {
+        if (this._eventExecutors) {
+            this._eventExecutors.GuildMemebrUpdate.push(fn);
+        } else {
+            this._eventExecutors = {
+                ChannelCreate: [],
+                ChannelDelete: [],
+                ChannelUpdate: [],
+                GuildBanAdd: [],
+                GuildBanRemove: [],
+                GuildCreate: [],
+                GuildMemberAdd: [],
+                GuildMemberRemove: [],
+                GuildMemebrUpdate: [ fn ],
+                MessageCreate: [],
+                MessageDelete: [],
+                MessageUpdate: [],
+            };
+        }
+
+        AppLogger.LogVerbose("Client", "Registered Guild Member Update Event");
+    }
+
+    public static RegisterMessageCreateEvent(fn: (message: Message<boolean>) => void) {
+        if (this._eventExecutors) {
+            this._eventExecutors.MessageCreate.push(fn);
+        } else {
+            this._eventExecutors = {
+                ChannelCreate: [],
+                ChannelDelete: [],
+                ChannelUpdate: [],
+                GuildBanAdd: [],
+                GuildBanRemove: [],
+                GuildCreate: [],
+                GuildMemberAdd: [],
+                GuildMemberRemove: [],
+                GuildMemebrUpdate: [],
+                MessageCreate: [ fn ],
+                MessageDelete: [],
+                MessageUpdate: [],
+            };
+        }
+
+        AppLogger.LogVerbose("Client", "Registered Message Create Event");
+    }
+
+    public static RegisterMessageDeleteEvent(fn: (message: Message<boolean> | PartialMessage) => void) {
+        if (this._eventExecutors) {
+            this._eventExecutors.MessageDelete.push(fn);
+        } else {
+            this._eventExecutors = {
+                ChannelCreate: [],
+                ChannelDelete: [],
+                ChannelUpdate: [],
+                GuildBanAdd: [],
+                GuildBanRemove: [],
+                GuildCreate: [],
+                GuildMemberAdd: [],
+                GuildMemberRemove: [],
+                GuildMemebrUpdate: [],
+                MessageCreate: [],
+                MessageDelete: [ fn ],
+                MessageUpdate: [],
+            };
+        }
+
+        AppLogger.LogVerbose("Client", "Registered Message Delete Event");
+    }
+
+    public static RegisterMessageUpdateEvent(fn: (oldMessage: Message<boolean> | PartialMessage, newMessage: Message<boolean> | PartialMessage) => void) {
+        if (this._eventExecutors) {
+            this._eventExecutors.MessageUpdate.push(fn);
+        } else {
+            this._eventExecutors = {
+                ChannelCreate: [],
+                ChannelDelete: [],
+                ChannelUpdate: [],
+                GuildBanAdd: [],
+                GuildBanRemove: [],
+                GuildCreate: [],
+                GuildMemberAdd: [],
+                GuildMemberRemove: [],
+                GuildMemebrUpdate: [],
+                MessageCreate: [],
+                MessageDelete: [],
+                MessageUpdate: [ fn ],
+            };
+        }
+
+        AppLogger.LogVerbose("Client", "Registered Message Update Event");
     }
 
     public static RegisterButtonEvent(buttonId: string, event: ButtonEvent, environment: Environment = Environment.All) {
@@ -118,8 +399,10 @@ export class CoreClient extends Client {
             Environment: environment,
         };
 
-        if (environment &= CoreClient.Environment) {
+        if ((environment & CoreClient.Environment) == CoreClient.Environment) {
             CoreClient._buttonEvents.push(item);
+
+            AppLogger.LogVerbose("Client", `Registered Button Event: ${buttonId}`);
         }
     }
 }

src/client/events.ts

@@ -1,22 +1,28 @@
 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);
         }
 
         if (interaction.isButton()) {
+            AppLogger.LogVerbose("Client", `Button: ${interaction.customId}`);
             Button.onButtonClicked(interaction);
         }
     }
 
     // Emit when bot is logged in and ready to use
     public onReady() {
-        console.log("Ready");
+        AppLogger.LogInfo("Client", "Ready");
     }
 }

src/client/interactionCreate/Button.ts

@@ -1,17 +1,29 @@
-import { ButtonInteraction, Interaction } from "discord.js";
+import { ButtonInteraction } from "discord.js";
 import { CoreClient } from "../client";
+import AppLogger from "../appLogger";
 
 export default class Button {
     public static async onButtonClicked(interaction: ButtonInteraction) {
         if (!interaction.isButton) return;
 
-        const item = CoreClient.buttonEvents.find(x => x.ButtonId == interaction.customId.split(' ')[0]);
+        const item = CoreClient.buttonEvents.find(x => x.ButtonId == interaction.customId.split(" ")[0]);
 
         if (!item) {
-            await interaction.reply('Event not found');
+            AppLogger.LogVerbose("Button", `Event not found: ${interaction.customId}`);
+
+            await interaction.reply("Event not found");
             return;
         }
 
-        item.Event.execute(interaction);
+        try {
+            AppLogger.LogDebug("Button", `Executing ${interaction.customId}`);
+
+            item.Event.execute(interaction);
+        } catch (e) {
+            AppLogger.LogError("Button", `Error occurred while executing event: ${interaction.customId}`);
+            AppLogger.LogError("Button", e as string);
+
+            await interaction.reply("An error occurred while executing the event");
+        }
     }
 }

src/client/interactionCreate/ChatInputCommand.ts

@@ -1,6 +1,7 @@
 import { Interaction } from "discord.js";
 import { CoreClient } from "../client";
 import ICommandItem from "../../contracts/ICommandItem";
+import AppLogger from "../appLogger";
 
 export default class ChatInputCommand {
     public static async onChatInput(interaction: Interaction) {
@@ -13,7 +14,9 @@ export default class ChatInputCommand {
 
         if (!itemForServer) {
             if (!item) {
-                await interaction.reply('Command not found');
+                AppLogger.LogVerbose("ChatInputCommand", `Command not found: ${interaction.commandName}`);
+
+                await interaction.reply("Command not found");
                 return;
             }
 
@@ -22,6 +25,15 @@ export default class ChatInputCommand {
             itemToUse = itemForServer;
         }
 
-        itemToUse.Command.execute(interaction);
+        try {
+            AppLogger.LogDebug("Command", `Executing ${interaction.commandName}`);
+
+            itemToUse.Command.execute(interaction);
+        } catch (e) {
+            AppLogger.LogError("ChatInputCommand", `Error occurred while executing command: ${interaction.commandName}`);
+            AppLogger.LogError("ChatInputCommand", e as string);
+
+            await interaction.reply("An error occurred while executing the command");
+        }
     }
 }

src/client/interactionCreate/middleware/NewUserDiscovery.ts

@@ -0,0 +1,15 @@
+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}`);
+}

src/client/util.ts

@@ -1,7 +1,7 @@
 import { Client, REST, Routes, SlashCommandBuilder } from "discord.js";
-import { EventType } from "../constants/EventType";
-import IEventItem from "../contracts/IEventItem";
+import EventExecutors from "../contracts/EventExecutors";
 import { CoreClient } from "./client";
+import AppLogger from "./appLogger";
 
 export class Util {
     public loadSlashCommands(client: Client) {
@@ -10,25 +10,27 @@ export class Util {
         const globalCommands = registeredCommands.filter(x => !x.ServerId);
         const guildCommands = registeredCommands.filter(x => x.ServerId);
 
-        const globalCommandData: SlashCommandBuilder[] = [];
+        const globalCommandData: Omit<SlashCommandBuilder, "addSubcommand" | "addSubcommandGroup">[] = [];
 
-        for (let command of globalCommands) {
+        for (const command of globalCommands) {
             if (!command.Command.CommandBuilder) continue;
 
-            if (command.Environment &= CoreClient.Environment) {
+            if ((command.Environment & CoreClient.Environment) == CoreClient.Environment) {
                 globalCommandData.push(command.Command.CommandBuilder);
             }
         }
 
         const guildIds: string[] = [];
 
-        for (let command of guildCommands) {
+        for (const command of guildCommands) {
             if (!guildIds.find(x => x == command.ServerId)) {
                 guildIds.push(command.ServerId!);
             }
         }
 
-        const rest = new REST({ version: '10' }).setToken(process.env.BOT_TOKEN!);
+        const rest = new REST({ version: "10" }).setToken(process.env.BOT_TOKEN!);
+
+        AppLogger.LogVerbose("Util", `REST PUT: ${globalCommandData.flatMap(x => x.name).join(", ")}`);
 
         rest.put(
             Routes.applicationCommands(process.env.BOT_CLIENTID!),
@@ -37,71 +39,43 @@ export class Util {
             }
         );
 
-        for (let guild of guildIds) {
-            const guildCommandData: SlashCommandBuilder[] = [];
+        for (const guild of guildIds) {
+            const guildCommandData: Omit<SlashCommandBuilder, "addSubcommand" | "addSubcommandGroup">[] = [];
 
-            for (let command of guildCommands.filter(x => x.ServerId == guild)) {
+            for (const command of guildCommands.filter(x => x.ServerId == guild)) {
                 if (!command.Command.CommandBuilder) continue;
 
-                if (command.Environment &= CoreClient.Environment) {
+                if ((command.Environment & CoreClient.Environment) == CoreClient.Environment) {
                     guildCommandData.push(command.Command.CommandBuilder);
                 }
             }
 
             if (!client.guilds.cache.has(guild)) continue;
 
+            AppLogger.LogVerbose("Util", `REST PUT: ${guild} - ${guildCommandData.flatMap(x => x.name).join(", ")}`);
+
             rest.put(
                 Routes.applicationGuildCommands(process.env.BOT_CLIENTID!, guild),
                 {
                     body: guildCommandData
                 }
-            )
+            );
         }
     }
 
     // Load the events
-    loadEvents(client: Client, events: IEventItem[]) {
-        events.forEach((e) => {
-            switch(e.EventType) {
-                case EventType.ChannelCreate:
-                    client.on('channelCreate', (channel) => e.ExecutionFunction(channel));
-                    break;
-                case EventType.ChannelDelete:
-                    client.on('channelDelete', (channel) => e.ExecutionFunction(channel));
-                    break;
-                case EventType.ChannelUpdate:
-                    client.on('channelUpdate', (channel) => e.ExecutionFunction(channel));
-                    break;
-                case EventType.GuildBanAdd:
-                    client.on('guildBanAdd', (ban) => e.ExecutionFunction(ban));
-                    break;
-                case EventType.GuildBanRemove:
-                    client.on('guildBanRemove', (ban) => e.ExecutionFunction(ban));
-                    break;
-                case EventType.GuildCreate:
-                    client.on('guildCreate', (guild) => e.ExecutionFunction(guild));
-                    break;
-                case EventType.GuildMemberAdd:
-                    client.on('guildMemberAdd', (member) => e.ExecutionFunction(member));
-                    break;
-                case EventType.GuildMemberRemove:
-                    client.on('guildMemberRemove', (member) => e.ExecutionFunction(member));
-                    break;
-                case EventType.GuildMemberUpdate:
-                    client.on('guildMemberUpdate', (oldMember, newMember) => e.ExecutionFunction(oldMember, newMember));
-                    break;
-                case EventType.MessageCreate:
-                    client.on('messageCreate', (message) => e.ExecutionFunction(message));
-                    break;
-                case EventType.MessageDelete:
-                    client.on('messageDelete', (message) => e.ExecutionFunction(message));
-                    break;
-                case EventType.MessageUpdate:
-                    client.on('messageUpdate', (oldMessage, newMessage) => e.ExecutionFunction(oldMessage, newMessage));
-                    break;
-                default:
-                    console.error('Event not implemented.');
-            }
-        });
+    loadEvents(client: Client, events: EventExecutors) {
+        client.on("channelCreate", (channel) => events.ChannelCreate.forEach((fn) => fn(channel)));
+        client.on("channelDelete", (channel) => events.ChannelDelete.forEach((fn) => fn(channel)));
+        client.on("channelUpdate", (channel) => events.ChannelUpdate.forEach((fn) => fn(channel)));
+        client.on("guildBanAdd", (ban) => events.GuildBanAdd.forEach((fn) => fn(ban)));
+        client.on("guildBanRemove", (ban) => events.GuildBanRemove.forEach((fn) => fn(ban)));
+        client.on("guildCreate", (guild) => events.GuildCreate.forEach((fn) => fn(guild)));
+        client.on("guildMemberAdd", (member) => events.GuildMemberAdd.forEach((fn) => fn(member)));
+        client.on("guildMemberRemove", (member) => events.GuildMemberRemove.forEach((fn) => fn(member)));
+        client.on("guildMemberUpdate", (oldMember, newMember) => events.GuildMemebrUpdate.forEach((fn) => fn(oldMember, newMember)));
+        client.on("messageCreate", (message) => events.MessageCreate.forEach((fn) => fn(message)));
+        client.on("messageDelete", (message) => events.MessageDelete.forEach((fn) => fn(message)));
+        client.on("messageUpdate", (oldMessage, newMessage) => events.MessageUpdate.forEach((fn) => fn(oldMessage, newMessage)));
     }
 }

src/commands/about.ts

@@ -6,9 +6,9 @@ export default class About extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
-            .setName('about')
-            .setDescription('About Bot');
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("about")
+            .setDescription("About Bot");
     }
 
     public override async execute(interaction: CommandInteraction) {

src/commands/balance.ts

@@ -0,0 +1,28 @@
+import { CommandInteraction, EmbedBuilder, SlashCommandBuilder } from "discord.js";
+import { Command } from "../type/command";
+import User from "../database/entities/app/User";
+import EmbedColours from "../constants/EmbedColours";
+
+export default class Balance extends Command {
+    constructor() {
+        super();
+
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("balance")
+            .setDescription("Get your currency balance");
+    }
+
+    public override async execute(interaction: CommandInteraction) {
+        const user = await User.FetchOneById(User, interaction.user.id);
+
+        const userBalance = user != null ? user.Currency : 0;
+
+        const embed = new EmbedBuilder()
+            .setColor(EmbedColours.Ok)
+            .setTitle("Balance")
+            .setDescription(`You currently have **${userBalance} currency**!`)
+            .setFooter({ text: interaction.user.username, iconURL: interaction.user.avatarURL() ?? undefined });
+
+        await interaction.reply({ embeds: [ embed ]});
+    }
+}

src/commands/daily.ts

@@ -0,0 +1,43 @@
+import { CommandInteraction, SlashCommandBuilder } from "discord.js";
+import { Command } from "../type/command";
+import User from "../database/entities/app/User";
+import CardConstants from "../constants/CardConstants";
+import TimeLengthInput from "../helpers/TimeLengthInput";
+
+export default class Daily extends Command {
+    constructor() {
+        super();
+
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("daily")
+            .setDescription("Gain bonus currency, once a day");
+    }
+
+    public override async execute(interaction: CommandInteraction) {
+        const user = await User.FetchOneById(User, interaction.user.id) ?? new User(interaction.user.id, CardConstants.StartingCurrency);
+
+        const dayAgo = new Date(Date.now() - (1000 * 60 * 60 * 24));
+
+        if (user.LastUsedDaily && user.LastUsedDaily > dayAgo) {
+            const timeNow = Date.now();
+            const timeLength = 24 * 60 * 60 * 1000; // 1 day
+
+            const timeLeft = Math.ceil(((timeLength - (timeNow - user.LastUsedDaily.getTime()))) / 1000 / 60);
+
+            const timeLeftHours = Math.floor(timeLeft / 60);
+            const timeLeftMinutes = timeLeft % 60;
+
+            const timeLeftString = new TimeLengthInput(`${timeLeftHours}h ${timeLeftMinutes}m`);
+
+            await interaction.reply(`You have already used the daily command! You can use it again in **${timeLeftString.GetLength()}**.`);
+            return;
+        }
+
+        user.AddCurrency(CardConstants.DailyCurrency);
+        user.UpdateLastUsedDaily(new Date());
+
+        await user.Save(User, user);
+
+        await interaction.reply(`Congratulations, you have claimed your daily ${CardConstants.DailyCurrency} currency! You now have ${user.Currency} currency and can claim again in 24 hours!`);
+    }
+}

src/commands/drop.ts

@@ -1,4 +1,4 @@
-import { AttachmentBuilder, CommandInteraction, DiscordAPIError, SlashCommandBuilder } from "discord.js";
+import { AttachmentBuilder, CommandInteraction, SlashCommandBuilder } from "discord.js";
 import { Command } from "../type/command";
 import { readFileSync } from "fs";
 import { CoreClient } from "../client/client";
@@ -7,73 +7,85 @@ import Inventory from "../database/entities/app/Inventory";
 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() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
-            .setName('drop')
-            .setDescription('Summon a new card drop');
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("drop")
+            .setDescription("Summon a new card drop");
     }
 
     public override async execute(interaction: CommandInteraction) {
         if (!CoreClient.AllowDrops) {
-            await interaction.reply('Bot is currently syncing, please wait until its done.');
+            await interaction.reply("Bot is currently syncing, please wait until its done.");
             return;
         }
 
-        if (await Config.GetValue('safemode') == "true") {
-            await interaction.reply('Safe Mode has been activated, please resync to continue.');
+        if (await Config.GetValue("safemode") == "true") {
+            AppLogger.LogWarn("Commands/Drop", "Safe Mode is active, refusing to send next drop.");
+
+            await interaction.reply("Safe Mode has been activated, please resync to continue.");
+            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) {
-            await interaction.reply('Unable to fetch card, please try again.');
-            return;
-        }
+            AppLogger.LogWarn("Commands/Drop", "Unable to fetch card, please try again. (randomCard is null)");
 
-        let image: Buffer;
-        const imageFileName = randomCard.card.path.split("/").pop()!;
-
-        try {
-            image = readFileSync(path.join(process.cwd(), 'cards', randomCard.card.path));
-        } catch {
-            await interaction.reply(`Unable to fetch image for card ${randomCard.card.id}`);
+            await interaction.reply("Unable to fetch card, please try again.");
             return;
         }
 
         await interaction.deferReply();
 
-        const attachment = new AttachmentBuilder(image, { name: imageFileName });
-
-        const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
-        const quantityClaimed = inventory ? inventory.Quantity : 0;
-
-        const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName);
-
-        const claimId = v4();
-
-        const row = CardDropHelperMetadata.GenerateDropButtons(randomCard, claimId, interaction.user.id);
-
         try {
+            const image = readFileSync(path.join(process.env.DATA_DIR!, "cards", randomCard.card.path));
+            const imageFileName = randomCard.card.path.split("/").pop()!;
+
+            const attachment = new AttachmentBuilder(image, { name: imageFileName });
+
+            const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, randomCard.card.id);
+            const quantityClaimed = inventory ? inventory.Quantity : 0;
+
+            const embed = CardDropHelperMetadata.GenerateDropEmbed(randomCard, quantityClaimed, imageFileName);
+
+            const claimId = v4();
+
+            const row = CardDropHelperMetadata.GenerateDropButtons(randomCard, claimId, interaction.user.id);
+
             await interaction.editReply({
                 embeds: [ embed ],
                 files: [ attachment ],
                 components: [ row ],
             });
-        } catch (e) {
-            console.error(e);
 
-            if (e instanceof DiscordAPIError) {
-                await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: ${e.code}`);
-            } else {
-                await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN`);
-            }
+            CoreClient.ClaimId = claimId;
+
+        } catch (e) {
+            AppLogger.LogError("Commands/Drop", `Error sending next drop for card ${randomCard.card.id}: ${e}`);
+
+            await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. (${randomCard.card.id})`);
         }
 
-        CoreClient.ClaimId = claimId;
     }
 }

src/commands/gdrivesync.ts

@@ -4,42 +4,59 @@ import { ExecException, exec } from "child_process";
 import { CoreClient } from "../client/client";
 import Config from "../database/entities/app/Config";
 import CardMetadataFunction from "../Functions/CardMetadataFunction";
+import AppLogger from "../client/appLogger";
 
 export default class Gdrivesync extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
-            .setName('gdrivesync')
-            .setDescription('Sync google drive to the bot')
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("gdrivesync")
+            .setDescription("Sync google drive to the bot")
             .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);
     }
 
     public override async execute(interaction: CommandInteraction<CacheType>) {
         if (!interaction.isChatInputCommand()) return;
 
-        const whitelistedUsers = process.env.GDRIVESYNC_WHITELIST!.split(',');
+        const whitelistedUsers = process.env.BOT_ADMINS!.split(",");
 
         if (!whitelistedUsers.find(x => x == interaction.user.id)) {
             await interaction.reply("Only whitelisted users can use this command.");
             return;
         }
 
-        await interaction.reply('Syncing, this might take a while...');
+        await interaction.reply({
+            content: "Syncing, this might take a while...",
+            ephemeral: true,
+        });
 
         CoreClient.AllowDrops = false;
 
-        exec(`rclone sync card-drop-gdrive: ${process.cwd()}/cards`, async (error: ExecException | null) => {
+        AppLogger.LogInfo("Commands/GDriveSync", "Syncing google drive to the bot");
+
+        exec(`rclone sync card-drop-gdrive: ${process.env.DATA_DIR}/cards`, async (error: ExecException | null) => {
             if (error) {
+                AppLogger.LogError("Commands/GDriveSync", `Error while running sync command: ${error.code}, ${error.message}`);
+                AppLogger.LogWarn("Commands/GDriveSync", "Safe mode activated");
+
                 await interaction.editReply(`Error while running sync command. Safe Mode has been activated. Code: ${error.code}`);
-                await Config.SetValue('safemode', 'true');
+                await Config.SetValue("safemode", "true");
             } else {
-                await CardMetadataFunction.Execute();
+                const result = await CardMetadataFunction.Execute(true);
 
-                await interaction.editReply('Synced successfully.');
+                if (result.IsSuccess) {
+                    AppLogger.LogInfo("Commands/GDriveSync", "Synced successfully");
 
-                CoreClient.AllowDrops = true;
-                await Config.SetValue('safemode', 'false');
+                    await interaction.editReply("Synced successfully.");
+
+                    CoreClient.AllowDrops = true;
+                    await Config.SetValue("safemode", "false");
+                } else {
+                    AppLogger.LogError("Commands/GDriveSync", `Error while running sync command: ${result.ErrorMessage}`);
+
+                    await interaction.editReply(`Sync failed \`\`\`${result.ErrorMessage}\`\`\``);
+                }
             }
         });
     }

src/commands/give.ts

@@ -0,0 +1,118 @@
+import { CacheType, CommandInteraction, PermissionsBitField, SlashCommandBuilder } from "discord.js";
+import { Command } from "../type/command";
+import { CoreClient } from "../client/client";
+import Config from "../database/entities/app/Config";
+import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
+import Inventory from "../database/entities/app/Inventory";
+import AppLogger from "../client/appLogger";
+import User from "../database/entities/app/User";
+
+export default class Give extends Command {
+    constructor() {
+        super();
+
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("give")
+            .setDescription("Give a user a card manually, in case bot breaks")
+            .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator)
+            .addSubcommand(x =>
+                x
+                    .setName("card")
+                    .setDescription("Give a user a card manually")
+                    .addStringOption(x =>
+                        x
+                            .setName("cardnumber")
+                            .setDescription("The card to give")
+                            .setRequired(true))
+                    .addUserOption(x =>
+                        x
+                            .setName("user")
+                            .setDescription("The user to give the card to")
+                            .setRequired(true)))
+            .addSubcommand(x =>
+                x
+                    .setName("currency")
+                    .setDescription("Give a user currency manually")
+                    .addNumberOption(x =>
+                        x
+                            .setName("amount")
+                            .setDescription("The amount to give")
+                            .setRequired(true))
+                    .addUserOption(x =>
+                        x
+                            .setName("user")
+                            .setDescription("The user to give the currency to")
+                            .setRequired(true)));
+    }
+
+    public override async execute(interaction: CommandInteraction<CacheType>) {
+        if (!interaction.isChatInputCommand()) return;
+
+        const whitelistedUsers = process.env.BOT_ADMINS!.split(",");
+
+        if (!whitelistedUsers.find(x => x == interaction.user.id)) {
+            await interaction.reply("Only whitelisted users can use this command.");
+            return;
+        }
+
+        switch (interaction.options.getSubcommand()) {
+        case "card":
+            await this.GiveCard(interaction);
+            break;
+        case "currency":
+            await this.GiveCurrency(interaction);
+            break;
+        }
+    }
+
+    private async GiveCard(interaction: CommandInteraction) {
+        if (!CoreClient.AllowDrops) {
+            await interaction.reply("Bot is currently syncing, please wait until its done.");
+            return;
+        }
+
+        if (await Config.GetValue("safemode") == "true") {
+            await interaction.reply("Safe Mode has been activated, please resync to continue.");
+            return;
+        }
+
+        const cardNumber = interaction.options.get("cardnumber", true);
+        const user = interaction.options.get("user", true).user!;
+
+        AppLogger.LogSilly("Commands/Give/GiveCard", `Parameters: cardNumber=${cardNumber.value}, user=${user.id}`);
+
+        const card = CardDropHelperMetadata.GetCardByCardNumber(cardNumber.value!.toString());
+
+        if (!card) {
+            await interaction.reply("Unable to fetch card, please try again.");
+            return;
+        }
+
+        let inventory = await Inventory.FetchOneByCardNumberAndUserId(user.id, card.card.id);
+
+        if (!inventory) {
+            inventory = new Inventory(user.id, card.card.id, 1);
+        } else {
+            inventory.SetQuantity(inventory.Quantity + 1);
+        }
+
+        await inventory.Save(Inventory, inventory);
+
+        await interaction.reply(`Card ${card.card.name} given to ${user.username}, they now have ${inventory.Quantity}`);
+    }
+
+    private async GiveCurrency(interaction: CommandInteraction) {
+        const amount = interaction.options.get("amount", true);
+        const user = interaction.options.get("user", true).user!;
+
+        AppLogger.LogSilly("Commands/Give/GiveCurrency", `Parameters: amount=${amount.value} user=${user.id}`);
+
+        const userEntity = await User.FetchOneById(User, user.id) || new User(user.id, 300);
+
+        userEntity.AddCurrency(amount.value! as number);
+
+        await userEntity.Save(User, userEntity);
+
+        await interaction.reply(`${amount.value} currency ${amount.value! as number >= 0 ? "given to" : "taken from"} ${user.username}, they now have ${userEntity.Currency}`);
+    }
+}

src/commands/inventory.ts

@@ -0,0 +1,50 @@
+import { CommandInteraction, SlashCommandBuilder } from "discord.js";
+import { Command } from "../type/command";
+import InventoryHelper from "../helpers/InventoryHelper";
+import AppLogger from "../client/appLogger";
+
+export default class Inventory extends Command {
+    constructor() {
+        super();
+
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("inventory")
+            .setDescription("View your inventory")
+            .addNumberOption(x =>
+                x
+                    .setName("page")
+                    .setDescription("The page to start with"))
+            .addUserOption(x =>
+                x
+                    .setName("user")
+                    .setDescription("The user to view (Defaults to yourself)"));
+    }
+
+    public override async execute(interaction: CommandInteraction) {
+        const page = interaction.options.get("page");
+        const userOption = interaction.options.get("user");
+
+        const user = userOption ? userOption.user! : interaction.user;
+
+        AppLogger.LogSilly("Commands/Inventory", `Parameters: page=${page?.value}, user=${user.id}`);
+
+        try {
+            let pageNumber = 0;
+
+            if (page && page.value) {
+                pageNumber = Number(page.value) - 1;
+            }
+
+            const embed = await InventoryHelper.GenerateInventoryPage(user.username, user.id, pageNumber);
+
+            await interaction.reply({
+                embeds: [ embed.embed ],
+                components: [ embed.row ],
+            });
+        } catch (e) {
+            AppLogger.LogError("Commands/Inventory", e as string);
+
+            await interaction.reply("No page for user found.");
+        }
+    }
+}

src/commands/resync.ts

@@ -2,38 +2,45 @@ import { CacheType, CommandInteraction, PermissionsBitField, SlashCommandBuilder
 import { Command } from "../type/command";
 import Config from "../database/entities/app/Config";
 import CardMetadataFunction from "../Functions/CardMetadataFunction";
+import AppLogger from "../client/appLogger";
 
 export default class Resync extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
-            .setName('resync')
-            .setDescription('Resync the card database')
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("resync")
+            .setDescription("Resync the card database")
             .setDefaultMemberPermissions(PermissionsBitField.Flags.Administrator);
     }
 
     public override async execute(interaction: CommandInteraction<CacheType>) {
         if (!interaction.isChatInputCommand()) return;
 
-        const whitelistedUsers = process.env.GDRIVESYNC_WHITELIST!.split(',');
+        const whitelistedUsers = process.env.BOT_ADMINS!.split(",");
 
         if (!whitelistedUsers.find(x => x == interaction.user.id)) {
             await interaction.reply("Only whitelisted users can use this command.");
             return;
         }
 
-        let result = await CardMetadataFunction.Execute(true);
+        AppLogger.LogInfo("Commands/Resync", "Resyncing database");
+
+        const result = await CardMetadataFunction.Execute(true);
 
         if (result) {
-            if (await Config.GetValue('safemode') == "true") {
-                await Config.SetValue('safemode', 'false');
+            if (await Config.GetValue("safemode") == "true") {
+                AppLogger.LogInfo("Commands/Resync", "Resync successful, safe mode disabled");
+
+                await Config.SetValue("safemode", "false");
                 await interaction.reply("Resynced database and disabled safe mode.");
 
                 return;
             }
             await interaction.reply("Resynced database.");
         } else {
+            AppLogger.LogWarn("Commands/Resync", "Resync failed, safe mode activated");
+
             await interaction.reply("Resync failed, safe mode has been activated until successful resync.");
         }
     }

src/commands/sacrifice.ts

@@ -0,0 +1,73 @@
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CacheType, CommandInteraction, EmbedBuilder, SlashCommandBuilder } from "discord.js";
+import { Command } from "../type/command";
+import Inventory from "../database/entities/app/Inventory";
+import { CardRarityToString, GetSacrificeAmount } from "../constants/CardRarity";
+import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
+import EmbedColours from "../constants/EmbedColours";
+
+export default class Sacrifice extends Command {
+    constructor() {
+        super();
+
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("sacrifice")
+            .setDescription("Sacrifices a card for currency")
+            .addStringOption(x =>
+                x
+                    .setName("cardnumber")
+                    .setDescription("The card to sacrifice from your inventory")
+                    .setRequired(true));
+    }
+
+    public override async execute(interaction: CommandInteraction<CacheType>): Promise<void> {
+        const cardnumber = interaction.options.get("cardnumber", true);
+
+        const cardInInventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, cardnumber.value! as string);
+
+        if (!cardInInventory || cardInInventory.Quantity == 0) {
+            await interaction.reply("Unable to find card in your inventory.");
+            return;
+        }
+
+        const cardData = CardDropHelperMetadata.GetCardByCardNumber(cardnumber.value! as string);
+
+        if (!cardData) {
+            await interaction.reply("Unable to find card in the database.");
+            return;
+        }
+
+        const cardValue = GetSacrificeAmount(cardData.card.type);
+        const cardRarityString = CardRarityToString(cardData.card.type);
+
+        const description = [
+            `Card: ${cardData.card.name}`,
+            `Series: ${cardData.series.name}`,
+            `Rarity: ${cardRarityString}`,
+            `Quantity Owned: ${cardInInventory.Quantity}`,
+            `Sacrifice Amount: ${cardValue}`,
+        ];
+
+        const embed = new EmbedBuilder()
+            .setTitle("Sacrifice")
+            .setDescription(description.join("\n"))
+            .setColor(EmbedColours.Error)
+            .setFooter({ text: `${interaction.user.username}` });
+
+        const row = new ActionRowBuilder<ButtonBuilder>()
+            .addComponents([
+                new ButtonBuilder()
+                    .setCustomId(`sacrifice confirm ${interaction.user.id} ${cardnumber.value!}`)
+                    .setLabel("Confirm")
+                    .setStyle(ButtonStyle.Success),
+                new ButtonBuilder()
+                    .setCustomId(`sacrifice cancel ${interaction.user.id} ${cardnumber.value!}`)
+                    .setLabel("Cancel")
+                    .setStyle(ButtonStyle.Secondary),
+            ]);
+
+        await interaction.reply({
+            embeds: [ embed ],
+            components: [ row ],
+        });
+    }
+}

src/commands/series.ts

@@ -0,0 +1,71 @@
+import { CommandInteraction, SlashCommandBuilder } from "discord.js";
+import { Command } from "../type/command";
+import { CoreClient } from "../client/client";
+import AppLogger from "../client/appLogger";
+import SeriesHelper from "../helpers/SeriesHelper";
+
+export default class Series extends Command {
+    constructor() {
+        super();
+
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("series")
+            .setDescription("View details on a series")
+            .addSubcommand(x =>
+                x
+                    .setName("view")
+                    .setDescription("View a specifiic series by id")
+                    .addStringOption(y =>
+                        y
+                            .setName("id")
+                            .setDescription("The series id")
+                            .setRequired(true)))
+            .addSubcommand(x =>
+                x
+                    .setName("list")
+                    .setDescription("List all series")) as SlashCommandBuilder;
+    }
+
+    public override async execute(interaction: CommandInteraction) {
+        if (!interaction.isChatInputCommand()) return;
+
+        switch (interaction.options.getSubcommand()) {
+        case "view":
+            await this.ViewSeries(interaction);
+            break;
+        case "list":
+            await this.ListSeries(interaction);
+            break;
+        default:
+            AppLogger.LogWarn("Commands/Series", `Subcommand doesn't exist: ${interaction.options.getSubcommand()}`);
+            await interaction.reply("Subcommand doesn't exist.");
+        }
+    }
+
+    private async ViewSeries(interaction: CommandInteraction) {
+        const id = interaction.options.get("id");
+
+        AppLogger.LogSilly("Commands/Series/View", `Parameters: id=${id?.value}`);
+
+        if (!id) return;
+
+        const series = CoreClient.Cards.find(x => x.id == id.value);
+
+        if (!series) {
+            AppLogger.LogVerbose("Commands/Series/View", "Series not found.");
+
+            await interaction.reply("Series not found.");
+            return;
+        }
+
+        const embed = SeriesHelper.GenerateSeriesViewPage(series.id, 0);
+
+        await interaction.reply({ embeds: [ embed!.embed ], components: [ embed!.row ]});
+    }
+
+    private async ListSeries(interaction: CommandInteraction) {
+        const embed = SeriesHelper.GenerateSeriesListPage(0);
+
+        await interaction.reply({ embeds: [ embed!.embed ], components: [ embed!.row ]});
+    }
+}

src/commands/stage/dropnumber.ts

@@ -11,23 +11,23 @@ export default class Dropnumber extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
-            .setName('dropnumber')
-            .setDescription('(TEST) Summon a specific card')
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("dropnumber")
+            .setDescription("(TEST) Summon a specific card")
             .addStringOption(x =>
                 x
-                    .setName('cardnumber')
-                    .setDescription('The card number to summon')
+                    .setName("cardnumber")
+                    .setDescription("The card number to summon")
                     .setRequired(true));
     }
 
     public override async execute(interaction: CommandInteraction<CacheType>) {
         if (!interaction.isChatInputCommand()) return;
 
-        const cardNumber = interaction.options.get('cardnumber');
+        const cardNumber = interaction.options.get("cardnumber");
 
         if (!cardNumber || !cardNumber.value) {
-            await interaction.reply('Card Number is required');
+            await interaction.reply("Card Number is required");
             return;
         }
 
@@ -36,7 +36,7 @@ export default class Dropnumber extends Command {
             .find(x => x.id == cardNumber.value);
 
         if (!card) {
-            await interaction.reply('Card not found');
+            await interaction.reply("Card not found");
             return;
         }
 
@@ -47,7 +47,7 @@ export default class Dropnumber extends Command {
         const imageFileName = card.path.split("/").pop()!;
 
         try {
-            image = readFileSync(path.join(process.cwd(), 'cards', card.path));
+            image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path));
         } catch {
             await interaction.reply(`Unable to fetch image for card ${card.id}`);
             return;
@@ -78,7 +78,7 @@ export default class Dropnumber extends Command {
             if (e instanceof DiscordAPIError) {
                 await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: ${e.code}`);
             } else {
-                await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN`);
+                await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN");
             }
         }
 

src/commands/stage/droprarity.ts

@@ -12,37 +12,37 @@ export default class Droprarity extends Command {
     constructor() {
         super();
 
-        super.CommandBuilder = new SlashCommandBuilder()
-            .setName('droprarity')
-            .setDescription('(TEST) Summon a random card of a specific rarity')
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("droprarity")
+            .setDescription("(TEST) Summon a random card of a specific rarity")
             .addStringOption(x =>
                 x
-                    .setName('rarity')
-                    .setDescription('The rarity you want to summon')
+                    .setName("rarity")
+                    .setDescription("The rarity you want to summon")
                     .setRequired(true));
     }
 
     public override async execute(interaction: CommandInteraction<CacheType>) {
         if (!interaction.isChatInputCommand()) return;
 
-        const rarity = interaction.options.get('rarity');
+        const rarity = interaction.options.get("rarity");
 
         if (!rarity || !rarity.value) {
-            await interaction.reply('Rarity is required');
+            await interaction.reply("Rarity is required");
             return;
         }
 
         const rarityType = CardRarityParse(rarity.value.toString());
 
         if (rarityType == CardRarity.Unknown) {
-            await interaction.reply('Invalid rarity');
+            await interaction.reply("Invalid rarity");
             return;
         }
 
         const card = await CardDropHelperMetadata.GetRandomCardByRarity(rarityType);
 
         if (!card) {
-            await interaction.reply('Card not found');
+            await interaction.reply("Card not found");
             return;
         }
 
@@ -50,7 +50,7 @@ export default class Droprarity extends Command {
         const imageFileName = card.card.path.split("/").pop()!;
 
         try {
-            image = readFileSync(path.join(process.cwd(), 'cards', card.card.path));
+            image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.card.path));
         } catch {
             await interaction.reply(`Unable to fetch image for card ${card.card.id}`);
             return;
@@ -81,7 +81,7 @@ export default class Droprarity extends Command {
             if (e instanceof DiscordAPIError) {
                 await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: ${e.code}`);
             } else {
-                await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN`);
+                await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN");
             }
         }
 

src/commands/trade.ts

@@ -0,0 +1,153 @@
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle, CommandInteraction, EmbedBuilder, SlashCommandBuilder } from "discord.js";
+import { Command } from "../type/command";
+import Inventory from "../database/entities/app/Inventory";
+import { CoreClient } from "../client/client";
+import EmbedColours from "../constants/EmbedColours";
+import AppLogger from "../client/appLogger";
+
+export default class Trade extends Command {
+    constructor() {
+        super();
+
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("trade")
+            .setDescription("Initiate a trade with another user.")
+            .addUserOption(x =>
+                x
+                    .setName("user")
+                    .setDescription("User to trade with")
+                    .setRequired(true))
+            .addStringOption(x =>
+                x
+                    .setName("give")
+                    .setDescription("Item to give")
+                    .setRequired(true))
+            .addStringOption(x =>
+                x
+                    .setName("receive")
+                    .setDescription("Item to receive")
+                    .setRequired(true));
+    }
+
+    public override async execute(interaction: CommandInteraction) {
+        const user = interaction.options.get("user", true).user!;
+        const give = interaction.options.get("give", true);
+        const receive = interaction.options.get("receive", true);
+
+        AppLogger.LogSilly("Commands/Trade", `Parameters: user=${user.id}, give=${give.value}, receive=${receive.value}`);
+
+        if (interaction.user.id == user.id) {
+            await interaction.reply("You can not create a trade with yourself.");
+            return;
+        }
+
+        const user1ItemEntity = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, give.value!.toString());
+        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) {
+            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
+            .flatMap(x => x.cards)
+            .find(x => x.id === give.value!.toString());
+
+        const user2Item = CoreClient.Cards
+            .flatMap(x => x.cards)
+            .find(x => x.id === receive.value!.toString());
+
+        if (!user1Item || !user2Item) {
+            await interaction.reply("One or more of the items you are trying to trade does not exist.");
+            return;
+        }
+
+        const now = new Date();
+        const expiry = now.setMinutes(now.getMinutes() + 15);
+
+        const tradeEmbed = new EmbedBuilder()
+            .setTitle("⚠️ Trade Offer ⚠️")
+            .setDescription(`Trade initiated between ${interaction.user.username} and ${user.username}`)
+            .setColor(EmbedColours.Grey)
+            .setImage("https://media1.tenor.com/m/KkZwKl2AQ2QAAAAd/trade-offer.gif")
+            .addFields([
+                {
+                    name: `${interaction.user.username} Receives`,
+                    value: `${user2Item.id}: ${user2Item.name}`,
+                    inline: true,
+                },
+                {
+                    name: `${user.username} Receives`,
+                    value: `${user1Item.id}: ${user1Item.name}`,
+                    inline: true,
+                },
+                {
+                    name: "Expires",
+                    value: new Date(expiry).toLocaleString(),
+                }
+            ]);
+
+        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 row = new ActionRowBuilder<ButtonBuilder>()
+            .addComponents([
+                new ButtonBuilder()
+                    .setCustomId(`trade accept ${interaction.user.id} ${user.id} ${user1Item.id} ${user2Item.id} ${expiry} ${timeoutId}`)
+                    .setLabel("Accept")
+                    .setStyle(ButtonStyle.Success),
+                new ButtonBuilder()
+                    .setCustomId(`trade decline ${interaction.user.id} ${user.id} ${user1Item.id} ${user2Item.id} ${expiry} ${timeoutId}`)
+                    .setLabel("Decline")
+                    .setStyle(ButtonStyle.Danger),
+            ]);
+
+        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) {
+        AppLogger.LogSilly("Commands/Trade/AutoDecline", `Auto declining trade between ${user1Username} and ${user2Username}`);
+
+        const tradeEmbed = new EmbedBuilder()
+            .setTitle("Trade Expired")
+            .setDescription(`Trade initiated between ${user1Username} and ${user2Username}`)
+            .setColor(EmbedColours.Error)
+            .setImage("https://media1.tenor.com/m/KkZwKl2AQ2QAAAAd/trade-offer.gif")
+            .addFields([
+                {
+                    name: `${user1Username} Receives`,
+                    value: `${user2CardNumber}: ${user2CardName}`,
+                    inline: true,
+                },
+                {
+                    name: `${user2Username} Receives`,
+                    value: `${user1CardNumber}: ${user1CardName}`,
+                    inline: true,
+                },
+                {
+                    name: "Expired",
+                    value: new Date().toLocaleString(),
+                }
+            ]);
+
+        const row = new ActionRowBuilder<ButtonBuilder>()
+            .addComponents([
+                new ButtonBuilder()
+                    .setCustomId("trade expired accept")
+                    .setLabel("Accept")
+                    .setStyle(ButtonStyle.Success)
+                    .setDisabled(true),
+                new ButtonBuilder()
+                    .setCustomId("trade expired declined")
+                    .setLabel("Decline")
+                    .setStyle(ButtonStyle.Danger)
+                    .setDisabled(true),
+            ]);
+
+        await interaction.editReply({ embeds: [ tradeEmbed ], components: [ row ]});
+    }
+}

src/commands/view.ts

@@ -0,0 +1,82 @@
+import { AttachmentBuilder, CommandInteraction, DiscordAPIError, SlashCommandBuilder } from "discord.js";
+import { Command } from "../type/command";
+import { CoreClient } from "../client/client";
+import { readFileSync } from "fs";
+import path from "path";
+import Inventory from "../database/entities/app/Inventory";
+import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
+import AppLogger from "../client/appLogger";
+
+export default class View extends Command {
+    constructor() {
+        super();
+
+        this.CommandBuilder = new SlashCommandBuilder()
+            .setName("view")
+            .setDescription("View a specific command")
+            .addStringOption(x =>
+                x
+                    .setName("cardnumber")
+                    .setDescription("The card number to view")
+                    .setRequired(true));
+    }
+
+    public override async execute(interaction: CommandInteraction) {
+        const cardNumber = interaction.options.get("cardnumber");
+
+        AppLogger.LogSilly("Commands/View", `Parameters: cardNumber=${cardNumber?.value}`);
+
+        if (!cardNumber || !cardNumber.value) {
+            await interaction.reply("Card number is required.");
+            return;
+        }
+
+        const card = CoreClient.Cards
+            .flatMap(x => x.cards)
+            .find(x => x.id == cardNumber.value);
+
+        if (!card) {
+            await interaction.reply("Card not found.");
+            return;
+        }
+
+        const series = CoreClient.Cards
+            .find(x => x.cards.includes(card))!;
+
+        let image: Buffer;
+        const imageFileName = card.path.split("/").pop()!;
+
+        try {
+            image = readFileSync(path.join(process.env.DATA_DIR!, "cards", card.path));
+        } catch {
+            AppLogger.LogError("Commands/View", `Unable to fetch image for card ${card.id}.`);
+
+            await interaction.reply(`Unable to fetch image for card ${card.id}.`);
+            return;
+        }
+
+        await interaction.deferReply();
+
+        const attachment = new AttachmentBuilder(image, { name: imageFileName });
+
+        const inventory = await Inventory.FetchOneByCardNumberAndUserId(interaction.user.id, card.id);
+        const quantityClaimed = inventory ? inventory.Quantity : 0;
+
+        const embed = CardDropHelperMetadata.GenerateDropEmbed({ card, series }, quantityClaimed, imageFileName);
+
+        try {
+            await interaction.editReply({
+                embeds: [ embed ],
+                files: [ attachment ],
+            });
+        } catch (e) {
+            AppLogger.LogError("Commands/View", `Error sending view for card ${card.id}: ${e}`);
+
+            if (e instanceof DiscordAPIError) {
+                await interaction.editReply(`Unable to send next drop. Please try again, and report this if it keeps happening. Code: ${e.code}.`);
+            } else {
+                await interaction.editReply("Unable to send next drop. Please try again, and report this if it keeps happening. Code: UNKNOWN.");
+            }
+        }
+    }
+}

src/constants/CardConstants.ts

@@ -0,0 +1,6 @@
+export default class CardConstants {
+    public static readonly ClaimCost = 10;
+    public static readonly TimerGiveAmount = 10;
+    public static readonly DailyCurrency = 100;
+    public static readonly StartingCurrency = 300;
+}

src/constants/CardRarity.ts

@@ -11,51 +11,68 @@ export enum CardRarity {
 
 export function CardRarityToString(rarity: CardRarity): string {
     switch (rarity) {
-        case CardRarity.Unknown:
-            return "Unknown";
-        case CardRarity.Bronze:
-            return "Bronze";
-        case CardRarity.Silver:
-            return "Silver";
-        case CardRarity.Gold:
-            return "Gold";
-        case CardRarity.Legendary:
-            return "Legendary";
-        case CardRarity.Manga:
-            return "Manga";
+    case CardRarity.Unknown:
+        return "Unknown";
+    case CardRarity.Bronze:
+        return "Bronze";
+    case CardRarity.Silver:
+        return "Silver";
+    case CardRarity.Gold:
+        return "Gold";
+    case CardRarity.Legendary:
+        return "Legendary";
+    case CardRarity.Manga:
+        return "Manga";
     }
 }
 
 export function CardRarityToColour(rarity: CardRarity): number {
     switch (rarity) {
-        case CardRarity.Unknown:
-            return EmbedColours.Grey;
-        case CardRarity.Bronze:
-            return EmbedColours.BronzeCard;
-        case CardRarity.Silver:
-            return EmbedColours.SilverCard;
-        case CardRarity.Gold:
-            return EmbedColours.GoldCard;
-        case CardRarity.Legendary:
-            return EmbedColours.LegendaryCard;
-        case CardRarity.Manga:
-            return EmbedColours.MangaCard;
+    case CardRarity.Unknown:
+        return EmbedColours.Grey;
+    case CardRarity.Bronze:
+        return EmbedColours.BronzeCard;
+    case CardRarity.Silver:
+        return EmbedColours.SilverCard;
+    case CardRarity.Gold:
+        return EmbedColours.GoldCard;
+    case CardRarity.Legendary:
+        return EmbedColours.LegendaryCard;
+    case CardRarity.Manga:
+        return EmbedColours.MangaCard;
     }
 }
 
 export function CardRarityParse(rarity: string): CardRarity {
     switch (rarity.toLowerCase()) {
-        case "bronze":
-            return CardRarity.Bronze;
-        case "silver":
-            return CardRarity.Silver;
-        case "gold":
-            return CardRarity.Gold;
-        case "legendary":
-            return CardRarity.Legendary;
-        case "manga":
-            return CardRarity.Manga;
-        default:
-            return CardRarity.Unknown;
+    case "bronze":
+        return CardRarity.Bronze;
+    case "silver":
+        return CardRarity.Silver;
+    case "gold":
+        return CardRarity.Gold;
+    case "legendary":
+        return CardRarity.Legendary;
+    case "manga":
+        return CardRarity.Manga;
+    default:
+        return CardRarity.Unknown;
+    }
+}
+
+export function GetSacrificeAmount(rarity: CardRarity): number {
+    switch (rarity) {
+    case CardRarity.Bronze:
+        return 5;
+    case CardRarity.Silver:
+        return 10;
+    case CardRarity.Gold:
+        return 30;
+    case CardRarity.Manga:
+        return 40;
+    case CardRarity.Legendary:
+        return 100;
+    default:
+        return 0;
     }
 }

src/constants/EmbedColours.ts

@@ -1,6 +1,14 @@
 export default class EmbedColours {
+    // General
     public static readonly Ok = 0x3050ba;
+    public static readonly Success = 0x50c878;
+    public static readonly Error = 0xff0000;
+
+    // Colours
     public static readonly Grey = 0xd3d3d3;
+    public static readonly Green = 0x228B22;
+
+    // Card Types
     public static readonly BronzeCard = 0xcd7f32;
     public static readonly SilverCard = 0xc0c0c0;
     public static readonly GoldCard = 0xffd700;

src/contracts/AppBaseEntity.ts

@@ -11,13 +11,13 @@ export default class AppBaseEntity {
     }
 
     @PrimaryColumn()
-    Id: string;
+        Id: string;
 
     @Column()
-    WhenCreated: Date;
+        WhenCreated: Date;
 
     @Column()
-    WhenUpdated: Date;
+        WhenUpdated: Date;
 
     public async Save<T extends AppBaseEntity>(target: EntityTarget<T>, entity: DeepPartial<T>): Promise<void> {
         this.WhenUpdated = new Date();
@@ -27,6 +27,12 @@ export default class AppBaseEntity {
         await repository.save(entity);
     }
 
+    public static async SaveAll<T extends AppBaseEntity>(target: EntityTarget<T>, entities: DeepPartial<T>[]): Promise<void> {
+        const repository = AppDataSource.getRepository<T>(target);
+
+        await repository.save(entities);
+    }
+
     public static async Remove<T extends AppBaseEntity>(target: EntityTarget<T>, entity: T): Promise<void> {
         const repository = AppDataSource.getRepository<T>(target);
 

src/contracts/ButtonEventItem.ts

@@ -1,8 +1,10 @@
 import { Environment } from "../constants/Environment";
 import { ButtonEvent } from "../type/buttonEvent";
 
-export default interface IButtonEventItem {
+interface ButtonEventItem {
     ButtonId: string,
     Event: ButtonEvent,
     Environment: Environment,
-}
+}
+
+export default ButtonEventItem;

src/contracts/EventExecutors.ts

@@ -0,0 +1,19 @@
+
+import { DMChannel, Guild, GuildBan, GuildMember, Message, NonThreadGuildBasedChannel, PartialGuildMember, PartialMessage } from "discord.js";
+
+interface EventExecutors {
+    ChannelCreate: ((channel: NonThreadGuildBasedChannel) => void)[],
+    ChannelDelete: ((channel: DMChannel | NonThreadGuildBasedChannel) => void)[],
+    ChannelUpdate: ((channel: DMChannel | NonThreadGuildBasedChannel) => void)[],
+    GuildBanAdd: ((ban: GuildBan) => void)[],
+    GuildBanRemove: ((ban: GuildBan) => void)[],
+    GuildCreate: ((guild: Guild) => void)[],
+    GuildMemberAdd: ((member: GuildMember) => void)[],
+    GuildMemberRemove: ((member: GuildMember | PartialGuildMember) => void)[],
+    GuildMemebrUpdate: ((oldMember: GuildMember | PartialGuildMember, newMember: GuildMember) => void)[],
+    MessageCreate: ((message: Message<boolean>) => void)[],
+    MessageDelete: ((message: Message<boolean> | PartialMessage) => void)[],
+    MessageUpdate: ((oldMessage: Message<boolean> | PartialMessage, newMessage: Message<boolean> | PartialMessage) => void)[],
+}
+
+export default EventExecutors;

src/contracts/ICommandItem.ts

@@ -1,9 +1,11 @@
 import { Environment } from "../constants/Environment";
 import { Command } from "../type/command";
 
-export default interface ICommandItem {
+interface ICommandItem {
     Name: string,
     Command: Command,
     Environment: Environment,
     ServerId?: string,
-}
+}
+
+export default ICommandItem;

src/contracts/IEventItem.ts

@@ -1,9 +0,0 @@
-
-import { Environment } from "../constants/Environment";
-import { EventType } from "../constants/EventType";
-
-export default interface IEventItem {
-    EventType: EventType,
-    ExecutionFunction: Function,
-    Environment: Environment,
-}

src/contracts/IGDriveFolderListing.ts

@@ -1,4 +1,4 @@
-export default interface IGDriveFolderListing {
+export interface IGDriveFolderListing {
     id: string,
     name: string,
-};
+}

src/contracts/SeriesMetadata.ts

@@ -1,6 +1,6 @@
 import { CardRarity } from "../constants/CardRarity";
 
-export default interface SeriesMetadata {
+export interface SeriesMetadata {
     id: number,
     name: string,
     cards: CardMetadata[],

src/database/entities/app/Claim.ts

@@ -12,10 +12,10 @@ export default class Claim extends AppBaseEntity {
     }
 
     @Column()
-    ClaimId: string;
+        ClaimId: string;
 
     @ManyToOne(() => Inventory, x => x.Claims)
-    Inventory: Inventory;
+        Inventory: Inventory;
 
     public SetInventory(inventory: Inventory) {
         this.Inventory = inventory;

src/database/entities/app/Config.ts

@@ -12,10 +12,10 @@ export default class Config extends AppBaseEntity {
     }
 
     @Column()
-    Key: string;
+        Key: string;
 
     @Column()
-    Value: string;
+        Value: string;
 
     public SetValue(value: string) {
         this.Value = value;

src/database/entities/app/Inventory.ts

@@ -14,21 +14,27 @@ export default class Inventory extends AppBaseEntity {
     }
 
     @Column()
-    UserId: string;
+        UserId: string;
 
     @Column()
-    CardNumber: string;
+        CardNumber: string;
 
     @Column()
-    Quantity: number;
+        Quantity: number;
 
     @OneToMany(() => Claim, x => x.Inventory)
-    Claims: Claim[];
+        Claims: Claim[];
 
     public SetQuantity(quantity: number) {
         this.Quantity = quantity;
     }
 
+    public RemoveQuantity(amount: number) {
+        if (this.Quantity < amount) return;
+
+        this.Quantity -= amount;
+    }
+
     public AddClaim(claim: Claim) {
         this.Claims.push(claim);
     }
@@ -40,4 +46,12 @@ export default class Inventory extends AppBaseEntity {
 
         return single;
     }
+
+    public static async FetchAllByUserId(userId: string): Promise<Inventory[]> {
+        const repository = AppDataSource.getRepository(Inventory);
+
+        const all = await repository.find({ where: { UserId: userId }});
+
+        return all;
+    }
 }

src/database/entities/app/User.ts

@@ -0,0 +1,34 @@
+import { Column, Entity } from "typeorm";
+import AppBaseEntity from "../../../contracts/AppBaseEntity";
+
+@Entity()
+export default class User extends AppBaseEntity {
+    constructor(userId: string, currency: number) {
+        super();
+
+        this.Id = userId;
+        this.Currency = currency;
+    }
+
+    @Column()
+        Currency: number;
+
+    @Column()
+        LastUsedDaily?: Date;
+
+    public AddCurrency(amount: number) {
+        this.Currency += amount;
+    }
+
+    public RemoveCurrency(amount: number): boolean {
+        if (this.Currency < amount) return false;
+
+        this.Currency -= amount;
+
+        return true;
+    }
+
+    public UpdateLastUsedDaily(lastUsedDaily: Date) {
+        this.LastUsedDaily = lastUsedDaily;
+    }
+}

src/database/migrations/app/0.1.5/1694609771821-CreateClaim.ts

@@ -1,17 +1,17 @@
-import { MigrationInterface, QueryRunner } from "typeorm"
-import MigrationHelper from "../../../../helpers/MigrationHelper"
+import { MigrationInterface, QueryRunner } from "typeorm";
+import MigrationHelper from "../../../../helpers/MigrationHelper";
 
 export class CreateClaim1694609771821 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<void> {
-        MigrationHelper.Up('1694609771821-CreateClaim', '0.1.5', [
-            '01-CreateClaim',
-            '02-MoveToClaim',
-            '03-AlterInventory',
+        MigrationHelper.Up("1694609771821-CreateClaim", "0.1.5", [
+            "01-CreateClaim",
+            "02-MoveToClaim",
+            "03-AlterInventory",
         ], queryRunner);
     }
 
-    public async down(queryRunner: QueryRunner): Promise<void> {
+    public async down(): Promise<void> {
     }
 
 }

src/database/migrations/app/0.1/1693769942868-CreateBase.ts

@@ -1,15 +1,15 @@
-import { MigrationInterface, QueryRunner } from "typeorm"
-import MigrationHelper from "../../../../helpers/MigrationHelper"
+import { MigrationInterface, QueryRunner } from "typeorm";
+import MigrationHelper from "../../../../helpers/MigrationHelper";
 
 export class CreateBase1693769942868 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<void> {
-        MigrationHelper.Up('1693769942868-CreateBase', '0.1', [
+        MigrationHelper.Up("1693769942868-CreateBase", "0.1", [
             "01-table/Inventory",
         ], queryRunner);
     }
 
-    public async down(queryRunner: QueryRunner): Promise<void> {
+    public async down(): Promise<void> {
     }
 
 }

src/database/migrations/app/0.2/1699814500650-createConfig.ts

@@ -1,15 +1,15 @@
-import { MigrationInterface, QueryRunner } from "typeorm"
-import MigrationHelper from "../../../../helpers/MigrationHelper"
+import { MigrationInterface, QueryRunner } from "typeorm";
+import MigrationHelper from "../../../../helpers/MigrationHelper";
 
 export class CreateConfig1699814500650 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<void> {
-        MigrationHelper.Up('1699814500650-createConfig', '0.2', [
+        MigrationHelper.Up("1699814500650-createConfig", "0.2", [
             "01-table/Config",
         ], queryRunner);
     }
 
-    public async down(queryRunner: QueryRunner): Promise<void> {
+    public async down(): Promise<void> {
     }
 
 }

src/database/migrations/app/0.6/1713289062969-user.ts

@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import MigrationHelper from "../../../../helpers/MigrationHelper";
+
+export class User1713289062969 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        MigrationHelper.Up("1713289062969-user", "0.6", [
+            "01-table/User",
+        ], queryRunner);
+    }
+
+    public async down(): Promise<void> {
+    }
+
+}

src/database/migrations/app/0.6/1715967355818-daily.ts

@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import MigrationHelper from "../../../../helpers/MigrationHelper";
+
+export class Daily1715967355818 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        MigrationHelper.Up("1715967355818-daily", "0.6", [
+            "01-table/User",
+        ], queryRunner);
+    }
+
+    public async down(): Promise<void> {
+    }
+
+}

src/helpers/CardDropHelperMetadata.ts

@@ -3,6 +3,7 @@ import { CardRarity, CardRarityToColour, CardRarityToString } from "../constants
 import CardRarityChances from "../constants/CardRarityChances";
 import { DropResult } from "../contracts/SeriesMetadata";
 import { CoreClient } from "../client/client";
+import AppLogger from "../client/appLogger";
 
 export default class CardDropHelperMetadata {
     public static GetRandomCard(): DropResult | undefined {
@@ -23,10 +24,14 @@ export default class CardDropHelperMetadata {
 
         const randomCard = this.GetRandomCardByRarity(cardRarity);
 
+        AppLogger.LogSilly("CardDropHelperMetadata/GetRandomCard", `Random card: ${randomCard?.card.id} ${randomCard?.card.name}`);
+
         return randomCard;
     }
 
     public static GetRandomCardByRarity(rarity: CardRarity): DropResult | undefined {
+        AppLogger.LogSilly("CardDropHelperMetadata/GetRandomCardByRarity", `Parameters: rarity=${rarity}`);
+
         const allCards = CoreClient.Cards
             .flatMap(x => x.cards)
             .filter(x => x.type == rarity);
@@ -38,37 +43,73 @@ export default class CardDropHelperMetadata {
             .find(x => x.cards.includes(card));
 
         if (!series) {
+            AppLogger.LogWarn("CardDropHelperMetadata/GetRandomCardByRarity", `Series not found for card ${card.id}`);
+
             return undefined;
         }
 
+        AppLogger.LogSilly("CardDropHelperMetadata/GetRandomCardByRarity", `Random card: ${card.id} ${card.name}`);
+
         return {
             series: series,
             card: card,
         };
     }
 
-    public static GenerateDropEmbed(drop: DropResult, quantityClaimed: Number, imageFileName: string): EmbedBuilder {
+    public static GetCardByCardNumber(cardNumber: string): DropResult | undefined {
+        AppLogger.LogSilly("CardDropHelperMetadata/GetCardByCardNumber", `Parameters: cardNumber=${cardNumber}`);
+
+        const card = CoreClient.Cards
+            .flatMap(x => x.cards)
+            .find(x => x.id == cardNumber);
+
+        const series = CoreClient.Cards
+            .find(x => x.cards.find(y => y.id == card?.id));
+
+        AppLogger.LogSilly("CardDropHelperMetadata/GetCardByCardNumber", `Card: ${card?.id} ${card?.name}`);
+        AppLogger.LogSilly("CardDropHelperMetadata/GetCardByCardNumber", `Series: ${series?.id} ${series?.name}`);
+
+        if (!card || !series) {
+            AppLogger.LogVerbose("CardDropHelperMetadata/GetCardByCardNumber", `Unable to find card metadata: ${cardNumber}`);
+            return undefined;
+        }
+
+        return { card, series };
+    }
+
+    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}`);
+
         let description = "";
         description += `Series: ${drop.series.name}\n`;
         description += `Claimed: ${quantityClaimed}\n`;
 
+        if (claimedBy != null) {
+            description += `Claimed by: ${claimedBy}\n`;
+        } else {
+            description += "Claimed by: (UNCLAIMED)\n";
+        }
+
         return new EmbedBuilder()
             .setTitle(drop.card.name)
             .setDescription(description)
-            .setFooter({ text: CardRarityToString(drop.card.type) })
+            .setFooter({ text: `${CardRarityToString(drop.card.type)} · ${drop.card.id}` })
             .setColor(CardRarityToColour(drop.card.type))
             .setImage(`attachment://${imageFileName}`);
     }
 
-    public static GenerateDropButtons(drop: DropResult, claimId: string, userId: string): ActionRowBuilder<ButtonBuilder> {
+    public static GenerateDropButtons(drop: DropResult, claimId: string, userId: string, disabled: boolean = false): ActionRowBuilder<ButtonBuilder> {
+        AppLogger.LogSilly("CardDropHelperMetadata/GenerateDropButtons", `Parameters: drop=${drop.card.id}, claimId=${claimId}, userId=${userId}`);
+
         return new ActionRowBuilder<ButtonBuilder>()
             .addComponents(
                 new ButtonBuilder()
                     .setCustomId(`claim ${drop.card.id} ${claimId} ${userId}`)
                     .setLabel("Claim")
-                    .setStyle(ButtonStyle.Primary),
+                    .setStyle(ButtonStyle.Primary)
+                    .setDisabled(disabled),
                 new ButtonBuilder()
-                    .setCustomId(`reroll`)
+                    .setCustomId("reroll")
                     .setLabel("Reroll")
                     .setStyle(ButtonStyle.Secondary));
     }

src/helpers/InventoryHelper.ts

@@ -0,0 +1,105 @@
+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";
+
+interface InventoryPage {
+    id: number,
+    name: string,
+    cards: InventoryPageCards[],
+    seriesSubpage: number,
+}
+
+interface InventoryPageCards {
+    id: string,
+    name: string,
+    type: CardRarity,
+    quantity: number,
+}
+
+export default class InventoryHelper {
+    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 = 15;
+
+        const inventory = await Inventory.FetchAllByUserId(userid);
+
+        const clientCards = cloneDeep(CoreClient.Cards);
+
+        const allSeriesClaimed = clientCards
+            .sort((a, b) => a.id - b.id)
+            .filter(x => {
+                x.cards = x.cards
+                    .sort((a, b) => b.type - a.type)
+                    .filter(y => inventory.find(z => z.CardNumber == y.id))
+                    .filter(y => inventory.find(z => z.CardNumber == y.id)!.Quantity > 0);
+
+                return x;
+            });
+
+        const pages: InventoryPage[] = [];
+
+        for (const series of allSeriesClaimed) {
+            const seriesCards = series.cards;
+
+            for (let i = 0; i < seriesCards.length; i+= cardsPerPage) {
+                const cards = series.cards.slice(i, i + cardsPerPage);
+                const pageCards: InventoryPageCards[] = [];
+
+                for (const card of cards) {
+                    const item = inventory.find(x => x.CardNumber == card.id);
+
+                    if (!item) {
+                        continue;
+                    }
+
+                    pageCards.push({
+                        id: card.id,
+                        name: card.name,
+                        type: card.type,
+                        quantity: item.Quantity,
+                    });
+                }
+
+                pages.push({
+                    id: series.id,
+                    name: series.name,
+                    cards: pageCards,
+                    seriesSubpage: i / cardsPerPage,
+                });
+            }
+        }
+
+        const currentPage = pages[page];
+
+        if (!currentPage) {
+            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);
+
+        const row = new ActionRowBuilder<ButtonBuilder>()
+            .addComponents(
+                new ButtonBuilder()
+                    .setCustomId(`inventory ${userid} ${page - 1}`)
+                    .setLabel("Previous")
+                    .setStyle(ButtonStyle.Primary)
+                    .setDisabled(page == 0),
+                new ButtonBuilder()
+                    .setCustomId(`inventory ${userid} ${page + 1}`)
+                    .setLabel("Next")
+                    .setStyle(ButtonStyle.Primary)
+                    .setDisabled(page + 1 == pages.length));
+
+        return { embed, row };
+    }
+}

src/helpers/MigrationHelper.ts

@@ -3,7 +3,7 @@ import { QueryRunner } from "typeorm";
 
 export default class MigrationHelper {
     public static Up(migrationName: string, version: string, queryFiles: string[], queryRunner: QueryRunner) {
-        for (let path of queryFiles) {
+        for (const path of queryFiles) {
             const query = readFileSync(`${process.cwd()}/database/${version}/${migrationName}/Up/${path}.sql`).toString();
 
             queryRunner.query(query);
@@ -11,7 +11,7 @@ export default class MigrationHelper {
     }
 
     public static Down(migrationName: string, version: string, queryFiles: string[], queryRunner: QueryRunner) {
-        for (let path of queryFiles) {
+        for (const path of queryFiles) {
             const query = readFileSync(`${process.cwd()}/database/${version}/${migrationName}/Down/${path}.sql`).toString();
 
             queryRunner.query(query);

src/helpers/SeriesHelper.ts

@@ -0,0 +1,99 @@
+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";
+
+export default class SeriesHelper {
+    public static GenerateSeriesViewPage(seriesId: number, page: number): { embed: EmbedBuilder, row: ActionRowBuilder<ButtonBuilder> } | null {
+        AppLogger.LogSilly("Helpers/SeriesHelper", `Parameters: seriesId=${seriesId}, page=${page}`);
+
+        const itemsPerPage = 15;
+
+        const series = cloneDeep(CoreClient.Cards)
+            .find(x => x.id == seriesId);
+
+        if (!series) {
+            AppLogger.LogVerbose("Helpers/SeriesHelper", `Unable to find series: ${seriesId}`);
+            return null;
+        }
+
+        const totalPages = Math.ceil(series.cards.length / itemsPerPage);
+
+        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`);
+            return null;
+        }
+
+        const cardsOnPage = series.cards.splice(page * itemsPerPage, itemsPerPage);
+
+        const description = cardsOnPage
+            .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} · ${series.cards.length} cards · Page ${page + 1} of ${totalPages}` });
+
+        const row = new ActionRowBuilder<ButtonBuilder>()
+            .addComponents(
+                new ButtonBuilder()
+                    .setCustomId(`series view ${seriesId} ${page - 1}`)
+                    .setLabel("Previous")
+                    .setStyle(ButtonStyle.Primary)
+                    .setDisabled(page == 0),
+                new ButtonBuilder()
+                    .setCustomId(`series view ${seriesId} ${page + 1}`)
+                    .setLabel("Next")
+                    .setStyle(ButtonStyle.Primary)
+                    .setDisabled(page + 1 > totalPages));
+
+        return { embed, row };
+    }
+
+    public static GenerateSeriesListPage(page: number): { embed: EmbedBuilder, row: ActionRowBuilder<ButtonBuilder> } | null {
+        AppLogger.LogSilly("Helpers/InventoryHelper", `Parameters: page=${page}`);
+
+        const itemsPerPage = 15;
+
+        const series = cloneDeep(CoreClient.Cards)
+            .sort((a, b) => a.id - b.id);
+
+        const totalPages = Math.ceil(series.length / itemsPerPage);
+
+        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`);
+            return null;
+        }
+
+        const seriesOnPage = series.splice(page * itemsPerPage, itemsPerPage);
+
+        const description = seriesOnPage
+            .map(x => `[${x.id}] ${x.name}`)
+            .join("\n");
+
+        const embed = new EmbedBuilder()
+            .setTitle("Series")
+            .setColor(EmbedColours.Ok)
+            .setDescription(description)
+            .setFooter({ text: `${CoreClient.Cards.length} series · Page ${page + 1} of ${totalPages}` });
+
+        const row = new ActionRowBuilder<ButtonBuilder>()
+            .addComponents(
+                new ButtonBuilder()
+                    .setCustomId(`series list ${page - 1}`)
+                    .setLabel("Previous")
+                    .setStyle(ButtonStyle.Primary)
+                    .setDisabled(page == 0),
+                new ButtonBuilder()
+                    .setCustomId(`series list ${page + 1}`)
+                    .setLabel("Next")
+                    .setStyle(ButtonStyle.Primary)
+                    .setDisabled(page + 1 > totalPages));
+
+        return { embed, row };
+    }
+}

src/helpers/StringTools.ts

@@ -1,7 +1,7 @@
 export default class StringTools {
     public static Capitalise(str: string): string {
         const words = str.split(" ");
-        let result: string[] = [];
+        const result: string[] = [];
 
         words.forEach(word => {
             const firstLetter = word.substring(0, 1).toUpperCase();
@@ -26,17 +26,17 @@ export default class StringTools {
     public static RandomString(length: number) {
         let result = "";
 
-        const characters = 'abcdefghkmnpqrstuvwxyz23456789';
+        const characters = "abcdefghkmnpqrstuvwxyz23456789";
         const charactersLength = characters.length;
 
-        for ( var i = 0; i < length; i++ ) {
-          result += characters.charAt(Math.floor(Math.random() * charactersLength));
+        for ( let i = 0; i < length; i++ ) {
+            result += characters.charAt(Math.floor(Math.random() * charactersLength));
         }
 
         return result;
     }
 
     public static ReplaceAll(str: string, find: string, replace: string) {
-        return str.replace(new RegExp(find, 'g'), replace);
+        return str.replace(new RegExp(find, "g"), replace);
     }
 }

src/helpers/TimeLengthInput.ts

@@ -4,23 +4,23 @@ export default class TimeLengthInput {
     public readonly value: string;
 
     constructor(input: string) {
-        this.value = StringTools.ReplaceAll(input, ',', '');
+        this.value = StringTools.ReplaceAll(input, ",", "");
     }
 
     public GetDays(): number {
-        return this.GetValue('d');
+        return this.GetValue("d");
     }
 
     public GetHours(): number {
-        return this.GetValue('h');
+        return this.GetValue("h");
     }
 
     public GetMinutes(): number {
-        return this.GetValue('m');
+        return this.GetValue("m");
     }
 
     public GetSeconds(): number {
-        return this.GetValue('s');
+        return this.GetValue("s");
     }
 
     public GetMilliseconds(): number {
@@ -106,7 +106,7 @@ export default class TimeLengthInput {
     }
 
     private GetValue(designation: string): number {
-        const valueSplit = this.value.split(' ');
+        const valueSplit = this.value.split(" ");
 
         const desString = valueSplit.find(x => x.charAt(x.length - 1) == designation);
 

src/helpers/TimerHelper.ts

@@ -0,0 +1,81 @@
+import { CronJob } from "cron";
+import { v4 } from "uuid";
+import { Primitive } from "../type/primitive";
+
+interface Timer {
+    id: string;
+    job: CronJob;
+    context: Map<string, Primitive>;
+    onTick: ((context: Map<string, Primitive>) => void) | ((context: Map<string, Primitive>) => Promise<void>);
+    runOnStart: boolean;
+}
+
+export default class TimerHelper {
+    private _timers: Timer[];
+
+    constructor() {
+        this._timers = [];
+    }
+
+    public AddTimer(
+        cronTime: string,
+        timeZone: string,
+        onTick: ((context: Map<string, Primitive>) => void) | ((context: Map<string, Primitive>) => Promise<void>),
+        runOnStart: boolean = false): string {
+        const context = new Map<string, Primitive>();
+
+        const job = new CronJob(
+            cronTime,
+            () => {
+                onTick(context);
+            },
+            null,
+            false,
+            timeZone,
+        );
+
+        const id = v4();
+
+        this._timers.push({
+            id,
+            job,
+            context,
+            onTick,
+            runOnStart,
+        });
+
+        return id;
+    }
+
+    public StartAllTimers() {
+        this._timers.forEach(timer => this.StartJob(timer));
+    }
+
+    public StopAllTimers() {
+        this._timers.forEach(timer => timer.job.stop());
+    }
+
+    public StartTimer(id: string) {
+        const timer = this._timers.find(x => x.id == id);
+
+        if (!timer) return;
+
+        this.StartJob(timer);
+    }
+
+    public StopTimer(id: string) {
+        const timer = this._timers.find(x => x.id == id);
+
+        if (!timer) return;
+
+        timer.job.stop();
+    }
+
+    private StartJob(timer: Timer) {
+        timer.job.start();
+
+        if (timer.runOnStart) {
+            timer.onTick(timer.context);
+        }
+    }
+}

src/hooks/ReloadDB.ts

@@ -1,8 +1,9 @@
 import { Request, Response } from "express";
 import CardMetadataFunction from "../Functions/CardMetadataFunction";
+import AppLogger from "../client/appLogger";
 
 export default async function ReloadDB(req: Request, res: Response) {
-    console.log('Reloading Card DB...');
+    AppLogger.LogInfo("Hooks/ReloadDB", "Reloading Card DB...");
 
     await CardMetadataFunction.Execute();
 

src/registry.ts

@@ -1,10 +1,19 @@
 import { CoreClient } from "./client/client";
+import { Environment } from "./constants/Environment";
 
 // Global Command Imports
 import About from "./commands/about";
+import Balance from "./commands/balance";
+import Daily from "./commands/daily";
 import Drop from "./commands/drop";
 import Gdrivesync from "./commands/gdrivesync";
+import Give from "./commands/give";
+import Inventory from "./commands/inventory";
 import Resync from "./commands/resync";
+import Sacrifice from "./commands/sacrifice";
+import Series from "./commands/series";
+import Trade from "./commands/trade";
+import View from "./commands/view";
 
 // Test Command Imports
 import Dropnumber from "./commands/stage/dropnumber";
@@ -12,28 +21,39 @@ import Droprarity from "./commands/stage/droprarity";
 
 // Button Event Imports
 import Claim from "./buttonEvents/Claim";
+import InventoryButtonEvent from "./buttonEvents/Inventory";
 import Reroll from "./buttonEvents/Reroll";
-import { Environment } from "./constants/Environment";
+import SacrificeButtonEvent from "./buttonEvents/Sacrifice";
+import SeriesEvent from "./buttonEvents/Series";
+import TradeButtonEvent from "./buttonEvents/Trade";
 
 export default class Registry {
     public static RegisterCommands() {
         // Global Commands
-        CoreClient.RegisterCommand('about', new About());
-        CoreClient.RegisterCommand('drop', new Drop());
-        CoreClient.RegisterCommand('gdrivesync', new Gdrivesync());
-        CoreClient.RegisterCommand('resync', new Resync());
+        CoreClient.RegisterCommand("about", new About());
+        CoreClient.RegisterCommand("balance", new Balance());
+        CoreClient.RegisterCommand("daily", new Daily());
+        CoreClient.RegisterCommand("drop", new Drop());
+        CoreClient.RegisterCommand("gdrivesync", new Gdrivesync());
+        CoreClient.RegisterCommand("give", new Give());
+        CoreClient.RegisterCommand("inventory", new Inventory());
+        CoreClient.RegisterCommand("resync", new Resync());
+        CoreClient.RegisterCommand("sacrifice", new Sacrifice());
+        CoreClient.RegisterCommand("series", new Series());
+        CoreClient.RegisterCommand("trade", new Trade());
+        CoreClient.RegisterCommand("view", new View());
 
         // Test Commands
-        CoreClient.RegisterCommand('dropnumber', new Dropnumber(), Environment.Test);
-        CoreClient.RegisterCommand('droprarity', new Droprarity(), Environment.Test);
-    }
-
-    public static RegisterEvents() {
-
+        CoreClient.RegisterCommand("dropnumber", new Dropnumber(), Environment.Test);
+        CoreClient.RegisterCommand("droprarity", new Droprarity(), Environment.Test);
     }
 
     public static RegisterButtonEvents() {
-        CoreClient.RegisterButtonEvent('claim', new Claim());
-        CoreClient.RegisterButtonEvent('reroll', new Reroll());
+        CoreClient.RegisterButtonEvent("claim", new Claim());
+        CoreClient.RegisterButtonEvent("inventory", new InventoryButtonEvent());
+        CoreClient.RegisterButtonEvent("reroll", new Reroll());
+        CoreClient.RegisterButtonEvent("sacrifice", new SacrificeButtonEvent());
+        CoreClient.RegisterButtonEvent("series", new SeriesEvent());
+        CoreClient.RegisterButtonEvent("trade", new TradeButtonEvent());
     }
 }

src/timers/GiveCurrency.ts

@@ -0,0 +1,19 @@
+import AppLogger from "../client/appLogger";
+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");
+
+    const users = await User.FetchAll(User);
+
+    const usersFiltered = users.filter(x => x.Currency < 1000);
+
+    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`);
+}

src/type/buttonEvent.ts

@@ -1,7 +1,5 @@
 import { ButtonInteraction } from "discord.js";
 
-export class ButtonEvent {
-    public execute(interaction: ButtonInteraction) {
-
-    }
+export abstract class ButtonEvent {
+    abstract execute(interaction: ButtonInteraction): Promise<void>;
 }

src/type/command.ts

@@ -1,9 +1,8 @@
 import { CommandInteraction } from "discord.js";
 
-export class Command {
+export abstract class Command {
+    // eslint-disable-next-line  @typescript-eslint/no-explicit-any -- CommandBuilder type is dynamic depending on options and can't be strictly typed
     public CommandBuilder: any;
-    
-    public execute(interaction: CommandInteraction) {
 
-    }
+    abstract execute(interaction: CommandInteraction): Promise<void>;
 }

src/type/primitive.ts

@@ -0,0 +1 @@
+export type Primitive = string | number | boolean;

src/webhooks.ts

@@ -1,6 +1,7 @@
 import bodyParser from "body-parser";
 import express, { Application } from "express";
 import ReloadDB from "./hooks/ReloadDB";
+import AppLogger from "./client/appLogger";
 
 export default class Webhooks {
     private app: Application;
@@ -19,12 +20,12 @@ export default class Webhooks {
     }
 
     private setupRoutes() {
-        this.app.post('/api/reload-db', ReloadDB);
+        this.app.post("/api/reload-db", ReloadDB);
     }
 
     private setupListen() {
         this.app.listen(this.port, () => {
-            console.log(`API listening on port ${this.port}`);
+            AppLogger.LogInfo("Webhooks", `API listening on port ${this.port}`);
         });
     }
 }