Update ci scripts to use loglevel from vars

.env.example

@@ -13,23 +13,24 @@ BOT_OWNERID=147392775707426816
 BOT_CLIENTID=682942374040961060
 BOT_ENV=4
 BOT_ADMINS=147392775707426816,887272961504071690
+BOT_LOGLEVEL=info
 
 ABOUT_FUNDING=
 ABOUT_REPO=
 
-DATA_DIR=
+DATA_DIR=./.temp
 
-DB_HOST=
+DB_HOST=127.0.0.1
-DB_PORT=
+DB_PORT=3301
-DB_NAME=
+DB_NAME=carddrop
 DB_AUTH_USER=
 DB_AUTH_PASS=
 DB_SYNC=
 DB_LOGGING=
-DB_DATA_LOCATION=~/.docker
+DB_DATA_LOCATION=./.temp/database
 
 DB_CARD_FILE=:memory:
 
-EXPRESS_PORT=3303
+EXPRESS_PORT=3302
 
 GDRIVESYNC_AUTO=true

.forgejo/workflows/production.yml

@@ -53,12 +53,13 @@ jobs:
         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
+        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 \

.forgejo/workflows/stage.yml

@@ -53,12 +53,13 @@ jobs:
         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
+        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 \

.gitignore

@@ -108,4 +108,5 @@ config.json
 ormconfig.json
 gdrive-credentials.json
 data/
-*.db
+*.db
+.temp/

src/buttonEvents/Claim.ts

@@ -7,6 +7,7 @@ import AppLogger from "../client/appLogger";
 import CardDropHelperMetadata from "../helpers/CardDropHelperMetadata";
 import { readFileSync } from "fs";
 import path from "path";
+import User from "../database/entities/app/User";
 
 export default class Claim extends ButtonEvent {
     public override async execute(interaction: ButtonInteraction) {
@@ -41,6 +42,17 @@ export default class Claim extends ButtonEvent {
 
         await inventory.Save(Inventory, inventory);
 
+        let user = await User.FetchOneById(User, userId) || new User(userId, 300);
+
+        AppLogger.LogSilly("Button/Claim", `${user.Id} has ${user.Currency} currency`);
+
+        if (!user.RemoveCurrency(10)) {
+            await interaction.reply(`Not enough currency! You need 10 currency, you have ${user.Currency}`);
+            return;
+        }
+
+        await user.Save(User, user);
+
         const claim = new eClaim(claimId);
         claim.SetInventory(inventory);
 

src/database/entities/app/User.ts

@@ -16,4 +16,12 @@ export default class User extends AppBaseEntity {
     public UpdateCurrency(currency: number) {
         this.Currency = currency;
     }
+
+    public RemoveCurrency(amount: number): boolean {
+        if (this.Currency < amount) return false;
+
+        this.Currency -= amount;
+
+        return true;
+    }
 }