From f9d592ebc265fbc8daadd6ecb233fa20cd741fbb Mon Sep 17 00:00:00 2001 From: Angels-dev Date: Thu, 12 Sep 2024 00:31:52 +0200 Subject: [PATCH] Renommage types any et fix /crack --- .dockerignore | 2 +- .gitignore | 2 +- src/commands/global/database.ts | 4 ++-- src/commands/player/play.ts | 4 ++-- src/commands/salonpostam/crack.ts | 4 ++-- src/commands/salonpostam/parle.ts | 2 +- src/commands/salonpostam/update.ts | 2 +- src/events/client/error.ts | 2 +- src/events/client/guildMemberAdd.ts | 2 +- src/events/client/guildMemberRemove.ts | 2 +- src/events/client/ready.ts | 2 +- src/events/client/voiceStateUpdate.ts | 6 ++++-- src/index.ts | 28 +++++++++++++------------- 13 files changed, 32 insertions(+), 30 deletions(-) diff --git a/.dockerignore b/.dockerignore index 969c404..c29e504 100755 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,7 @@ .git .vscode node_modules -public/cracks +public/cracks/* .dockerignore .env .gitignore diff --git a/.gitignore b/.gitignore index d6b6a43..677993a 100755 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ dist/ node_modules/ -public/cracks/ +public/cracks/* .env* .ncurc.json \ No newline at end of file diff --git a/src/commands/global/database.ts b/src/commands/global/database.ts index 65fc52d..e8fc979 100755 --- a/src/commands/global/database.ts +++ b/src/commands/global/database.ts @@ -3,8 +3,8 @@ import { SlashCommandBuilder, ChatInputCommandInteraction, EmbedBuilder, APIEmbe import dbGuildInit from '../../utils/dbGuildInit' import dbGuild from '../../schemas/guild' -const parseObject = (obj: any, prefix = ''): { name: string, value: any }[] => { - let fields: { name: string, value: any }[] = [] +const parseObject = (obj: object, prefix = ''): { name: string, value: object | string | boolean }[] => { + let fields: { name: string, value: object | string | boolean }[] = [] for (let [key, value] of Object.entries(obj)) { if (typeof value === 'object') fields.push(...parseObject(value, `${prefix}${key}.`)) diff --git a/src/commands/player/play.ts b/src/commands/player/play.ts index c484680..6b0ee0d 100755 --- a/src/commands/player/play.ts +++ b/src/commands/player/play.ts @@ -64,7 +64,7 @@ export default { else return } try { if (!queue.connection) await queue.connect(voiceChannel) } - catch (error: any) { console.error(error) } + catch (error: unknown) { console.error(error) } let guildProfile = await dbGuild.findOne({ guildId: queue.guild.id }) @@ -90,7 +90,7 @@ export default { if (!queue.isPlaying()) await queue.node.play() let track_source = track.source === 'youtube' ? 'Youtube' : track.source === 'spotify' ? 'Spotify' : 'Inconnu' return interaction.followUp(`Chargement de la musique **${track.title}** de **${track.author}** sur **${track_source}**...`) - } catch (error: any) { console.error(error) } + } catch (error: unknown) { console.error(error) } finally { queue.tasksQueue.release() } } } \ No newline at end of file diff --git a/src/commands/salonpostam/crack.ts b/src/commands/salonpostam/crack.ts index a1c7c02..201c501 100755 --- a/src/commands/salonpostam/crack.ts +++ b/src/commands/salonpostam/crack.ts @@ -28,14 +28,14 @@ export default { for (let i = 0; i < games.length; i++) await message.react(emojis[i]) // Wait for a reaction to be added by the interaction author. - const filter: any = (reaction: MessageReaction, user: User) => { if (reaction.emoji.name) return emojis.includes(reaction.emoji.name) && user.id === interaction.user.id } + const filter = (reaction: MessageReaction, user: User) => { if (reaction.emoji.name) { return emojis.includes(reaction.emoji.name) && user.id === interaction.user.id } return false } await message.awaitReactions({ filter, max: 1, time: 5000, errors: ['time'] }).then(collected => { console.log(collected) if (!collected.first) return let reaction = collected.first() let index = emojis.indexOf(reaction?.emoji.name ?? '') game = games[index] - }).catch(() => { return interaction.followUp({ content: 'T\'as mis trop de temps à choisir !' }) }) + }).catch(() => { return interaction.followUp({ content: "T'as mis trop de temps à choisir !" }) }) } else game = games[0] diff --git a/src/commands/salonpostam/parle.ts b/src/commands/salonpostam/parle.ts index 36e95d0..3a53fa6 100755 --- a/src/commands/salonpostam/parle.ts +++ b/src/commands/salonpostam/parle.ts @@ -58,7 +58,7 @@ export default { connection.subscribe(player) let stream = connection.receiver.subscribe(user.id, { end: { behavior: EndBehaviorType.Manual } }) - stream.on('data', (chunk) => { + stream.on('data', () => { if (!user) return if (connection.receiver.speaking.users.has(user.id) && !playing) { playing = true diff --git a/src/commands/salonpostam/update.ts b/src/commands/salonpostam/update.ts index ce479a8..46d63da 100755 --- a/src/commands/salonpostam/update.ts +++ b/src/commands/salonpostam/update.ts @@ -8,7 +8,7 @@ export default { let guild = interaction.guild as Guild guild.members.fetch().then(() => { - var i = 0 + let i = 0 guild.members.cache.forEach(async member => { if (!member.user.bot) i++ }) let channel = guild.channels.cache.get('1091140609139560508') if (!channel) return diff --git a/src/events/client/error.ts b/src/events/client/error.ts index a09e2ca..a3b0ad5 100755 --- a/src/events/client/error.ts +++ b/src/events/client/error.ts @@ -2,7 +2,7 @@ import { Events } from 'discord.js' export default { name: Events.Error, - execute(error: any) { + execute(error: Error) { console.error(error) } } \ No newline at end of file diff --git a/src/events/client/guildMemberAdd.ts b/src/events/client/guildMemberAdd.ts index 7ddbebd..11d5bb8 100755 --- a/src/events/client/guildMemberAdd.ts +++ b/src/events/client/guildMemberAdd.ts @@ -7,7 +7,7 @@ export default { let guild = member.guild guild.members.fetch().then(() => { - var i = 0 + let i = 0 guild.members.cache.forEach(async member => { if (!member.user.bot) i++ }) let channel = guild.channels.cache.get('1091140609139560508') diff --git a/src/events/client/guildMemberRemove.ts b/src/events/client/guildMemberRemove.ts index cb57791..2eca32e 100755 --- a/src/events/client/guildMemberRemove.ts +++ b/src/events/client/guildMemberRemove.ts @@ -7,7 +7,7 @@ export default { let guild = member.guild guild.members.fetch().then(() => { - var i = 0 + let i = 0 guild.members.cache.forEach(async member => { if (!member.user.bot) i++ }) let channel = guild.channels.cache.get('1091140609139560508') diff --git a/src/events/client/ready.ts b/src/events/client/ready.ts index 7df9d9f..b752b4f 100755 --- a/src/events/client/ready.ts +++ b/src/events/client/ready.ts @@ -97,7 +97,7 @@ export default { } catch (error) { console.error(chalk.magenta(`[Twitch] {${guild.name}} ` + error)) } } }) .on('error', error => console.error(chalk.magenta(`[Twitch] {${guild.name}} ` + error))) .on('close', () => { - console.log(chalk.magenta('[Twitch] {${guild.name}} EventSub Connection Closed !')) + console.log(chalk.magenta(`[Twitch] {${guild.name}} EventSub Connection Closed !`)) twitch.connect('wss://eventsub.wss.twitch.tv/ws') }) }).on('connectFailed', error => console.error(chalk.magenta(`[Twitch] {${guild.name}} ` + error))) diff --git a/src/events/client/voiceStateUpdate.ts b/src/events/client/voiceStateUpdate.ts index 1fef245..df3112c 100755 --- a/src/events/client/voiceStateUpdate.ts +++ b/src/events/client/voiceStateUpdate.ts @@ -1,8 +1,10 @@ -import { Events, VoiceState } from 'discord.js' +//import { Events, VoiceState } from 'discord.js' +import { Events } from 'discord.js' export default { name: Events.VoiceStateUpdate, - async execute(oldState: VoiceState, newState: VoiceState) { + async execute() { + //async execute(oldState: VoiceState, newState: VoiceState) { /* let oldMute = oldState.serverMute let newMute = newState.serverMute diff --git a/src/index.ts b/src/index.ts index a3393c5..8370d61 100755 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,5 @@ // PACKAGES -import { Client, Collection, GatewayIntentBits, REST, Routes, ChatInputCommandInteraction, AutocompleteInteraction, ButtonInteraction } from 'discord.js' +import { Client, Collection, GatewayIntentBits, REST, Routes, ChatInputCommandInteraction, AutocompleteInteraction, ButtonInteraction, SlashCommandBuilder } from 'discord.js' import { Player } from 'discord-player' import { connection, Connection } from 'mongoose' import path from 'path' @@ -8,26 +8,26 @@ import 'dotenv/config' // CUSTOM TYPES interface CConnection extends Connection { - once: (event: string, listener: (...args: any[]) => void) => void - on: (event: string, listener: (...args: any[]) => void) => void + once: (event: string, listener: (...args: unknown[]) => void) => void + on: (event: string, listener: (...args: unknown[]) => void) => void } interface Command { name: string description: string - data: any - autocompleteRun: (interaction: AutocompleteInteraction) => any - execute: (interaction: ChatInputCommandInteraction) => any + data: SlashCommandBuilder + autocompleteRun: (interaction: AutocompleteInteraction) => unknown + execute: (interaction: ChatInputCommandInteraction) => unknown } interface Button { name: string description: string id: string - execute: (interaction: ButtonInteraction) => any + execute: (interaction: ButtonInteraction) => unknown } declare module 'discord.js' { export interface Client { - commands: Collection - buttons: Collection + commands: Collection + buttons: Collection disco: { interval: NodeJS.Timeout } rss: { interval: NodeJS.Timeout } } @@ -111,8 +111,8 @@ let eventClientFiles = fs.readdirSync(path.join(__dirname, './events/client')).f eventClientFiles.forEach(async file => { let event = await import(path.join(__dirname, './events/client', file)) event = event.default - if (event.once) client.once(event.name, (...args: any[]) => { event.execute(...args) }) - else client.on(event.name, (...args: any[]) => { event.execute(...args) }) + if (event.once) client.once(event.name, (...args: unknown[]) => { event.execute(...args) }) + else client.on(event.name, (...args: unknown[]) => { event.execute(...args) }) }) // PLAYER EVENTS HANDLING @@ -121,7 +121,7 @@ eventsPlayer.forEach(async file => { let event = await import(path.join(__dirname, './events/player', file)) event = event.default if (event.name === 'debug') return - player.events.on(event.name, (...args: any[]) => event.execute(...args)) + player.events.on(event.name, (...args: unknown[]) => event.execute(...args)) }) // MONGO EVENTS HANDLING @@ -129,8 +129,8 @@ let eventsMongo = fs.readdirSync(path.join(__dirname, './events/mongo')).filter( eventsMongo.forEach(async file => { let event = await import(path.join(__dirname, './events/mongo', file)) event = event.default - if (event.once) (connection as CConnection).once(event.name, (...args: any[]) => { event.execute(...args, client) }) - else (connection as CConnection).on(event.name, (...args: any[]) => { event.execute(...args, client) }) + if (event.once) (connection as CConnection).once(event.name, (...args: unknown[]) => { event.execute(...args, client) }) + else (connection as CConnection).on(event.name, (...args: unknown[]) => { event.execute(...args, client) }) })