diff --git a/apps/discord-bot/package.json b/apps/discord-bot/package.json index 2c4d568..da0b6c3 100644 --- a/apps/discord-bot/package.json +++ b/apps/discord-bot/package.json @@ -2,10 +2,10 @@ "name": "@lbf/discord-bot", "type": "module", "scripts": { - "dev": "COMMIT_SHA=$(git rev-parse --short HEAD)-dev tsx src/index.ts", + "dev": "NODE_ENV=development COMMIT_SHA=$(git rev-parse --short HEAD)-dev tsx src/index.ts", "start": "node dist/index.js", "build": "rm -rf dist && tsc --project tsconfig.build.json && tsc-alias --project tsconfig.build.json", - "dev:user": "COMMIT_SHA=$(git rev-parse --short HEAD)-dev tsx src/index.ts -- --user", + "dev:user": "NODE_ENV=development COMMIT_SHA=$(git rev-parse --short HEAD)-dev tsx src/index.ts -- --user", "check": "tsc --noEmit && eslint src/" }, "devDependencies": { diff --git a/apps/discord-bot/src/commands/quete.ts b/apps/discord-bot/src/commands/quete.ts index b93e31e..39a38a9 100644 --- a/apps/discord-bot/src/commands/quete.ts +++ b/apps/discord-bot/src/commands/quete.ts @@ -13,12 +13,13 @@ export const queteCommand: Command = { return; } const color = parseInt(quest.quest.promoImagePrimaryColor.substring(1), 16); + const emoji = quest.quest.purchasableWithGems ? "💎" : "🪙"; await message.channel.send({ options: noMention, embeds: [ new EmbedBuilder() - .setTitle("Quête actuelle") + .setDescription(`### Quête actuelle ${emoji}${emoji}${emoji}`) .setImage(quest.quest.promoImageUrl) .setColor(color) ], diff --git a/apps/discord-bot/src/env.ts b/apps/discord-bot/src/env.ts index 60362dc..1ceda25 100644 --- a/apps/discord-bot/src/env.ts +++ b/apps/discord-bot/src/env.ts @@ -1,9 +1,8 @@ import { z } from "zod"; import { parseEnv } from "@lbf-bot/utils"; -// TODO: use parseEnv from utils - export const env = parseEnv({ + NODE_ENV: z.enum(["development", "production"]).default("production"), DISCORD_BOT_TOKEN: z.string(), DISCORD_MENTION: z.string(), DISCORD_REWARDS_GIVER: z.string(), diff --git a/apps/discord-bot/src/modes/bot.ts b/apps/discord-bot/src/modes/bot.ts index ee8ef3a..42ba7fb 100644 --- a/apps/discord-bot/src/modes/bot.ts +++ b/apps/discord-bot/src/modes/bot.ts @@ -6,6 +6,8 @@ import { trackingCron } from "~/tracking"; import { commands } from "~/commands"; import { handleReportButton, handleReportModal, handleEditButton, handleDeleteButton, handleEditModal, REPORT_BUTTON_ID, REPORT_MODAL_ID, REPORT_EDIT_BUTTON_PREFIX, REPORT_DELETE_BUTTON_PREFIX, REPORT_EDIT_MODAL_PREFIX } from "~/reporting"; +const PREFIX = env.NODE_ENV === "development" ? "lbf_" : "lbf"; + const onReady = async (client: Client) => { logger.info(`Client ready`); logger.info(`Connected as @${client.user.username}`); @@ -21,7 +23,7 @@ const onMessage = async (message: OmitPartialGroupDMChannel) => { if (message.author.bot) return; const parts = message.content.trim().split(/\s+/); - if (parts[0]?.toLowerCase() === "lbf") { + if (parts[0]?.toLowerCase() === PREFIX) { const [commandName, ...args] = parts.slice(1); const command = commands[commandName]; diff --git a/apps/discord-bot/src/wov.ts b/apps/discord-bot/src/wov.ts index a5f2203..c8e9276 100644 --- a/apps/discord-bot/src/wov.ts +++ b/apps/discord-bot/src/wov.ts @@ -12,6 +12,7 @@ export type QuestResult = { id: string; promoImageUrl: string; promoImagePrimaryColor: string; + purchasableWithGems: boolean; }; participants: Array; };