Merge branch 'main' into develop

.env.example

@@ -7,7 +7,7 @@
 # any secret values.
 
 BOT_TOKEN=
-BOT_VER=0.6.1
+BOT_VER=0.6.2
 BOT_AUTHOR=Vylpes
 BOT_OWNERID=147392775707426816
 BOT_CLIENTID=682942374040961060

.forgejo/workflows/production.yml

@@ -17,9 +17,10 @@ jobs:
       uses: actions/setup-node@v4
       with:
         node-version: 18.x
-    - run: npm ci
+    - run: yarn install --frozen-lockfile
-    - run: npm run build
+    - run: yarn build
-    - run: npm test
+    - run: yarn test
+    - run: yarn lint
 
     - name: "Copy files over to location"
       run: cp -r . ${{ secrets.PROD_REPO_PATH }}

.forgejo/workflows/stage.yml

@@ -17,9 +17,10 @@ jobs:
       uses: actions/setup-node@v4
       with:
         node-version: 18.x
-    - run: npm ci
+    - run: yarn install --frozen-lockfile
-    - run: npm run build
+    - run: yarn build
-    - run: npm test
+    - run: yarn test
+    - run: yarn lint
 
     - name: "Copy files over to location"
       run: cp -r . ${{ secrets.STAGE_REPO_PATH }}

.forgejo/workflows/test.yml

@@ -19,6 +19,7 @@ jobs:
       uses: actions/setup-node@v4
       with:
         node-version: 18.x
-    - run: npm ci
+    - run: yarn install --frozen-lockfile
-    - run: npm run build
+    - run: yarn build
-    - run: npm test
+    - run: yarn test
+    - run: yarn lint

package.json

@@ -1,6 +1,6 @@
 {
   "name": "card-drop",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "main": "./dist/bot.js",
   "typings": "./dist",
   "scripts": {

src/commands/balance.ts

@@ -15,7 +15,7 @@ export default class Balance extends Command {
     public override async execute(interaction: CommandInteraction) {
         const user = await User.FetchOneById(User, interaction.user.id);
 
-        let userBalance = user != null ? user.Currency : 0;
+        const userBalance = user != null ? user.Currency : 0;
 
         const embed = new EmbedBuilder()
             .setColor(EmbedColours.Ok)

src/commands/give.ts

@@ -77,7 +77,7 @@ export default class Give extends Command {
         }
 
         const cardNumber = interaction.options.get("cardnumber", true);
-        const user = interaction.options.getUser("user", true);
+        const user = interaction.options.get("user", true).user!;
 
         AppLogger.LogSilly("Commands/Give/GiveCard", `Parameters: cardNumber=${cardNumber.value}, user=${user.id}`);
 
@@ -103,7 +103,7 @@ export default class Give extends Command {
 
     private async GiveCurrency(interaction: CommandInteraction) {
         const amount = interaction.options.get("amount", true);
-        const user = interaction.options.getUser("user", true);
+        const user = interaction.options.get("user", true).user!;
 
         AppLogger.LogSilly("Commands/Give/GiveCurrency", `Parameters: amount=${amount.value} user=${user.id}`);
 

src/commands/inventory.ts

@@ -22,7 +22,9 @@ export default class Inventory extends Command {
 
     public override async execute(interaction: CommandInteraction) {
         const page = interaction.options.get("page");
-        const user = interaction.options.getUser("user") || interaction.user;
+        const userOption = interaction.options.get("user");
+
+        const user = userOption ? userOption.user! : interaction.user;
 
         AppLogger.LogSilly("Commands/Inventory", `Parameters: page=${page?.value}, user=${user.id}`);
 

src/commands/trade.ts

@@ -30,9 +30,9 @@ export default class Trade extends Command {
     }
 
     public override async execute(interaction: CommandInteraction) {
-        const user = interaction.options.getUser("user")!;
+        const user = interaction.options.get("user", true).user!;
-        const give = interaction.options.get("give")!;
+        const give = interaction.options.get("give", true);
-        const receive = interaction.options.get("receive")!;
+        const receive = interaction.options.get("receive", true);
 
         AppLogger.LogSilly("Commands/Trade", `Parameters: user=${user.id}, give=${give.value}, receive=${receive.value}`);
 

src/constants/CardRarity.ts

@@ -65,11 +65,11 @@ export function GetSacrificeAmount(rarity: CardRarity): number {
     case CardRarity.Bronze:
         return 5;
     case CardRarity.Silver:
-        return 15;
+        return 10;
     case CardRarity.Gold:
         return 30;
     case CardRarity.Manga:
-        return 50;
+        return 40;
     case CardRarity.Legendary:
         return 100;
     default: