Make stuff work

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 config.json
 lyrics
+downloads

buttonrow.js

@@ -1,10 +1,10 @@
-import { MessageActionRow } from "discord.js"
+import { ActionRowBuilder, ButtonBuilder } from "discord.js"
 
 export default class ButtonRow {
 
 	constructor(options, ...buttons) {
 		this.options = options
-		this.row = new MessageActionRow()
+		this.row = new ActionRowBuilder()
 			.addComponents(buttons)
 		this.msg = null
 		this.disabled = false
@@ -40,7 +40,9 @@ export default class ButtonRow {
 	editRow(cb) {
 		if(!cb || this.disabled) return
 		this.editOptions(msg => {
-			let row = msg.components[0]
+			console.log(msg.components[0]);
+			let row = msg.components[0];
+			row.components = row.components.map(component => ButtonBuilder.from(component))
 			cb(row)
 			return { components: [row] }
 		})

commands.js

@@ -35,7 +35,9 @@ export function register(bot) {
 				await bot.commands[interaction.commandName].run(bot, interaction);
 			} catch (error) {
 				logger.error(error);
-				interaction.reply({ content: ":woozy_face: There was an error executing that command.", ephemeral: true });
+				if (interaction.isRepliable()) {
+					interaction.reply({ content: ":woozy_face: There was an error executing that command.", ephemeral: true });
+				}
 			}
 		} else {
 			logger.error("Unknown command received: " + interaction.commandName);

commands/game.js

@@ -1,4 +1,4 @@
-import { MessageEmbed } from "discord.js";
+import { EmbedBuilder } from "discord.js";
 import { games } from "../lyrics.js";
 import Game from "../game.js"
 
@@ -53,10 +53,10 @@ export default {
 	run: async (bot, interaction) => {
 		const sub = interaction.options.getSubcommand();
 		if(sub === "list") {
-			const embed = new MessageEmbed();
+			const embed = new EmbedBuilder();
 			embed.setTitle("Songs (" + lyrics.length + ")");
 			embed.setFooter("SongGuesser");
-			embed.setColor([0, 230, 0]);
+			embed.setColor(0x00E600);
 			embed.addFields(lyrics.map(l => {
 				return {
 					name: `${l.title}`,
@@ -84,7 +84,7 @@ export default {
 				interaction.reply({ embeds: [{
 					title: "**No game running!**",
 					description: "There is no game running in this channel",
-					color: [230, 0, 0]
+					color: 0xE60000
 				}]})
 				return;
 			}
@@ -95,7 +95,7 @@ export default {
 				interaction.reply({ embeds: [{
 					title: "**No game running!**",
 					description: "There is no game running in this channel",
-					color: [230, 0, 0]
+					color: 0xE60000
 				}]})
 				return;
 			}

commands/ping.js

@@ -8,7 +8,7 @@ export default {
 		interaction.reply({ embeds: [{
 			title: "**I am responsive!**",
 			description: `:ping_pong: Pong! (${bot.ws.ping}ms)`,
-			color: [0, 230, 0]
+			color: 0x00E600
 		}], ping: bot.ws.ping });
 	}
 }

commands/points.js

@@ -1,4 +1,4 @@
-import { MessageEmbed } from "discord.js";
+import { EmbedBuilder } from "discord.js";
 import points from "../points.js";
 
 export default {
@@ -44,7 +44,7 @@ export default {
 			const user = interaction.options.getUser("user") || interaction.user;
 			const point = points.getPoints(user.id, interaction.guild.id);
 			console.log(point);
-			const embed = new MessageEmbed();
+			const embed = new EmbedBuilder();
 			embed.setTitle(`${user.username}'s points`);
 			embed.setFooter("SongGuesser");
 			embed.setColor("YELLOW");
@@ -58,7 +58,7 @@ export default {
 				return;
 			}
 			const top = global ? points.getTopList() : points.getTopList(interaction.guild.id);
-			const embed = new MessageEmbed();
+			const embed = new EmbedBuilder();
 			embed.setTitle("Top list for " + (global ? "all guilds" : interaction.guild.name));
 			embed.setFooter("SongGuesser");
 			embed.setColor("#3cbd9b");

commands/round.js

@@ -1,4 +1,4 @@
-import { MessageEmbed } from "discord.js";
+import { EmbedBuilder } from "discord.js";
 import { games } from "../lyrics.js";
 import Game from "../game.js"
 
@@ -28,7 +28,7 @@ export default {
 				interaction.reply({ embeds: [{
 					title: "**No game running!**",
 					description: "There is no game running in this channel",
-					color: [230, 0, 0]
+					color: 0xE60000
 				}]})
 				return;
 			}
@@ -39,7 +39,7 @@ export default {
 				interaction.reply({ embeds: [{
 					title: "**No game running!**",
 					description: "There is no game running in this channel",
-					color: [230, 0, 0]
+					color: 0xE60000
 				}]})
 				return;
 			}

game.js

@@ -3,8 +3,11 @@ import Logger from "./logger.js"
 import { bot, getFooter  } from "./main.js"
 import Round from "./round.js"
 import ButtonRow from "./buttonrow.js"
-import config from "./config.json" assert {type: "json"};
 import points from "./points.js"
+import { ButtonBuilder, ButtonStyle, EmbedBuilder } from "discord.js";
+import { readFile } from "fs/promises"
+
+export const config = await readFile("./config.json", { encoding: "utf-8" }).then(JSON.parse);
 
 const logger = new Logger("Game")
 
@@ -60,27 +63,24 @@ export default class Game {
 			}]
 		}
 
-		this.buttonrow = new ButtonRow(msgopt, {
-			customId: `join_game`,
-			disabled: false,
-			emoji: { name: `🎶` },
-			label: "Tune in",
-			style: "PRIMARY",
-			type: "BUTTON"
-		}, {
-			customId: `quickstart_game`,
-			disabled: true,
-			emoji: { name: `⏩` },
-			label: "Quickstart",
-			style: "SUCCESS",
-			type: "BUTTON"
-		}, {
-			customId: `cancel_game`,
-			disabled: false,
-			label: "Cancel",
-			style: "DANGER",
-			type: "BUTTON"
-		})
+		this.buttonrow = new ButtonRow(msgopt, new ButtonBuilder()
+			.setCustomId("join_game")
+			.setDisabled(false)
+			.setEmoji("🎶")
+			.setLabel("Tune in")
+			.setStyle(ButtonStyle.Primary),
+		new ButtonBuilder()
+			.setCustomId("quickstart_game")
+			.setDisabled(true)
+			.setEmoji("⏩")
+			.setLabel("Quickstart")
+			.setStyle(ButtonStyle.Success),
+		new ButtonBuilder()
+			.setCustomId("cancel_game")
+			.setDisabled(false)
+			.setLabel("Cancel")
+			.setStyle(ButtonStyle.Danger)
+		)
 
 		if(interaction) this.buttonrow.reply(interaction)
 		else this.buttonrow.send(this.channel)
@@ -136,7 +136,7 @@ export default class Game {
 
 		if(this.buttonrow && this.state == Game.STARTING) {
 			this.buttonrow.editOptions(msg => {
-				let embed = msg.embeds[0]
+				let embed = EmbedBuilder.from(msg.embeds[0])
 				embed.fields = [{name: `Participants (${this.participantCount}/${minParticipants}):`, value: this.participantlist.join(", ")}]
 				return {embeds: [embed]}
 			})

lyrics.js

@@ -1,9 +1,10 @@
-import fs from "fs/promises"
-import ytdl from "ytdl-core"
+import { readFile } from "fs/promises"
 import Logger from "./logger.js"
 import { COLOR } from "./logger.js"
 import Game from "./game.js"
-import config from "./config.json" assert {type: "json"}
+import { ytDlp } from "./main.js"
+
+export const config = await readFile("./config.json", { encoding: "utf-8" }).then(JSON.parse);
 
 const lyricslib = await import(config.lyrics + "main.mjs")
 
@@ -24,6 +25,34 @@ let bot
 
 export default class LyricsMan {
 
+	static async init() {
+		// fetch song lengths
+		const a = []
+		const promises = []
+
+		for (let l of lyrics) {
+			let id = l.id
+			a.push(id)
+			if(l.options.length) continue
+
+			promises.push(ytDlp.retrieveMediaInfoList(l.url))
+		}
+
+		let mediaInfos
+		try {
+			mediaInfos = await Promise.all(promises)
+		} catch (e) {
+			logger.error(`fetch length error ${id}:`, e)
+		}
+
+		for (let i in mediaInfos) {
+			const info = mediaInfos[i][0]
+			lyrics[i].length = info.duration
+		}
+
+		logger.log(`Loaded lyrics: ${a.join(", ")}`)
+	}
+
 	constructor(_bot) {
 		bot = _bot
 
@@ -40,7 +69,6 @@ export default class LyricsMan {
 		})
 
 		bot.on("interactionCreate", i => {
-			if(i.type != "MESSAGE_COMPONENT") return
 			if(!i.isButton()) return
 			if(!["join_game","quickstart_game","cancel_game"].includes(i.customId)) return
 
@@ -49,7 +77,7 @@ export default class LyricsMan {
 				i.reply({ embeds: [{
 					title: "**No game running!**",
 					description: "There is no game running in this channel",
-					color: [230, 0, 0],
+					color: 0xE60000,
 					ephemeral: true
 				}]})
 				return
@@ -83,20 +111,4 @@ export default class LyricsMan {
 
 	}
 
-}
-
-// fetch song lengths
-let a = []
-for (let l of lyrics) {
-	let id = l.id
-	a.push(id)
-	if(l.options.length) continue
-	ytdl.getBasicInfo(l.url).then(info => {
-		l.length = parseInt(info.videoDetails.lengthSeconds)
-	}).catch(e => {
-		logger.error(`fetch length error ${id}:`, e)
-	})
-}
-
-logger.log(`Loaded lyrics: ${a.join(", ")}`)
-//console.log(lyrics)
+}

main.js

@@ -1,14 +1,16 @@
-import { Client, WebhookClient } from "discord.js";
-import config from "./config.json" assert {type: "json"};
+import { Client, GatewayIntentBits, Partials, WebhookClient } from "discord.js";
 import { load, register } from "./commands.js"
 import statusmgr from "./statusmgr.js"
 import LyricsMan from "./lyrics.js"
 import Logger from "./logger.js"
 import { COLOR } from "./logger.js"
 import points from "./points.js";
 import { db, createTables } from "./sql.js";
-import fs from "fs/promises"
+import { readFile } from "fs/promises"
 import { execSync } from "child_process"
+import { YtDlp } from "@yemreak/yt-dlp"
+
+export const config = await readFile("./config.json", { encoding: "utf-8" }).then(JSON.parse);
 
 export let errorhook = null;
 if(config.errorhook) {
@@ -42,11 +44,19 @@ if(config.errorhook) {
 }
 
 const logger = new Logger("Discord Bot", "38;2;255;0;255;3")
-export const bot = new Client({ intents: ["GUILDS", "GUILD_MESSAGES", "GUILD_VOICE_STATES", "DIRECT_MESSAGES"], partials: ["CHANNEL"] });
+export const bot = new Client({ intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMessages, GatewayIntentBits.GuildVoiceStates, GatewayIntentBits.DirectMessages, GatewayIntentBits.MessageContent], partials: [Partials.Channel] });
 
 export const VERSION = await getVersion()
 export const BRANCH = getBranch()
 
+const ytdlpConfig = { workdir: "./downloads" }
+export const ytDlp = new YtDlp(ytdlpConfig)
+
+// install ytdlp from pip
+await ytDlp.downloadLatestReleaseIfNotExists()
+
+await LyricsMan.init()
+
 bot.on("ready", async () => {
 	logger.log(`Logged in as ${bot.user.tag}!`);
 
@@ -70,7 +80,7 @@ bot.on("messageCreate", (msg) => {
 })
 
 async function getVersion() {
-	let data = await fs.readFile("./package.json", { encoding: "utf-8" })
+	let data = await readFile("./package.json", { encoding: "utf-8" })
 	try {
 		data = JSON.parse(data)
 	} catch (e) {