added test ping command

package.json

@@ -5,7 +5,8 @@
 	"main": "out/index.js",
 	"scripts": {
 		"build": "tsc",
-		"start": "node out/index.js"
+		"start": "node out/index.js",
+		"deploy-commands": "node out/deploy-commands.js"
 	},
 	"repository": {
 		"type": "git",

src/bot.ts

@@ -1,39 +1,50 @@
-import {Client, GatewayIntentBits, Message} from "discord.js"
+import {Client, Collection, Events, GatewayIntentBits, Interaction, Message} from "discord.js"
-import {PlatformId, RiotAPI, RiotAPITypes} from "@fightmegg/riot-api"
+import {Player} from "./player";
-import AccountDTO = RiotAPITypes.Account.AccountDTO;
+import fs from "node:fs";
-import fs from "fs";
+import {Command} from "./command";
+import path from "node:path";
 
 export class UEMEloBot extends Client {
 
-	riotApi: RiotAPI
+	players: Player[] = []
-	players: {
-		account: AccountDTO,
-		startElo?: Elo
-	} [] = []
 	fileName = "players.json"
+	commands: Collection<string, Command> = new Collection<string, Command>();
 
 	constructor() {
-		super({
+		super({intents: [GatewayIntentBits.Guilds]});
-			intents: [
+		this.once(Events.ClientReady, this.onReady);
-				GatewayIntentBits.GuildMessages,
+		this.on(Events.InteractionCreate, this.onInteractionCreate);
-				GatewayIntentBits.Guilds
-			]
-		});
-		this.on("ready", this.onReady);
-		this.on("messageCreate", this.messageCreate);
-		this.riotApi = new RiotAPI(process.env["RIOT_API_KEY"] as string);
 		this.parsePlayersFromFile();
-		this.addPlayer("benjo", "tgm");
+		this.loadCommands().then(async () => {
-		this.addPlayer("unclebenss", "euw");
+			const token = await this.login();
-		this.addPlayer("moché", "EUw");
+			console.log(`Discord Token: ${token}`);
-		// this.login().then(token => console.log(`Token used: ${token}`));
+			setInterval(this.updateStartElo.bind(this), 5000);
+			await this.addPlayer("benjo", "tgm");
+			await this.addPlayer("unclebenss", "euw");
+			await this.addPlayer("moché", "EUw");
+		});
+	}
+
+	async onInteractionCreate(interaction: Interaction) {
+		if (!interaction.isChatInputCommand())
+			return;
+		let commandName = interaction.commandName;
+		let command = this.commands.ensure(commandName, () => this.commands.get("help") as Command);
+		await command.execute(interaction);
 	}
 
 	parsePlayersFromFile(){
 		if (fs.existsSync(this.fileName)){
 			let fileContent = fs.readFileSync(this.fileName).toString();
 			try {
-				this.players = JSON.parse(fileContent);
+				this.players = [];
+				for (let obj of JSON.parse(fileContent)){
+					let p = new Player(obj.account);
+					if (obj.hasOwnProperty("startElo"))
+						p.startElo = obj.startElo;
+					this.players.push(p);
+					console.log(`Parsed player: ${p}`);
+				}
 			} catch (error) {
 				console.error(`Failed to parse players: ${error}`);
 			}
@@ -44,60 +55,46 @@ export class UEMEloBot extends Client {
 		fs.writeFileSync(this.fileName, JSON.stringify(this.players));
 	}
 
+	async updateStartElo(){
+		for (let p of this.players){
+			if (!p.startElo){
+				p.startElo = await p.fetchCurrentElo();
+				console.log(`Updated start elo for ${p}`);
+			}
+		}
+		this.savePlayersToFile();
+	}
+
 	async addPlayer(gameName: string, tag: string){
-		let account: AccountDTO;
+		let player = await Player.Create(gameName, tag) as Player;
-		try {
+
-			account = await this.riotApi.account.getByRiotId({
+		if (player === undefined)
-				region: PlatformId.EUROPE,
-				gameName: gameName,
-				tagLine: tag
-			});
-		} catch (error) {
-			console.error(`Riot ID not found: ${gameName}#${tag}!`);
 			return;
-		}
 
-		let fullName = `${account.gameName}#${account.tagLine}`;
+		if (this.players.find(p => p.account.puuid === player.account.puuid)){
-		if (this.players.find(p => p.account.puuid === account.puuid)){
+			console.error(`${player} already registered!`);
-			console.error(`${fullName} already registered!`);
 			return;
 		}
 
-		let entries = await this.riotApi.league.getEntriesBySummonerId({
+		this.players.push(player);
-			region: PlatformId.EUW1,
-			summonerId: (await this.riotApi.summoner.getByPUUID({
-				region: PlatformId.EUW1,
-				puuid: account.puuid
-			})).id
-		});
 
-		let soloQ = entries.find(e => e.queueType == "RANKED_SOLO_5x5");
+		console.log(`Added ${player}!`);
-		if (soloQ && ((soloQ.wins + soloQ.losses) >= 5)){
-			this.players.push({
-				account: account,
-				startElo: {
-					tier: soloQ.tier,
-					rank: soloQ.rank,
-					points: soloQ.leaguePoints
-				}
-			});
-		} else {
-			this.players.push({account: account});
-		}
-		console.log(`Added ${fullName}!`);
 
 		this.savePlayersToFile();
 	}
 
-	async onReady(){
+	async loadCommands(){
-		console.log("Bot started!");
+		const commandFiles = fs.readdirSync(path.join(__dirname, "commands")).filter(file => file.endsWith('.js'));
+		for (const file of commandFiles){
+			const module = await import(`./commands/${file}`);
+			const cmd = module.default;
+			if (cmd instanceof Command)
+				this.commands.set(cmd.data.name, cmd);
+		}
 	}
 
-	async messageCreate(msg: Message){
+	async onReady(readyClient: Client<true>){
-		await msg.fetch();
+		console.log(`Logged in as ${readyClient.user.tag}`);
-		if (!msg.author.bot){
-			msg.channel.send(`You said ${msg.content}`);
-		}
 	}
 
 	stop(){
@@ -106,38 +103,4 @@ export class UEMEloBot extends Client {
 			process.exit(0);
 		});
 	}
-}
-
-interface Elo {
-	tier: string,
-	rank: string,
-	points: number
-}
-
-function eloToNumber(elo: Elo){
-	let tiers: Record<string, number> = {
-		"CHALLENGER": 2800,
-		"GRANDMASTER": 2800,
-		"MASTER": 2800,
-		"DIAMOND": 2400,
-		"EMERALD": 2000,
-		"PLATINUM": 1600,
-		"GOLD": 1200,
-		"SILVER": 800,
-		"BRONZE": 400,
-		"IRON": 0,
-	};
-
-	let ranks: Record<string, number> = {
-		"I": 300,
-		"II": 200,
-		"III": 100,
-		"IV": 0,
-	};
-
-	let tier = elo.tier;
-	if (tier === "MASTER" || tier === "GRANDMASTER" || tier === "CHALLENGER")
-		return tiers[tier] + elo.points;
-
-	return tiers[tier] + ranks[elo.rank] + elo.points;
 }

src/command.ts

@@ -0,0 +1,11 @@
+import {Interaction, SlashCommandBuilder} from "discord.js";
+
+export abstract class Command {
+	data: SlashCommandBuilder
+
+	protected constructor(name: string, description: string) {
+		this.data = new SlashCommandBuilder().setName(name).setDescription(description);
+	}
+
+	abstract execute(interaction: Interaction): Promise<void>;
+}

src/commands/ping.ts

@@ -0,0 +1,14 @@
+import {Interaction} from "discord.js";
+import {Command} from "../command";
+
+class Ping extends Command {
+	constructor() {
+		super("ping", "One simple Ping Pong :)");
+	}
+	async execute(interaction: Interaction) {
+		if (interaction.isRepliable())
+			await interaction.reply("Pong!");
+	}
+}
+
+export default new Ping();

src/deploy-commands.ts

@@ -0,0 +1,10 @@
+import {REST, Routes} from 'discord.js';
+require("dotenv").config();
+
+let token = process.env["DISCORD_TOKEN"] as string;
+let clientId = process.env["CLIENT_ID"] as string;
+let guildId = process.env["GUILD_ID"] as string;
+
+const rest = new REST().setToken(token);
+
+rest.put(Routes.applicationGuildCommands(clientId, guildId), {body: [require("./commands/ping").data.toJSON()]});

src/index.ts

@@ -1,7 +1,11 @@
+import {Command} from "./command";
+
 require("dotenv").config();
 import {UEMEloBot} from "./bot";
 import readline from "readline";
 
+import Ping from "./commands/ping";
+
 readline.createInterface({input: process.stdin}).on('line', async line => {
 	if (line == "stop")
 		client.stop();

src/player.ts

@@ -0,0 +1,88 @@
+import {PlatformId, RiotAPI, RiotAPITypes} from "@fightmegg/riot-api"
+import AccountDTO = RiotAPITypes.Account.AccountDTO;
+
+const riotAPI = new RiotAPI(process.env["RIOT_API_KEY"] as string);
+
+export class Player {
+
+	account: AccountDTO
+	startElo?: Elo
+
+	constructor(account: AccountDTO) {
+		this.account = account;
+	}
+
+	async fetchCurrentElo(): Promise<Elo | undefined> {
+		let entries = await riotAPI.league.getEntriesBySummonerId({
+			region: PlatformId.EUW1,
+			summonerId: (await riotAPI.summoner.getByPUUID({
+				region: PlatformId.EUW1,
+				puuid: this.account.puuid
+			})).id
+		});
+
+		let soloQ = entries.find(e => e.queueType == "RANKED_SOLO_5x5");
+		if (soloQ && ((soloQ.wins + soloQ.losses) >= 5)){
+			return {
+				tier: soloQ.tier,
+				rank: soloQ.rank,
+				points: soloQ.leaguePoints
+			};
+		}
+	}
+
+	toString() {
+		return `${this.account.gameName}#${this.account.tagLine}`;
+	}
+
+	static async Create(gameName: string, tag: string) {
+		let account: AccountDTO;
+		try {
+			account = await riotAPI.account.getByRiotId({
+				region: PlatformId.EUROPE,
+				gameName: gameName,
+				tagLine: tag
+			});
+		} catch (error) {
+			console.error(`Riot ID not found: ${gameName}#${tag}!`);
+			return;
+		}
+		let p = new Player(account);
+		p.startElo = await p.fetchCurrentElo();
+		return p;
+	}
+}
+
+interface Elo {
+	tier: string,
+	rank: string,
+	points: number
+}
+
+function eloToNumber(elo: Elo){
+	let tiers: Record<string, number> = {
+		"CHALLENGER": 2800,
+		"GRANDMASTER": 2800,
+		"MASTER": 2800,
+		"DIAMOND": 2400,
+		"EMERALD": 2000,
+		"PLATINUM": 1600,
+		"GOLD": 1200,
+		"SILVER": 800,
+		"BRONZE": 400,
+		"IRON": 0,
+	};
+
+	let ranks: Record<string, number> = {
+		"I": 300,
+		"II": 200,
+		"III": 100,
+		"IV": 0,
+	};
+
+	let tier = elo.tier;
+	if (tier === "MASTER" || tier === "GRANDMASTER" || tier === "CHALLENGER")
+		return tiers[tier] + elo.points;
+
+	return tiers[tier] + ranks[elo.rank] + elo.points;
+}