Fix

bacherobot · Sep 10, 2023 · ad55eef · ad55eef
1 parent 23629cf
commit ad55eef
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/modules/bachero.module.contributors/contributeurs.js b/modules/bachero.module.contributors/contributeurs.js
@@ -20,7 +20,7 @@ module.exports = {
 	// Code à exécuter quand la commande est appelée
 	async execute(interaction){
 		// On defer l'interaction, si c'est pas une commande texte (on a pas besoin de defer pour les commandes texte car il n'y a pas de timeout)
-		if(interaction.sourceType != "textCommand" && await interaction.deferReply({ ephemeral: true }).catch(err => { return "stop" }) == "stop") return
+		if(interaction.sourceType != "textCommand" && await interaction.deferReply().catch(err => { return "stop" }) == "stop") return
 
 		// Si on a pas encore les contributeurs dans le cache, les récupérer
 		if(!cacheContributors?.data || cacheContributors?.lastUsed < Date.now() - (1000 * 60 * 60)){ // (une heure)
@@ -44,8 +44,8 @@ module.exports = {
 		}
 
 		// Si on a déjà l'embed dans le cache, l'utiliser
-		if(cacheContributors?.embed && interaction.sourceType != "textCommand") return interaction.reply({ embeds: [cacheContributors.embed], components: [row] }).catch(err => {})
-		else if(cacheContributors?.embed && interaction.sourceType == "textCommand") return interaction.editReply({ embeds: [cacheContributors.embed], components: [row] }).catch(err => {})
+		if(cacheContributors?.embed && interaction.sourceType == "textCommand") return interaction.reply({ embeds: [cacheContributors.embed], components: [row] }).catch(err => {})
+		else if(cacheContributors?.embed) return interaction.editReply({ embeds: [cacheContributors.embed], components: [row] }).catch(err => {})
 
 		// Sinon, on va créer l'embed
 		var embed = new EmbedBuilder()
@@ -68,6 +68,7 @@ module.exports = {
 		})
 
 		// Répondre avec l'embed
-		interaction.reply({ embeds: [embed], components: [row] }).catch(err => {})
+		if(interaction.sourceType == "textCommand") interaction.reply({ embeds: [embed], components: [row] }).catch(err => {})
+		else interaction.editReply({ embeds: [embed], components: [row] }).catch(err => {})
 	}
 }
diff --git a/modules/bachero.module.fake/fake.js b/modules/bachero.module.fake/fake.js
@@ -197,7 +197,7 @@ module.exports = {
 				if(webhook.lastUsed < Date.now() - 600000){
 					await bacheroFunctions.database.delete(database, Object.entries(webhooks).find(([key, value]) => value.id == webhook.id)?.[0])
 					try { var webhookClient = new WebhookClient({ id: webhook.id, token: webhook.token }) } catch(err) { var webhookClient = { error: err } }
-					if(!webhookClient.error) await webhookClient.delete().catch(err => { return "stop" })
+					if(!webhookClient.error) try { await webhookClient.delete().catch(err => { return "stop" }) } catch(err) {}
 				}
 			})
 		}, 120000) // Vérifier toutes les 2 minutes s'il ne faut pas supprimer un/plusieurs webhooks

diff --git a/modules/bachero.module.pfc/pfc.js b/modules/bachero.module.pfc/pfc.js
@@ -120,7 +120,7 @@ module.exports = {
 			var embed = new EmbedBuilder(interaction?.message?.embeds[0]?.data)
 			embed.setDescription(`Tu as choisi **${interaction.customId.replace("pfc-", "")}** et j'ai choisi **${botAnswer}**.\n\n${winner == "draw" ? "C'est un match nul !" : winner == "player" ? "Bravo, tu as gagné !" : "Dommage, tu as perdu !"}`)
 			embed.setFooter({ text: `${winCount} victoire${winCount.length > 1 ? "s" : ""} | ${loseCount} défaite${loseCount.length > 1 ? "s" : ""}${!Math.round(winPercent) ? "" : ` | ${Math.round(winPercent)}% des parties remportées`}` })
-			embed.setColor(bacheroFunctions.config.getValue("bachero", winner == "player" ? "successEmbedColor" : winner == "bot" ? "secondEmbedColor" : "embedColor"))
+			embed.setColor(winner == "draw" ? bacheroFunctions.colors.secondary : winner == "player" ? bacheroFunctions.colors.success : bacheroFunctions.colors.danger)
 			interaction.update({ embeds: [embed] }).catch(err => {})
 		})
 	},

diff --git a/modules/bachero.module.transports/divia.js b/modules/bachero.module.transports/divia.js
@@ -1,5 +1,6 @@
 const { SlashCommandBuilder, EmbedBuilder, ActionRowBuilder, ModalBuilder, TextInputBuilder, TextInputStyle, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder, StringSelectMenuOptionBuilder } = require("discord.js")
 const Fuse = require("fuse.js")
+const fetch = require("node-fetch")
 const bacheroFunctions = require("../../functions")
 const escape = require("markdown-escape")
 

diff --git a/modules/bachero.module.transports/ratp.js b/modules/bachero.module.transports/ratp.js
@@ -1,5 +1,6 @@
 const { SlashCommandBuilder, EmbedBuilder, ActionRowBuilder, ModalBuilder, TextInputBuilder, TextInputStyle, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder, StringSelectMenuOptionBuilder } = require("discord.js")
 const Fuse = require("fuse.js")
+const fetch = require("node-fetch")
 const bacheroFunctions = require("../../functions")
 
 // Ids d'interactions