Compare commits

..

2 Commits

Author SHA1 Message Date
8629cf246b feat(discord-bot): change bot prefix and improve quest results interaction
Some checks failed
Build and Push Docker Image / typecheck (push) Failing after 48s
Build and Push Docker Image / build (push) Has been skipped
2026-05-12 16:01:14 +02:00
528fff3a5b refactor: improve code quality 2026-05-12 15:42:21 +02:00
42 changed files with 1749 additions and 1259 deletions

9
.editorconfig Normal file
View File

@@ -0,0 +1,9 @@
root = true
[**/*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
indent_size = 4

View File

@@ -6,8 +6,24 @@ on:
- main
jobs:
typecheck:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up pnpm
uses: pnpm/action-setup@v4
with:
run_install: true
- name: Typecheck and Lint
run: pnpm check
build:
runs-on: ubuntu-latest
needs: typecheck
steps:
- name: Checkout code
@@ -25,5 +41,5 @@ jobs:
- name: Build and push Docker image
run: |
docker build -t git.pihkaal.me/pihkaal/lbf-bot:latest -f apps/discord-bot/Dockerfile .
docker build --build-arg COMMIT_SHA=$(git rev-parse --short HEAD) -t git.pihkaal.me/pihkaal/lbf-bot:latest -f apps/discord-bot/Dockerfile .
docker push git.pihkaal.me/pihkaal/lbf-bot:latest

View File

@@ -15,4 +15,7 @@ RUN pnpm --filter @lbf-bot/utils run build
RUN pnpm --filter @lbf-bot/database run build
RUN pnpm --filter @lbf/discord-bot run build
ARG COMMIT_SHA=dev
ENV COMMIT_SHA=$COMMIT_SHA
CMD ["node", "apps/discord-bot/dist/index.js"]

View File

@@ -2,10 +2,11 @@
"name": "@lbf/discord-bot",
"type": "module",
"scripts": {
"dev": "tsx src/index.ts",
"dev": "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": "tsx src/index.ts -- --user"
"dev:user": "COMMIT_SHA=$(git rev-parse --short HEAD)-dev tsx src/index.ts -- --user",
"check": "tsc --noEmit && eslint src/"
},
"devDependencies": {
"@types/node": "^22.10.2",
@@ -17,7 +18,6 @@
"@lbf-bot/utils": "workspace:*",
"@lbf-bot/database": "workspace:*",
"discord.js": "^14.21.0",
"dotenv": "^17.2.3",
"zod": "^3.24.4"
"zod": "4.1.11"
}
}

View File

@@ -1,44 +1,35 @@
import { EmbedBuilder } from "discord.js";
import { env } from "~/env";
import type { Command } from "~/commands";
import { getAccountBalance, setAccountBalance } from "~/services/account";
import { getClanMembers } from "~/services/wov";
import { replyError } from "~/utils/discord";
import { getClanMembers } from "~/wov";
import { getAccountBalance, setAccountBalance } from "~/economy";
import { replyError } from "~/discord";
import type { Command } from "./index";
import { noMention } from "~/discord";
export const gemmesCommand: Command = async (message, args) => {
// retrieve player name
// NOTE: discord members have display name formatted like "🕸 | InGamePseudo"
export const gemmesCommand: Command = {
help: "Affiche ou modifie le solde de gemmes d'un membre",
handler: async (message, args) => {
// discord members have display name formatted like "🕸 | InGamePseudo"
const displayName = message.member?.displayName || message.author.username;
const playerName = args[0] || displayName.replace("🕸 |", "").trim();
// get clan member
const clanMembers = await getClanMembers();
const clanMember = clanMembers.find((x) => x.username === playerName);
if (!clanMember) {
await replyError(
message,
`\`${playerName}\` n'est pas dans le clan (la honte).\n**Attention les majuscules sont importantes**`,
);
await replyError(message, `\`${playerName}\` n'est pas dans le clan (la honte).\n**Attention les majuscules sont importantes**`);
return;
}
// handle balance modification (staff only)
if (args.length === 2) {
if (!message.member?.roles.cache.has(env.DISCORD_STAFF_ROLE_ID)) {
await replyError(
message,
"Tu t'es cru chez mémé ou quoi faut être staff",
);
await replyError(message, "Tu t'es cru chez mémé ou quoi faut être staff");
return;
}
const op = args[1][0];
const amount = Number(args[1].substring(1));
if ((op !== "+" && op !== "-") || args[1].length === 1 || isNaN(amount)) {
await replyError(
message,
"Format: `@LBF gemmes <pseudo> <+GEMMES | -GEMMES>`\nExemple: `@LBF gemmes Yuno -10000`\n**Attention les majuscules sont importantes**",
);
await replyError(message, "Usage: `@LBF gemmes <pseudo> <+GEMMES | -GEMMES>`\nExemple: `@LBF gemmes Yuno -10000`\n**Attention les majuscules sont importantes**");
return;
}
@@ -47,21 +38,14 @@ export const gemmesCommand: Command = async (message, args) => {
await setAccountBalance(clanMember.playerId, Math.max(0, balance + delta));
}
// display balance
const balance = await getAccountBalance(clanMember.playerId);
await message.reply({
options: noMention,
embeds: [
new EmbedBuilder()
.setDescription(
// TODO: mention here instead of in the env
`### 💎 Compte de ${playerName}\n\n\nGemmes disponibles: **${balance}**\n\n-# Voir avec ${env.DISCORD_REWARDS_GIVER} pour échanger contre skin/carte etc`,
)
.setColor(0x4289c1),
.setDescription(`### 💎 Compte de ${playerName}\n\n\nGemmes disponibles: **${balance}**\n\n-# Voir avec ${env.DISCORD_REWARDS_GIVER} pour échanger contre skin/carte etc`)
.setColor(0x4289c1)
],
options: {
allowedMentions: {
repliedUser: false,
},
},
});
},
};

View File

@@ -1,57 +1,43 @@
import { EmbedBuilder } from "discord.js";
import type { Command } from "~/commands";
import { searchPlayer, getClanInfos } from "~/services/wov";
import { replyError } from "~/utils/discord";
import { searchPlayer, getClanInfo } from "~/wov";
import { replyError } from "~/discord";
import type { Command } from "./index";
import { noMention } from "~/discord";
export const iconeCommand: Command = async (message, args) => {
export const iconeCommand: Command = {
help: "Affiche l'icone et le nom du clan d'un joueur",
handler: async (message, args) => {
const playerName = args[0];
if (!playerName) {
await replyError(
message,
"Usage:`@LBF icone NOM_JOUEUR`, exemple: `@LBF icone Yuno`.\n**Attention les majuscules sont importantes**",
);
await replyError(message, "Usage:`@LBF icone NOM_JOUEUR`, exemple: `@LBF icone Yuno`.\n**Attention les majuscules sont importantes**");
return;
}
const player = await searchPlayer(playerName);
if (!player) {
await replyError(
message,
"Joueur·euse non trouvé·e.\n**Attention les majuscules sont importantes**",
);
await replyError(message, "Joueur·euse non trouvé·e.\n**Attention les majuscules sont importantes**");
return;
}
if (!player.clanId) {
await replyError(
message,
"Cette personne __n'a pas de clan__ ou __a caché son clan__.\n**Attention les majuscules sont importantes**",
);
await replyError(message, "Cette personne __n'a pas de clan__ ou __a caché son clan__.\n**Attention les majuscules sont importantes**");
return;
}
const clan = await getClanInfos(player.clanId);
const clan = await getClanInfo(player.clanId);
if (!clan) {
await replyError(
message,
"Impossible de récupérer les informations du clan.",
);
await replyError(message, "Impossible de récupérer les informations du clan.");
return;
}
await message.reply({
options: noMention,
content: clan.tag,
embeds: [
new EmbedBuilder()
.setDescription(
`### ✅ Informations du clan\n\n**Nom:** \`\`\`${clan.name}\`\`\`\n**Tag:** \`\`\`${clan.tag}\`\`\``,
)
.setColor(65280),
.setDescription(`### ✅ Informations du clan\n\n**Nom:** \`\`\`${clan.name}\`\`\`\n**Tag:** \`\`\`${clan.tag}\`\`\``)
.setColor(65280)
],
options: {
allowedMentions: {
repliedUser: false,
},
},
});
},
};

View File

@@ -1,23 +1,26 @@
import type { Message, OmitPartialGroupDMChannel } from "discord.js";
import { pingCommand } from "./ping";
import { trackCommand } from "./track";
import { tejtrackCommand } from "./tejtrack";
import { trackCommand } from "./tracking";
import { iconeCommand } from "./icone";
import { gemmesCommand } from "./gemmes";
import { resultCommand } from "./result";
import { queteCommand } from "./quete";
export type Command = (
export type CommandHandler = (
message: OmitPartialGroupDMChannel<Message<boolean>>,
args: Array<string>,
) => Promise<void> | void;
export type Command = {
help: string;
handler: CommandHandler;
};
export const commands: Record<string, Command> = {
ping: pingCommand,
track: trackCommand,
tejtrack: tejtrackCommand,
icone: iconeCommand,
gemmes: gemmesCommand,
result: resultCommand,
quete: queteCommand,
result: resultCommand,
};

View File

@@ -1,12 +1,13 @@
import type { Command } from "~/commands";
import { noMention } from "~/discord";
import { env } from "~/env";
import type { Command } from "./index";
export const pingCommand: Command = async (message, args) => {
export const pingCommand: Command = {
help: "Pong",
handler: async (message) => {
await message.reply({
content: "🫵 Pong",
options: {
allowedMentions: {
repliedUser: false,
},
},
options: noMention,
content: `🫵 Pong \`${env.COMMIT_SHA}\``,
});
},
};

View File

@@ -1,20 +1,27 @@
import { EmbedBuilder } from "discord.js";
import type { Command } from "~/commands";
import { getActiveQuest, getLatestQuest } from "~/services/wov";
import { getActiveQuest, getLatestQuest } from "~/wov";
import { replyError } from "~/discord";
import type { Command } from "./index";
import { noMention } from "~/discord";
export const queteCommand: Command = async (message) => {
export const queteCommand: Command = {
help: "Affiche la quête en cours ou la dernière quête",
handler: async (message) => {
const quest = (await getActiveQuest()) ?? (await getLatestQuest());
if (!quest) {
await replyError(message, "Impossible de récupérer la quête.");
return;
}
const color = parseInt(quest.quest.promoImagePrimaryColor.substring(1), 16);
await message.channel.send({
allowedMentions: {
repliedUser: false
},
options: noMention,
embeds: [
new EmbedBuilder()
.setTitle("Quête actuelle")
.setImage(quest.quest.promoImageUrl)
.setColor(color),
.setColor(color)
],
});
},
};

View File

@@ -1,9 +1,16 @@
import type { Command } from "~/commands";
import { getLatestQuest } from "~/services/wov";
import { askForGrinders } from "~/utils/quest";
import { getLatestQuest } from "~/wov";
import { askForGrinders } from "~/quests";
import { replyError } from "~/discord";
import type { Command } from "./index";
export const resultCommand: Command = async (message, args) => {
const client = message.client;
export const resultCommand: Command = {
help: "Déclenche manuellement la publication des résultats de la dernière quête",
handler: async (message) => {
const quest = await getLatestQuest();
await askForGrinders(quest, client);
if (!quest) {
await replyError(message, "Impossible de récupérer la dernière quête.");
return;
}
await askForGrinders(quest, message.client);
},
};

View File

@@ -1,61 +0,0 @@
import type { Command } from "~/commands";
import { isWovPlayerTracked, untrackWovPlayer } from "~/services/tracking";
import { searchPlayer } from "~/services/wov";
import { replyError, createInfoEmbed, replySuccess } from "~/utils/discord";
import { env } from "~/env";
import { createLogger } from "@lbf-bot/utils";
const trackingLogger = createLogger({ prefix: "tracking" });
export const tejtrackCommand: Command = async (message, args) => {
// check staff permission
if (!message.member?.roles.cache.has(env.DISCORD_STAFF_ROLE_ID)) {
await replyError(message, "Tu t'es cru chez mémé ou quoi faut être staff");
return;
}
const playerName = args[0];
if (!playerName) {
await replyError(
message,
"Usage:`@LBF untrack NOM_JOUEUR`, exemple: `@LBF untrack Yuno`.\n**Attention les majuscules sont importantes**",
);
return;
}
const player = await searchPlayer(playerName);
if (!player) {
await replyError(
message,
"Cette personne n'existe pas.\n**Attention les majuscules sont importantes**",
);
return;
}
if (!(await isWovPlayerTracked(player.id))) {
await replyError(
message,
`Pas de tracker pour \`${playerName}\` [\`${player.id}\`]`,
);
return;
}
await untrackWovPlayer(player.id);
await replySuccess(
message,
`Tracker enlevé pour \`${playerName}\` [\`${player.id}\`]`,
);
const chan = message.client.channels.cache.get(env.DISCORD_TRACKING_CHANNEL);
if (!chan?.isSendable()) {
return trackingLogger.fatal("Invalid 'DISCORD_TRACKING_CHANNEL'");
}
await chan.send(
createInfoEmbed(
`### [REMOVED] \`${playerName}\` [\`${player.id}\`]`,
0xea0000,
),
);
};

View File

@@ -1,59 +0,0 @@
import type { Command } from "~/commands";
import { trackWovPlayer, isWovPlayerTracked } from "~/services/tracking";
import { searchPlayer } from "~/services/wov";
import { replyError, createInfoEmbed, replySuccess } from "~/utils/discord";
import { env } from "~/env";
import { createLogger } from "@lbf-bot/utils";
const trackingLogger = createLogger({ prefix: "tracking" });
export const trackCommand: Command = async (message, args) => {
// check staff permission
if (!message.member?.roles.cache.has(env.DISCORD_STAFF_ROLE_ID)) {
await replyError(message, "Tu t'es cru chez mémé ou quoi faut être staff");
return;
}
const playerName = args[0];
if (!playerName) {
await replyError(
message,
"Usage:`@LBF track NOM_JOUEUR`, exemple: `@LBF track Yuno`.\n**Attention les majuscules sont importantes**",
);
return;
}
const player = await searchPlayer(playerName);
if (!player) {
await replyError(
message,
"Cette personne n'existe pas.\n**Attention les majuscules sont importantes**",
);
return;
}
const alreadyTracked = await isWovPlayerTracked(player.id);
if (alreadyTracked) {
await replyError(
message,
`Tracker déjà enregistré pour \`${playerName}\` [\`${player.id}\`]`,
);
return;
}
await trackWovPlayer(player.id);
await replySuccess(
message,
`Tracker enregistré pour \`${playerName}\` [\`${player.id}\`]`,
);
const chan = message.client.channels.cache.get(env.DISCORD_TRACKING_CHANNEL);
if (!chan?.isSendable()) {
return trackingLogger.fatal("Invalid 'DISCORD_TRACKING_CHANNEL'");
}
await chan.send(
createInfoEmbed(`### [NEW] \`${playerName}\` [\`${player.id}\`]`),
);
};

View File

@@ -0,0 +1,67 @@
import { env } from "~/env";
import { searchPlayer } from "~/wov";
import { createInfoEmbed, replyError, replySuccess } from "~/discord";
import { isTracked, trackPlayer, untrackPlayer } from "~/tracking";
import type { Command } from "./index";
export const trackCommand: Command = {
help: "Gère le tracking d'un joueur",
handler: async (message, args) => {
if (!message.member?.roles.cache.has(env.DISCORD_STAFF_ROLE_ID)) {
await replyError(message, "Tu t'es cru chez mémé ou quoi faut être staff");
return;
}
const [subcommand, playerName] = args;
if (!playerName) {
await replyError(message, "Usage: `@LBF track add/rm NOM_JOUEUR`. \`add\` = ajoute, \`rm\` = retirer\n**Attention les majuscules sont importantes**");
return;
}
const player = await searchPlayer(playerName);
if (!player) {
await replyError(message, "Cette personne n'existe pas.\n**Attention les majuscules sont importantes**");
return;
}
const trackingChannel = message.client.channels.cache.get(env.DISCORD_TRACKING_CHANNEL);
if (!trackingChannel?.isSendable()) {
await replyError(message, `Impossible d'envoyer un message dans <#${env.DISCORD_TRACKING_CHANNEL}>`);
return;
}
switch (subcommand) {
case "add": {
if (await isTracked(player.id)) {
await replyError(message, `Tracker déjà enregistré pour \`${playerName}\` [\`${player.id}\`]`);
return;
}
await trackPlayer(player.id);
await replySuccess(message, `Tracker enregistré pour \`${playerName}\` [\`${player.id}\`]`);
await trackingChannel.send(createInfoEmbed(`### [NEW] \`${playerName}\` [\`${player.id}\`]`));
break;
}
case "rm":
case "remove": {
if (!(await isTracked(player.id))) {
await replyError(message, `Pas de tracker pour \`${playerName}\` [\`${player.id}\`]`);
return;
}
await untrackPlayer(player.id);
await replySuccess(message, `Tracker enlevé pour \`${playerName}\` [\`${player.id}\`]`);
await trackingChannel.send(createInfoEmbed(`### [REMOVED] \`${playerName}\` [\`${player.id}\`]`, 0xea0000));
break;
}
default: {
await replyError(message, `Sous-commande inconnue \`${subcommand}\`. Usage: \`@LBF track add/rm NOM_JOUEUR\`. \`add\` = ajoute, \`rm\` = retirer`);
}
}
},
};

View File

@@ -0,0 +1,24 @@
import type { MessageCreateOptions, Message } from "discord.js";
export const noMention = { allowedMentions: { repliedUser: false } } as const;
export const createErrorEmbed = (message: string, color = 0xea0000): MessageCreateOptions => ({
embeds: [{ description: `### Erreur\n\n\n${message}`, color }],
});
export const createSuccessEmbed = (message: string, color = 0x00ea00): MessageCreateOptions => ({
embeds: [{ description: `### ${message}`, color }],
});
export const createInfoEmbed = (message: string, color = 0x89cff0): MessageCreateOptions => ({
embeds: [{ description: message, color }],
});
export const replyError = (message: Message, text: string, color?: number) =>
message.reply(createErrorEmbed(text, color));
export const replySuccess = (message: Message, text: string, color?: number) =>
message.reply(createSuccessEmbed(text, color));
export const replyInfo = (message: Message, text: string, color?: number) =>
message.reply(createInfoEmbed(text, color));

View File

@@ -0,0 +1,23 @@
import { db, tables, eq } from "@lbf-bot/database";
export const getAccountBalance = async (playerId: string): Promise<number> => {
const account = await db.query.accounts.findFirst({
where: eq(tables.accounts.playerId, playerId),
});
if (!account) {
await setAccountBalance(playerId, 0);
return 0;
}
return account.balance;
};
export const setAccountBalance = async (playerId: string, balance: number): Promise<void> => {
await db
.insert(tables.accounts)
.values({ playerId, balance })
.onConflictDoUpdate({
target: tables.accounts.playerId,
set: { balance, updatedAt: new Date() },
});
};

View File

@@ -1,10 +1,9 @@
import { z } from "zod";
import "dotenv/config";
import { logger } from "@lbf-bot/utils";
import { parseEnv } from "@lbf-bot/utils";
// TODO: use parseEnv from utils
const schema = z.object({
export const env = parseEnv({
DISCORD_BOT_TOKEN: z.string(),
DISCORD_MENTION: z.string(),
DISCORD_REWARDS_GIVER: z.string(),
@@ -15,6 +14,7 @@ const schema = z.object({
DISCORD_ADMIN_CHANNEL: z.string(),
DISCORD_TRACKING_CHANNEL: z.string(),
DISCORD_STAFF_ROLE_ID: z.string(),
COMMIT_SHA: z.string().default("dev"),
WOV_API_KEY: z.string(),
WOV_CLAN_ID: z.string(),
WOV_FETCH_INTERVAL: z.coerce.number(),
@@ -31,16 +31,5 @@ const schema = z.object({
.string()
.transform((x) => x.split(",").map((x) => x.trim()))
.optional()
.default(""),
.default([]),
});
const result = schema.safeParse(process.env);
if (!result.success) {
logger.fatal(
`❌ Invalid environments variables:\n${result.error.errors
.map((x) => `- ${x.path.join(".")}: ${x.message}`)
.join("\n")}`,
);
}
export const env = result.data;

View File

@@ -1,17 +1,38 @@
import { logger } from "@lbf-bot/utils";
import { runMigrations } from "@lbf-bot/database";
import { env } from "~/env";
import { Client, GatewayIntentBits, Partials } from "discord.js";
import { setupBotMode } from "~/modes/bot";
import { setupUserMode } from "~/modes/user";
import { parseArgs } from "~/utils/cli";
import { runMigrations } from "@lbf-bot/database";
import { logger } from "@lbf-bot/utils";
logger.info("Running database migrations...");
await runMigrations();
const mode = parseArgs(process.argv.slice(2));
type Mode = { type: "bot" } | { type: "user"; channelId: string };
let mode: Mode = { type: "bot" };
const args = process.argv.slice(2);
logger.info(`Mode: ${mode.type}`);
for (let i = 0; i < args.length; i++) {
const arg = args[i];
switch (arg) {
case "-u":
case "--as-user": {
const channelId = args[(i += 1)];
if (!channelId) {
console.error(`ERROR: ${arg} requires a channel ID`);
process.exit(1);
}
mode = { type: "user", channelId };
break;
}
default: {
console.error(`ERROR: Unrecognized argument: '${arg}'`);
process.exit(1);
}
}
}
const client = new Client({
intents: [
@@ -23,21 +44,15 @@ const client = new Client({
partials: [Partials.Message, Partials.Channel],
});
switch (mode.type) {
case "user": {
logger.info(`Starting as ${mode.type}`);
if (mode.type === "user") {
setupUserMode(client, mode.channelId);
break;
}
case "bot": {
} else if (mode.type === "bot") {
setupBotMode(client);
break;
}
default: {
// @ts-ignore
} else {
// @ts-expect-error -- exhaustive default for unimplemented mode types
logger.fatal(`ERROR: Not implemented: '${mode.type}'`);
}
}
await client.login(env.DISCORD_BOT_TOKEN);

View File

@@ -1,97 +1,43 @@
import type { Client } from "discord.js";
import { createLogger, logger } from "@lbf-bot/utils";
import type { Client, OmitPartialGroupDMChannel, Message } from "discord.js";
import { logger } from "@lbf-bot/utils";
import { env } from "~/env";
import {
listTrackedPlayers,
getTrackedPlayerUsernames,
addUsernameToHistory,
} from "~/services/tracking";
import { checkForNewQuest, getPlayer } from "~/services/wov";
import { createInfoEmbed } from "~/utils/discord";
import { askForGrinders } from "~/utils/quest";
import { questCheckCron } from "~/quests";
import { trackingCron } from "~/tracking";
import { commands } from "~/commands";
const questsLogger = createLogger({ prefix: "quests" });
const trackingLogger = createLogger({ prefix: "tracking" });
const questCheckCron = async (client: Client) => {
questsLogger.info("Checking for new quest");
const quest = await checkForNewQuest();
if (quest) {
questsLogger.info(`New quest found: '${quest.quest.id}'`);
await askForGrinders(quest, client);
} else {
questsLogger.info("No new quest found");
}
};
const trackingCron = async (client: Client) => {
trackingLogger.info("Checking for tracked players");
const trackedPlayers = await listTrackedPlayers();
trackingLogger.info(`${trackedPlayers.length} players to check`);
for (const playerId of trackedPlayers) {
const player = await getPlayer(playerId);
if (!player) continue;
const usernames = await getTrackedPlayerUsernames(playerId);
if (usernames.includes(player.username)) continue;
await addUsernameToHistory(playerId, player.username);
const chan = client.channels.cache.get(env.DISCORD_TRACKING_CHANNEL);
if (!chan?.isSendable()) {
return logger.fatal("Invalid 'DISCORD_TRACKING_CHANNEL'");
}
const lastUsername = usernames[usernames.length - 1];
await chan.send(
createInfoEmbed(
`### [UPDATE] \`${lastUsername}\` -> \`${player.username}\` [\`${playerId}\`]\n\n**Nouveau pseudo:** \`${player.username}\`\n**Anciens pseudos:**\n${usernames.map((x) => `- \`${x}\``).join("\n")}`,
0x00ea00,
),
);
trackingLogger.info(
`Username changed: ${lastUsername} -> ${player.username} [${playerId}]`,
);
}
};
export const setupBotMode = (client: Client) => {
client.on("clientReady", async (client) => {
const onReady = async (client: Client<true>) => {
logger.info(`Client ready`);
logger.info(`Connected as @${client.user.username}`);
await questCheckCron(client);
setInterval(() => questCheckCron(client), env.WOV_FETCH_INTERVAL);
setInterval(() => void questCheckCron(client), env.WOV_FETCH_INTERVAL);
await trackingCron(client);
setInterval(() => trackingCron(client), env.WOV_TRACKING_INTERVAL);
});
setInterval(() => void trackingCron(client), env.WOV_TRACKING_INTERVAL);
};
client.on("messageCreate", async (message) => {
const onMessage = async (message: OmitPartialGroupDMChannel<Message>) => {
if (message.author.bot) return;
if (message.content.startsWith(`<@${client.user!.id}>`)) {
const [command, ...args] = message.content
.replace(`<@${client.user!.id}>`, "")
.trim()
.split(" ");
const parts = message.content.trim().split(/\s+/);
if (parts[0]?.toLowerCase() === "lbf") {
const [commandName, ...args] = parts.slice(1);
const commandHandler = commands[command];
if (commandHandler) {
const child = logger.child(
`cmd:${command}${args.length > 0 ? " " : ""}${args.join(" ")}`,
);
const command = commands[commandName];
if (!command) return;
const child = logger.child(`cmd:${commandName}${args.length > 0 ? " " : ""}${args.join(" ")}`);
try {
const start = Date.now();
await commandHandler(message, args);
const end = Date.now();
child.info(`Done in ${(end - start).toFixed(2)}ms`);
await command.handler(message, args);
child.info(`Done in ${(Date.now() - start).toFixed(2)}ms`);
} catch (error: unknown) {
child.error("Failed:", error);
}
}
}
});
};
export const setupBotMode = (client: Client) => {
client.on("clientReady", (client) => { void onReady(client); });
client.on("messageCreate", (message) => { void onMessage(message); });
};

View File

@@ -1,5 +1,5 @@
import { logger } from "@lbf-bot/utils";
import type { Client, TextChannel } from "discord.js";
import type { Client } from "discord.js";
import { ChannelType } from "discord.js";
import * as readline from "node:readline";
@@ -22,9 +22,9 @@ export const setupUserMode = (client: Client, channelId: string) => {
rl.prompt();
rl.on("line", async (line) => {
rl.on("line", (line) => {
if (line.trim().length > 0) {
await (chan as TextChannel).send(line);
void chan.send(line);
}
rl.prompt();
});

View File

@@ -0,0 +1,160 @@
import { ActionRowBuilder, ButtonBuilder, ButtonStyle, ChannelType, ComponentType, EmbedBuilder, StringSelectMenuBuilder, type Client, type MessageCreateOptions } from "discord.js";
import { createLogger } from "@lbf-bot/utils";
import { env } from "~/env";
import { checkForNewQuest, type QuestResult } from "~/wov";
import { getAccountBalance, setAccountBalance } from "~/economy";
const logger = createLogger({ prefix: "quests" });
export const makeResultEmbed = async (result: QuestResult, exclude: Array<string>): Promise<MessageCreateOptions> => {
const imageUrl = result.quest.promoImageUrl;
const color = parseInt(result.quest.promoImagePrimaryColor.substring(1), 16);
const participants = result.participants.toSorted((a, b) => b.xp - a.xp);
let rewardsEmbed: EmbedBuilder | undefined;
if (env.QUEST_REWARDS) {
const rewarded = participants
.map((x) => ({ id: x.playerId, username: x.username }))
.filter((x) => !exclude.includes(x.username));
const medals = ["🥇", "🥈", "🥉"].concat(new Array(rewarded.length).fill("🏅"));
const rewards = rewarded
.slice(0, Math.min(rewarded.length, env.QUEST_REWARDS.length))
.map((x, i) => `- ${medals[i]} ${x.username} - ${env.QUEST_REWARDS![i]} ${env.QUEST_REWARDS_ARE_GEMS ? "gemmes" : ""}`);
if (env.QUEST_REWARDS_ARE_GEMS) {
const arr = rewarded.slice(0, Math.min(rewarded.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]));
}
}
rewardsEmbed = new EmbedBuilder()
.setTitle("Récompenses")
.setDescription(`${rewards.join("\n")}\n\n-# \`lbf gemmes\` pour voir votre nombre de gemmes. Puis avec ${env.DISCORD_REWARDS_GIVER} pour échanger contre des cadeaux !`)
.setColor(color);
}
return {
content: `-# ||${env.DISCORD_MENTION}||`,
embeds: [
new EmbedBuilder()
.setDescription(`# Résultats de quête\n\nMerci à toutes et à tous d'avoir participé 🫡`)
.setColor(color)
.setImage(imageUrl),
...(rewardsEmbed ? [rewardsEmbed] : []),
new EmbedBuilder()
.setTitle("Classement")
.setColor(color)
.setDescription(participants
.filter((x) => !exclude.includes(x.username) && x.xp > 0)
.filter((_, i) => i < 8)
.map((p, i) => `${i + 1}. ${p.username} - ${p.xp}xp`)
.join("\n"),
),
],
};
};
export const askForGrinders = async (quest: QuestResult, client: Client) => {
const adminChannel = await client.channels.fetch(env.DISCORD_ADMIN_CHANNEL);
if (!adminChannel || adminChannel.type !== ChannelType.GuildText) {
return logger.fatal("Invalid 'DISCORD_ADMIN_CHANNEL'");
}
let exclude: string[] = [];
if (env.QUEST_REWARDS) {
const color = parseInt(quest.quest.promoImagePrimaryColor.substring(1), 16);
const top10 = quest.participants
.filter((x) => !env.QUEST_EXCLUDE.includes(x.username) && x.xp > 0)
.sort((a, b) => b.xp - a.xp)
.slice(0, 10);
if (!top10.length) {
logger.error("No eligible participants for grinder selection");
return;
}
const selectOptions = top10
.map((p) => ({ label: `${p.username} (${p.xp}xp)`, value: p.username }));
const row1 = new ActionRowBuilder<StringSelectMenuBuilder>().addComponents(
new StringSelectMenuBuilder()
.setCustomId("grinders")
.setPlaceholder("Sélectionne les tricheurs")
.setMinValues(0)
.setMaxValues(selectOptions.length)
.addOptions(selectOptions),
);
const row2 = new ActionRowBuilder<ButtonBuilder>().addComponents(
new ButtonBuilder()
.setCustomId("validate")
.setLabel("Valider")
.setStyle(ButtonStyle.Primary),
);
const top10Text = top10
.map((p, i) => `${i + 1}. ${p.username} - ${p.xp}xp`)
.join("\n");
const msg = await adminChannel.send({
content: `-# ||${env.DISCORD_ADMIN_MENTION}||`,
embeds: [
new EmbedBuilder()
.setTitle("Quête terminée !")
.setColor(color),
new EmbedBuilder()
.setTitle("Top 10 XP")
.setDescription(top10Text)
.setColor(color),
new EmbedBuilder()
.setTitle("Qui a grind ?")
.setDescription("Sélectionne les joueurs qui ont grind (tricheurs en gros), puis clique sur **Valider**.")
.setColor(color),
],
components: [row1, row2],
});
let grinders: string[] = [];
let done = false;
while (!done) {
const interaction = await msg.awaitMessageComponent({ filter: (i) => !i.user.bot });
if (interaction.componentType === ComponentType.StringSelect) {
grinders = interaction.values;
await interaction.deferUpdate();
} else if (interaction.componentType === ComponentType.Button && interaction.customId === "validate") {
await interaction.update({ components: [] });
done = true;
}
}
exclude = grinders;
}
const embed = await makeResultEmbed(quest, [...env.QUEST_EXCLUDE, ...exclude]);
const rewardChannel = await client.channels.fetch(env.DISCORD_REWARDS_CHANNEL);
if (!rewardChannel || rewardChannel.type !== ChannelType.GuildText) {
return logger.fatal("Invalid 'DISCORD_REWARDS_CHANNEL'");
}
await rewardChannel.send(embed);
if (env.QUEST_EXCLUDE) await adminChannel.send("Envoyé !");
logger.info(`Results posted at: ${new Date().toISOString()}`);
};
export const questCheckCron = async (client: Client) => {
logger.info("Checking for new quest");
const quest = await checkForNewQuest();
if (quest) {
logger.info(`New quest found: '${quest.quest.id}'`);
await askForGrinders(quest, client);
} else {
logger.info("No new quest found");
}
};

View File

@@ -1,32 +0,0 @@
import { db, tables, eq } from "@lbf-bot/database";
export const getAccountBalance = async (playerId: string): Promise<number> => {
const account = await db.query.accounts.findFirst({
where: eq(tables.accounts.playerId, playerId),
});
if (account) return account.balance;
await db.insert(tables.accounts).values({
playerId,
balance: 0,
});
return 0;
};
export const setAccountBalance = async (
playerId: string,
balance: number,
): Promise<void> => {
await db
.insert(tables.accounts)
.values({
playerId,
balance,
})
.onConflictDoUpdate({
target: tables.accounts.playerId,
set: { balance, updatedAt: new Date() },
});
};

View File

@@ -1,74 +0,0 @@
import { getPlayer } from "~/services/wov";
import { db, tables, eq } from "@lbf-bot/database";
export async function listTrackedPlayers(): Promise<string[]> {
const players = await db.query.trackedPlayers.findMany({
columns: {
playerId: true,
},
});
return players.map((p) => p.playerId);
}
export async function isWovPlayerTracked(playerId: string): Promise<boolean> {
const player = await db.query.trackedPlayers.findFirst({
where: eq(tables.trackedPlayers.playerId, playerId),
});
return player !== undefined;
}
export async function untrackWovPlayer(playerId: string): Promise<void> {
await db
.delete(tables.trackedPlayers)
.where(eq(tables.trackedPlayers.playerId, playerId));
}
export async function trackWovPlayer(playerId: string): Promise<void> {
const alreadyTracked = await isWovPlayerTracked(playerId);
if (alreadyTracked) return;
const player = await getPlayer(playerId);
if (!player) return;
await db.insert(tables.trackedPlayers).values({
playerId,
});
await db.insert(tables.usernameHistory).values({
playerId,
username: player.username,
});
}
export async function getTrackedPlayerUsernames(
playerId: string,
): Promise<string[]> {
const tracked = await db.query.trackedPlayers.findFirst({
where: eq(tables.trackedPlayers.playerId, playerId),
with: {
usernameHistory: {
orderBy: (history, { asc }) => [asc(history.firstSeenAt)],
},
},
});
if (!tracked) return [];
return tracked.usernameHistory.map((h) => h.username);
}
export async function addUsernameToHistory(
playerId: string,
username: string,
): Promise<void> {
await db.insert(tables.usernameHistory).values({
playerId,
username,
});
await db
.update(tables.trackedPlayers)
.set({ updatedAt: new Date() })
.where(eq(tables.trackedPlayers.playerId, playerId));
}

View File

@@ -1,139 +0,0 @@
import { env } from "~/env";
import { redis } from "@lbf-bot/database";
export type QuestResult = {
quest: {
id: string;
promoImageUrl: string;
promoImagePrimaryColor: string;
};
participants: Array<QuestParticipant>;
};
export type QuestParticipant = {
playerId: string;
username: string;
xp: number;
};
export const getLatestQuest = async (): Promise<QuestResult> => {
const response = await fetch(
`https://api.wolvesville.com/clans/${env.WOV_CLAN_ID}/quests/history`,
{
method: "GET",
headers: { Authorization: `Bot ${env.WOV_API_KEY}` },
},
);
const history = (await response.json()) as Array<QuestResult>;
return history[0];
};
export const getActiveQuest = async (): Promise<QuestResult | null> => {
const response = await fetch(
`https://api.wolvesville.com/clans/${env.WOV_CLAN_ID}/quests/active`,
{
method: "GET",
headers: { Authorization: `Bot ${env.WOV_API_KEY}` },
},
);
if (response.status === 404) return null;
return (await response.json()) as QuestResult;
};
export const checkForNewQuest = async (): Promise<QuestResult | null> => {
const lastQuest = await getLatestQuest();
const lastId = lastQuest.quest.id;
const cachedQuestId = await redis.get("quest:last_id");
if (cachedQuestId === lastId || cachedQuestId === "IGNORE") {
return null;
}
await redis.set("quest:last_id", lastId);
return lastQuest;
};
export const getClanMembers = async (): Promise<
Array<{ playerId: string; username: string }>
> => {
const cached = await redis.get("clan:members");
if (cached) {
return JSON.parse(cached);
}
const response = await fetch(
`https://api.wolvesville.com/clans/${env.WOV_CLAN_ID}/members`,
{
method: "GET",
headers: { Authorization: `Bot ${env.WOV_API_KEY}` },
},
);
const data = (await response.json()) as Array<{
playerId: string;
username: string;
}>;
await redis.set("clan:members", JSON.stringify(data), "EX", 60 * 60);
return data;
};
export const searchPlayer = async (username: string) => {
try {
const response = await fetch(
`https://api.wolvesville.com//players/search?username=${username}`,
{
method: "GET",
headers: { Authorization: `Bot ${env.WOV_API_KEY}` },
},
);
if (response.status === 404) return null;
const data = (await response.json()) as {
id: string;
clanId: string | null;
};
return data;
} catch {
return null;
}
};
export const getClanInfos = async (clanId: string) => {
const response = await fetch(
`https://api.wolvesville.com/clans/${clanId}/info`,
{
method: "GET",
headers: { Authorization: `Bot ${env.WOV_API_KEY}` },
},
);
const data = (await response.json()) as {
name: string;
tag: string;
};
return data;
};
export async function getPlayer(playerId: string) {
try {
const response = await fetch(
`https://api.wolvesville.com/players/${playerId}`,
{
method: "GET",
headers: { Authorization: `Bot ${env.WOV_API_KEY}` },
},
);
if (response.status === 404) return null;
const data = (await response.json()) as {
username: string;
};
return data;
} catch {
return null;
}
}

View File

@@ -0,0 +1,82 @@
import type { Client } from "discord.js";
import { createLogger, logger } from "@lbf-bot/utils";
import { db, tables, eq } from "@lbf-bot/database";
import { env } from "~/env";
import { getPlayer } from "~/wov";
import { createInfoEmbed } from "~/discord";
const trackingLogger = createLogger({ prefix: "tracking" });
export async function listTrackedPlayers(): Promise<string[]> {
const players = await db.query.trackedPlayers.findMany({
columns: { playerId: true },
});
return players.map((p) => p.playerId);
}
export async function isTracked(playerId: string): Promise<boolean> {
const player = await db.query.trackedPlayers.findFirst({
where: eq(tables.trackedPlayers.playerId, playerId),
});
return player !== undefined;
}
export async function trackPlayer(playerId: string): Promise<void> {
if (await isTracked(playerId)) return;
const player = await getPlayer(playerId);
if (!player) return;
await db.insert(tables.trackedPlayers).values({ playerId });
await db.insert(tables.usernameHistory).values({ playerId, username: player.username });
}
export async function untrackPlayer(playerId: string): Promise<void> {
await db.delete(tables.trackedPlayers).where(eq(tables.trackedPlayers.playerId, playerId));
}
export async function getPlayerUsernames(playerId: string): Promise<string[]> {
const tracked = await db.query.trackedPlayers.findFirst({
where: eq(tables.trackedPlayers.playerId, playerId),
with: {
usernameHistory: { orderBy: (history, { asc }) => [asc(history.firstSeenAt)] },
},
});
if (!tracked) return [];
return tracked.usernameHistory.map((h) => h.username);
}
export async function addUsernameToHistory(playerId: string, username: string): Promise<void> {
await db.insert(tables.usernameHistory).values({ playerId, username });
await db
.update(tables.trackedPlayers)
.set({ updatedAt: new Date() })
.where(eq(tables.trackedPlayers.playerId, playerId));
}
export const trackingCron = async (client: Client) => {
trackingLogger.info("Checking for tracked players");
const trackedPlayers = await listTrackedPlayers();
trackingLogger.info(`${trackedPlayers.length} players to check`);
for (const playerId of trackedPlayers) {
const player = await getPlayer(playerId);
if (!player) continue;
const usernames = await getPlayerUsernames(playerId);
if (usernames.includes(player.username)) continue;
await addUsernameToHistory(playerId, player.username);
const chan = client.channels.cache.get(env.DISCORD_TRACKING_CHANNEL);
if (!chan?.isSendable()) {
return logger.fatal("Invalid 'DISCORD_TRACKING_CHANNEL'");
}
const lastUsername = usernames[usernames.length - 1];
const description = `### [UPDATE] \`${lastUsername}\` -> \`${player.username}\` [\`${playerId}\`]\n\n**Nouveau pseudo:** \`${player.username}\`\n**Anciens pseudos:**\n${usernames.map((x) => `- \`${x}\``).join("\n")}`;
await chan.send(createInfoEmbed(description, 0x00ea00));
trackingLogger.info(`Username changed: ${lastUsername} -> ${player.username} [${playerId}]`);
}
};

View File

@@ -1,32 +0,0 @@
type Mode = { type: "bot" } | { type: "user"; channelId: string };
export const parseArgs = (args: string[]): Mode => {
let mode: Mode = { type: "bot" };
for (let i = 0; i < args.length; i++) {
const arg = args[i];
switch (arg) {
case "-u":
case "--as-user": {
const channelId = args[(i += 1)];
if (!channelId) {
console.error(`ERROR: ${arg} requires a channel ID`);
process.exit(1);
}
mode = { type: "user", channelId };
break;
}
default: {
console.error(`ERROR: Unrecognized argument: '${arg}'`);
process.exit(1);
}
}
}
return mode;
};

View File

@@ -1,118 +0,0 @@
import { getAccountBalance, setAccountBalance } from "~/services/account";
import { env } from "~/env";
import type { QuestResult } from "~/services/wov";
import type { MessageCreateOptions, APIEmbed, Message } from "discord.js";
export const makeResultEmbed = async (
result: QuestResult,
exclude: Array<string>,
): Promise<MessageCreateOptions> => {
const imageUrl = result.quest.promoImageUrl;
const color = parseInt(result.quest.promoImagePrimaryColor.substring(1), 16);
const participants = result.participants.toSorted((a, b) => b.xp - a.xp);
let rewardsEmbed: APIEmbed | undefined;
if (env.QUEST_REWARDS) {
const rewardedParticipants = participants
.map((x) => ({ id: x.playerId, username: x.username }))
.filter((x) => !exclude.includes(x.username));
const medals = ["🥇", "🥈", "🥉"].concat(
new Array(rewardedParticipants.length).fill("🏅"),
);
const rewards = rewardedParticipants
.slice(0, Math.min(rewardedParticipants.length, env.QUEST_REWARDS.length))
.map(
(x, i) =>
`- ${medals[i]} ${x.username} - ${env.QUEST_REWARDS![i]} ${env.QUEST_REWARDS_ARE_GEMS ? "gemmes" : ""}`,
);
if (env.QUEST_REWARDS_ARE_GEMS) {
const arr = rewardedParticipants.slice(
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]),
);
}
}
rewardsEmbed = {
title: "Récompenses",
description: `${rewards.join("\n")}\n\n-# \`@LBF gemmes\` pour voir votre nombre de gemmes. Puis avec ${env.DISCORD_REWARDS_GIVER} pour échanger contre des cadeaux !`,
color,
};
}
return {
content: `-# ||${env.DISCORD_MENTION}||`,
embeds: [
{
description: `# Résultats de quête\n\nMerci à toutes et à tous d'avoir participé 🫡`,
color,
image: {
url: imageUrl,
},
},
...(rewardsEmbed ? [rewardsEmbed] : []),
{
title: "Classement",
description: participants
.filter((x) => !exclude.includes(x.username))
.filter((_, i) => i < 8)
.map((p, i) => `${i + 1}. ${p.username} - ${p.xp}xp`)
.join("\n"),
color,
},
],
};
};
export const createErrorEmbed = (
message: string,
color = 0xea0000,
): MessageCreateOptions => ({
embeds: [
{
description: `### ❌ Erreur\n\n\n${message}`,
color,
},
],
});
export const createSuccessEmbed = (
message: string,
color = 0x00ea00,
): MessageCreateOptions => ({
embeds: [
{
description: `### ✅ ${message}`,
color,
},
],
});
export const createInfoEmbed = (
message: string,
color = 0x89cff0,
): MessageCreateOptions => ({
embeds: [
{
description: message,
color,
},
],
});
export const replyError = (message: Message, text: string, color?: number) =>
message.reply(createErrorEmbed(text, color));
export const replySuccess = (message: Message, text: string, color?: number) =>
message.reply(createSuccessEmbed(text, color));
export const replyInfo = (message: Message, text: string, color?: number) =>
message.reply(createInfoEmbed(text, color));

View File

@@ -1,127 +0,0 @@
import { ChannelType, type Client, type Message } from "discord.js";
import { env } from "~/env";
import { makeResultEmbed } from "~/utils/discord";
import type { QuestResult } from "~/services/wov";
import { createLogger } from "@lbf-bot/utils";
const questLogger = createLogger({ prefix: "quests" });
export const askForGrinders = async (quest: QuestResult, client: Client) => {
const adminChannel = await client.channels.fetch(env.DISCORD_ADMIN_CHANNEL);
if (!adminChannel || adminChannel.type !== ChannelType.GuildText) {
return questLogger.fatal("Invalid 'DISCORD_ADMIN_CHANNEL'");
}
let exclude: string[] = [];
if (env.QUEST_REWARDS) {
const top10 = quest.participants
.filter((x) => !env.QUEST_EXCLUDE.includes(x.username))
.sort((a, b) => b.xp - a.xp)
.slice(0, 10)
.map((p, i) => `${i + 1}. ${p.username} - ${p.xp}xp`)
.join("\n");
const color = parseInt(quest.quest.promoImagePrimaryColor.substring(1), 16);
await adminChannel.send({
content: `-# ||${env.DISCORD_ADMIN_MENTION}||`,
embeds: [
{
title: "Quête terminée !",
color,
},
{
title: "Top 10 XP",
description: top10,
color,
},
{
title: "Qui a grind ?",
description:
"Merci d'entrer les pseudos des joueurs qui ont grind.\n\nFormat:```@LBF laulau,Yuno,...```\n**Attention les majuscules comptent**\nPour entrer la liste des joueurs, il faut __mentionner le bot__, si personne n'a grind, `@LBF tg`",
color,
},
],
});
const filter = (msg: Message) =>
msg.channel.id === adminChannel.id &&
!msg.author.bot &&
msg.content.startsWith(`<@${client.user!.id}>`);
let confirmed = false;
let answer: string | null = null;
while (!confirmed) {
const collected = await adminChannel.awaitMessages({ filter, max: 1 });
answer = collected.first()?.content || null;
if (!answer) continue;
answer = answer.replace(`<@${client.user!.id}>`, "").trim();
if (answer.toLowerCase() === "tg") {
answer = "";
break;
}
const players = answer
.split(",")
.map((x) => x.trim())
.filter(Boolean);
await adminChannel.send({
embeds: [
{
title: "Joueurs entrés",
description: players.length
? players.map((name) => `- ${name}`).join("\n")
: "*Aucun joueur entré*",
color,
},
],
content: `Est-ce correct ? (oui/non)`,
});
const confirmFilter = (msg: Message) =>
msg.channel.id === adminChannel.id &&
!msg.author.bot &&
["oui", "non", "yes", "no"].includes(msg.content.toLowerCase());
const confirmCollected = await adminChannel.awaitMessages({
filter: confirmFilter,
max: 1,
});
const confirmation = confirmCollected.first()?.content.toLowerCase();
if (confirmation === "oui" || confirmation === "yes") {
confirmed = true;
await adminChannel.send({ content: "Ok" });
} else {
await adminChannel.send({
content: "D'accord, veuillez réessayer. Qui a grind ?",
});
}
}
if (answer === null) {
return questLogger.fatal("Answer was 'null', this should be unreachable");
}
exclude = answer
.split(",")
.map((x) => x.trim())
.filter(Boolean);
}
const embed = await makeResultEmbed(quest, [
...env.QUEST_EXCLUDE,
...exclude,
]);
const rewardChannel = await client.channels.fetch(
env.DISCORD_REWARDS_CHANNEL,
);
if (rewardChannel && rewardChannel.type === ChannelType.GuildText) {
await rewardChannel.send(embed);
} else {
return questLogger.fatal("Invalid 'DISCORD_REWARDS_CHANNEL'");
}
if (env.QUEST_EXCLUDE) {
await adminChannel.send("Envoyé !");
}
questLogger.info(`Results posted at: ${new Date().toISOString()}`);
};

View File

@@ -0,0 +1,89 @@
import { env } from "~/env";
import { redis } from "@lbf-bot/database";
export type QuestParticipant = {
playerId: string;
username: string;
xp: number;
};
export type QuestResult = {
quest: {
id: string;
promoImageUrl: string;
promoImagePrimaryColor: string;
};
participants: Array<QuestParticipant>;
};
export type Player = {
id: string;
clanId: string | null;
};
export type PlayerDetails = {
username: string;
};
export type ClanMember = {
playerId: string;
username: string;
};
export type ClanInfo = {
name: string;
tag: string;
};
const BASE_URL = "https://api.wolvesville.com";
const fetchWovApi = async <T>(path: string): Promise<T | null> => {
try {
const response = await fetch(`${BASE_URL}${path}`, {
headers: { Authorization: `Bot ${env.WOV_API_KEY}` },
});
if (!response.ok) return null;
return (await response.json()) as T;
} catch {
return null;
}
};
export const getLatestQuest = async (): Promise<QuestResult | null> => {
const history = await fetchWovApi<Array<QuestResult>>(`/clans/${env.WOV_CLAN_ID}/quests/history`);
return history?.[0] ?? null;
};
export const getActiveQuest = async (): Promise<QuestResult | null> =>
fetchWovApi<QuestResult>(`/clans/${env.WOV_CLAN_ID}/quests/active`);
export const checkForNewQuest = async (): Promise<QuestResult | null> => {
const lastQuest = await getLatestQuest();
if (!lastQuest) return null;
const cachedQuestId = await redis.get("quest:last_id");
if (cachedQuestId === lastQuest.quest.id || cachedQuestId === "IGNORE") return null;
await redis.set("quest:last_id", lastQuest.quest.id);
return lastQuest;
};
export const getClanMembers = async (): Promise<Array<ClanMember>> => {
const cached = await redis.get("clan:members");
if (cached) return JSON.parse(cached) as Array<ClanMember>;
const data = await fetchWovApi<Array<ClanMember>>(`/clans/${env.WOV_CLAN_ID}/members`);
if (!data) return [];
await redis.set("clan:members", JSON.stringify(data), "EX", 60 * 60);
return data;
};
export const searchPlayer = async (username: string): Promise<Player | null> =>
fetchWovApi<Player>(`/players/search?username=${username}`);
export const getClanInfo = async (clanId: string): Promise<ClanInfo | null> =>
fetchWovApi<ClanInfo>(`/clans/${clanId}/info`);
export const getPlayer = async (playerId: string): Promise<PlayerDetails | null> =>
fetchWovApi<PlayerDetails>(`/players/${playerId}`);

View File

@@ -7,7 +7,6 @@
"moduleResolution": "bundler",
"allowImportingTsExtensions": false,
"baseUrl": ".",
"paths": {
"~/*": ["./src/*"],
"~": ["./src/index"]

25
eslint.config.mjs Normal file
View File

@@ -0,0 +1,25 @@
import tseslint from "typescript-eslint";
export default tseslint.config(
[
{
ignores: [
"**/dist/**",
"**/node_modules/**",
"**/drizzle/**",
]
},
{
files: ["**/*.ts"],
extends: [tseslint.configs.recommendedTypeChecked],
languageOptions: {
parserOptions: {
projectService: true,
tsconfigRootDir: import.meta.dirname,
},
},
rules: {
"@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_", varsIgnorePattern: "^_" }],
},
},]
);

View File

@@ -2,9 +2,10 @@
"name": "lbf-bot",
"packageManager": "pnpm@10.24.0",
"scripts": {
"format": "prettier --write --cache ."
"check": "pnpm -r check"
},
"dependencies": {
"prettier": "3.6.2"
"devDependencies": {
"eslint": "^10.3.0",
"typescript-eslint": "^8.59.2"
}
}

View File

@@ -17,6 +17,7 @@
],
"scripts": {
"build": "rm -rf dist && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json",
"check": "tsc --noEmit && eslint src/",
"db:generate": "drizzle-kit generate",
"db:push": "drizzle-kit push",
"db:studio": "drizzle-kit studio"

View File

@@ -7,7 +7,6 @@
"moduleResolution": "bundler",
"allowImportingTsExtensions": false,
"baseUrl": ".",
"paths": {
"~/*": ["./src/*"],
"~": ["./src/index"]

View File

@@ -15,7 +15,8 @@
"dist"
],
"scripts": {
"build": "rm -rf dist && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json"
"build": "rm -rf dist && tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json",
"check": "tsc --noEmit && eslint src/"
},
"dependencies": {
"dotenv": "17.2.3",

View File

@@ -1,6 +1,6 @@
type LogLevel = "debug" | "info" | "warn" | "error";
interface LoggerOptions {
type LoggerOptions = {
prefix?: string;
level?: LogLevel;
}
@@ -54,10 +54,7 @@ class Logger {
return arg;
});
console.log(
`${COLORS.gray}${timestamp}${COLORS.reset} ${color}${COLORS.bold}${levelStr}${COLORS.reset} ${prefix}${message}`,
...formattedArgs,
);
console.log(`${COLORS.gray}${timestamp}${COLORS.reset} ${color}${COLORS.bold}${levelStr}${COLORS.reset} ${prefix}${message}`, ...formattedArgs);
}
debug(message: string, ...args: unknown[]): void {
@@ -87,9 +84,7 @@ class Logger {
}
private getLevel(): LogLevel {
const entry = Object.entries(LOG_LEVELS).find(
([, value]) => value === this.minLevel,
);
const entry = Object.entries(LOG_LEVELS).find(([, value]) => value === this.minLevel);
return (entry?.[0] as LogLevel) || "info";
}
}

View File

@@ -1,13 +1,13 @@
{
"compilerOptions": {
"lib": ["ESNext"],
"types": ["node"],
"target": "ESNext",
"module": "ESNext",
"moduleDetection": "force",
"moduleResolution": "bundler",
"allowImportingTsExtensions": false,
"baseUrl": ".",
"paths": {
"~/*": ["./src/*"],
"~": ["./src/index"]

734
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff