update

appujet · Sep 24, 2024 · 7d91283 · 7d91283
1 parent 3a0819e
commit 7d91283
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 29 deletions.
diff --git a/scripts/restart.js b/scripts/restart.js
@@ -3,7 +3,7 @@ const { exec } = require('node:child_process');
 async function startLavamusic() {
 	exec('npm start', (error, stdout, stderr) => {
 		if (error) {
-			console.error(`Error starting Lavamusic: ${error.message}`);
+			console.error(`Error starting Lavamusic: ${error}`);
 			return;
 		}
 		if (stderr) {

diff --git a/src/commands/config/Setup.ts b/src/commands/config/Setup.ts
@@ -128,7 +128,10 @@ export default class Setup extends Command {
 				}
 				client.db.deleteSetup(ctx.guild!.id);
 				const textChannel = ctx.guild.channels.cache.get(data2.textId);
-				if (textChannel) await textChannel.delete().catch(() => {});
+				if (textChannel)
+					await textChannel.delete().catch(() => {
+						null;
+					});
 				await ctx.sendMessage({
 					embeds: [
 						{

diff --git a/src/commands/music/Loop.ts b/src/commands/music/Loop.ts
@@ -36,18 +36,21 @@ export default class Loop extends Command {
 		let loopMessage = '';
 
 		switch (player?.repeatMode) {
-			case 'off':
+			case 'off': {
 				player.setRepeatMode('track');
 				loopMessage = ctx.locale('cmd.loop.looping_song');
 				break;
-			case 'track':
+			}
+			case 'track': {
 				player.setRepeatMode('queue');
 				loopMessage = ctx.locale('cmd.loop.looping_queue');
 				break;
-			case 'queue':
+			}
+			case 'queue': {
 				player.setRepeatMode('off');
 				loopMessage = ctx.locale('cmd.loop.looping_off');
 				break;
+			}
 		}
 
 		return await ctx.sendMessage({

diff --git a/src/commands/music/Queue.ts b/src/commands/music/Queue.ts
@@ -49,7 +49,7 @@ export default class Queue extends Command {
 				],
 			});
 		}
-		const songStrings = [];
+		const songStrings: string[] = [];
 		for (let i = 0; i < player.queue.tracks.length; i++) {
 			const track = player.queue.tracks[i];
 			songStrings.push(

diff --git a/src/commands/playlist/AddSong.ts b/src/commands/playlist/AddSong.ts
@@ -95,7 +95,7 @@ export default class AddSong extends Command {
 		}
 
 		let trackStrings: any;
-		let count: number = 0;
+		let count = 0;
 		if (res.loadType === 'playlist') {
 			trackStrings = res.tracks.map(track => track.encoded);
 			count = res.tracks.length;

diff --git a/src/commands/playlist/Steal.ts b/src/commands/playlist/Steal.ts
@@ -189,7 +189,6 @@ export default class StealPlaylist extends Command {
 				.respond(filtered.map(playlist => ({ name: playlist.name, value: playlist.name })))
 				.catch(console.error);
 		} catch (error) {
-			console.error('Error in autocomplete interaction:', error);
 			return await interaction
 				.respond([{ name: 'An error occurred while fetching playlists.', value: 'Error' }])
 				.catch(console.error);

diff --git a/src/env.ts b/src/env.ts
@@ -96,7 +96,7 @@ const envSchema = z.object({
 	 */
 	BOT_ACTIVITY_TYPE: z.preprocess(val => {
 		if (typeof val === 'string') {
-			return parseInt(val, 10);
+			return Number.parseInt(val, 10);
 		}
 		return val;
 	}, z.number().default(0)),

diff --git a/src/events/client/SetupSystem.ts b/src/events/client/SetupSystem.ts
@@ -16,7 +16,9 @@ export default class SetupSystem extends Event {
 		if (!(channel instanceof TextChannel)) return;
 		if (!message.member?.voice.channel) {
 			await oops(channel, T(locale, 'event.message.no_voice_channel_queue'));
-			await message.delete().catch(() => {});
+			await message.delete().catch(() => {
+				null;
+			});
 			return;
 		}
 
@@ -42,7 +44,9 @@ export default class SetupSystem extends Event {
 					channel: clientMember.voice.channelId,
 				}),
 			);
-			await message.delete().catch(() => {});
+			await message.delete().catch(() => {
+				null;
+			});
 			return;
 		}
 
@@ -60,7 +64,9 @@ export default class SetupSystem extends Event {
 		}
 
 		await setupStart(this.client, message.content, player, message);
-		await message.delete().catch(() => {});
+		await message.delete().catch(() => {
+			null;
+		});
 	}
 }
 

diff --git a/src/events/client/VoiceStateUpdate.ts b/src/events/client/VoiceStateUpdate.ts
@@ -36,7 +36,9 @@ export default class VoiceStateUpdate extends Event {
 				newState.guild.members.me.permissions.has(['Connect', 'Speak']) ||
 				newState.channel.permissionsFor(newState.guild.members.me).has('MuteMembers')
 			) {
-				await newState.guild.members.me.voice.setSuppressed(false).catch(() => {});
+				await newState.guild.members.me.voice.setSuppressed(false).catch(() => {
+					null;
+				});
 			}
 		}
 

diff --git a/src/events/player/QueueEnd.ts b/src/events/player/QueueEnd.ts
@@ -19,11 +19,15 @@ export default class QueueEnd extends Event {
 		const channel = guild.channels.cache.get(player.textChannelId!) as TextChannel;
 		if (!channel) return;
 
-		const message = await channel.messages.fetch(messageId).catch(() => {});
+		const message = await channel.messages.fetch(messageId).catch(() => {
+			null;
+		});
 		if (!message) return;
 
 		if (message.editable) {
-			await message.edit({ components: [] }).catch(() => {});
+			await message.edit({ components: [] }).catch(() => {
+				null;
+			});
 		}
 	}
 }

diff --git a/src/events/player/TrackEnd.ts b/src/events/player/TrackEnd.ts
@@ -19,10 +19,14 @@ export default class TrackEnd extends Event {
 		const channel = guild.channels.cache.get(player.textChannelId!) as TextChannel;
 		if (!channel) return;
 
-		const message = await channel.messages.fetch(messageId).catch(() => {});
+		const message = await channel.messages.fetch(messageId).catch(() => {
+			null;
+		});
 		if (!message) return;
 
-		message.delete().catch(() => {});
+		message.delete().catch(() => {
+			null;
+		});
 	}
 }
 

diff --git a/src/utils/BotLog.ts b/src/utils/BotLog.ts
@@ -18,7 +18,9 @@ export default class BotLog {
 		const color = colors[type];
 		const embed = client.embed().setColor(color).setDescription(message).setTimestamp();
 
-		channel.send({ embeds: [embed] }).catch(() => {});
+		channel.send({ embeds: [embed] }).catch(() => {
+			null;
+		});
 	}
 }
 

diff --git a/src/utils/SetupSystem.ts b/src/utils/SetupSystem.ts
@@ -93,7 +93,9 @@ async function setupStart(client: Lavamusic, query: string, player: Player, mess
 							})
 							.then(msg => setTimeout(() => msg.delete(), 5000));
 						neb(n, player, client, locale);
-						await m.edit({ embeds: [n] }).catch(() => {});
+						await m.edit({ embeds: [n] }).catch(() => {
+							null;
+						});
 						break;
 					}
 					case 'playlist': {
@@ -110,7 +112,9 @@ async function setupStart(client: Lavamusic, query: string, player: Player, mess
 							})
 							.then(msg => setTimeout(() => msg.delete(), 5000));
 						neb(n, player, client, locale);
-						await m.edit({ embeds: [n] }).catch(() => {});
+						await m.edit({ embeds: [n] }).catch(() => {
+							null;
+						});
 						break;
 					}
 				}
@@ -178,7 +182,9 @@ async function trackStart(
 					return b;
 				}),
 			})
-			.catch(() => {});
+			.catch(() => {
+				null;
+			});
 	} else {
 		await channel
 			.send({
@@ -191,7 +197,9 @@ async function trackStart(
 			.then(msg => {
 				client.db.setSetup(msg.guild.id, msg.id, msg.channel.id);
 			})
-			.catch(() => {});
+			.catch(() => {
+				null;
+			});
 	}
 }
 
@@ -241,7 +249,9 @@ async function updateSetup(client: Lavamusic, guild: any, locale: string): Promi
 						return b;
 					}),
 				})
-				.catch(() => {});
+				.catch(() => {
+					null;
+				});
 		} else {
 			const embed = client
 				.embed()
@@ -260,7 +270,9 @@ async function updateSetup(client: Lavamusic, guild: any, locale: string): Promi
 						return b;
 					}),
 				})
-				.catch(() => {});
+				.catch(() => {
+					null;
+				});
 		}
 	}
 }
@@ -269,13 +281,19 @@ async function buttonReply(int: any, args: string, color: ColorResolvable): Prom
 	const embed = new EmbedBuilder();
 	let m: Message;
 	if (int.replied) {
-		m = await int.editReply({ embeds: [embed.setColor(color).setDescription(args)] }).catch(() => {});
+		m = await int.editReply({ embeds: [embed.setColor(color).setDescription(args)] }).catch(() => {
+			null;
+		});
 	} else {
-		m = await int.followUp({ embeds: [embed.setColor(color).setDescription(args)] }).catch(() => {});
+		m = await int.followUp({ embeds: [embed.setColor(color).setDescription(args)] }).catch(() => {
+			null;
+		});
 	}
 	setTimeout(async () => {
 		if (int && !int.ephemeral) {
-			await m.delete().catch(() => {});
+			await m.delete().catch(() => {
+				null;
+			});
 		}
 	}, 2000);
 }
@@ -286,7 +304,13 @@ async function oops(channel: TextChannel, args: string): Promise<void> {
 		const m = await channel.send({
 			embeds: [embed1],
 		});
-		setTimeout(async () => await m.delete().catch(() => {}), 12000);
+		setTimeout(
+			async () =>
+				await m.delete().catch(() => {
+					null;
+				}),
+			12000,
+		);
 	} catch (e) {
 		return console.error(e);
 	}

diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts
@@ -37,7 +37,7 @@ export class Utils {
 	}
 
 	public static chunk(array: any[], size: number) {
-		const chunked_arr = [];
+		const chunked_arr: any[][] = [];
 		for (let index = 0; index < array.length; index += size) {
 			chunked_arr.push(array.slice(index, size + index));
 		}