fix(discord-bot): fix rewards embed

.gitea/workflows/docker-build.yml

@@ -0,0 +1,29 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v3
+        with:
+          registry: git.pihkaal.xyz
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+
+      - name: Build and push Docker image
+        run: |
+          docker build -t git.pihkaal.xyz/pihkaal/lbf-bot:latest -f apps/discord-bot/Dockerfile .
+          docker push git.pihkaal.xyz/pihkaal/lbf-bot:latest

.github/workflows/docker-build.yml

@@ -1,28 +0,0 @@
-name: Build and Push Docker Image
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push Docker image
-        run: |
-          docker build -t pihkaal/lbf-bot-discord-bot:latest -f apps/discord-bot/Dockerfile .
-          docker push pihkaal/lbf-bot-discord-bot:latest

apps/discord-bot/src/env.ts

@@ -23,6 +23,10 @@ const schema = z.object({
     .string()
     .transform((x) => x.split(",").map((x) => x.trim()))
     .optional(),
+  QUEST_REWARDS_ARE_GEMS: z
+    .string()
+    .transform((val) => val.toLowerCase() === "true")
+    .pipe(z.boolean()),
   QUEST_EXCLUDE: z
     .string()
     .transform((x) => x.split(",").map((x) => x.trim()))

apps/discord-bot/src/utils/discord.ts

@@ -24,19 +24,21 @@ export const makeResultEmbed = async (
       .slice(0, Math.min(rewardedParticipants.length, env.QUEST_REWARDS.length))
       .map(
         (x, i) =>
-          `- ${medals[i]} ${x.username} - ${env.QUEST_REWARDS![i]} gemmes`,
+          `- ${medals[i]} ${x.username} - ${env.QUEST_REWARDS![i]} ${env.QUEST_REWARDS_ARE_GEMS ? "gemmes" : ""}`,
       );
 
-    const arr = rewardedParticipants.slice(
+    if (env.QUEST_REWARDS_ARE_GEMS) {
-      0,
+      const arr = rewardedParticipants.slice(
-      Math.min(rewardedParticipants.length, env.QUEST_REWARDS.length),
+        0,
-    );
+        Math.min(rewardedParticipants.length, env.QUEST_REWARDS.length),
-    for (let i = 0; i < arr.length; i++) {
-      const balance = await getAccountBalance(arr[i].id);
-      await setAccountBalance(
-        arr[i].id,
-        balance + parseInt(env.QUEST_REWARDS![i]),
       );
+      for (let i = 0; i < arr.length; i++) {
+        const balance = await getAccountBalance(arr[i].id);
+        await setAccountBalance(
+          arr[i].id,
+          balance + parseInt(env.QUEST_REWARDS![i]),
+        );
+      }
     }
 
     rewardsEmbed = {

docker-compose.yml

@@ -1,5 +1,6 @@
 services:
   postgres:
+    container_name: lbf-bot-postgres
     image: postgres:17-alpine
     restart: unless-stopped
     environment:
@@ -17,6 +18,7 @@ services:
       retries: 5
 
   redis:
+    container_name: lbf-bot-redis
     image: redis:7-alpine
     restart: unless-stopped
     volumes:
@@ -25,7 +27,8 @@ services:
       - lbf-network
 
   discord-bot:
-    image: pihkaal/lbf-bot-discord-bot:latest
+    container_name: lbf-bot
+    image: git.pihkaal.xyz/pihkaal/lbf-bot:latest
     restart: unless-stopped
     depends_on:
       postgres:
@@ -50,6 +53,7 @@ services:
       - WOV_FETCH_INTERVAL
       - WOV_TRACKING_INTERVAL
       - QUEST_REWARDS
+      - QUEST_REWARDS_ARE_GEMS
       - QUEST_EXCLUDE
 
 networks: