From 7a3334da5012e7c2d479375fb70f2dbc98eb0d69 Mon Sep 17 00:00:00 2001 From: *x1 Date: Fri, 14 Jun 2024 08:19:28 +0200 Subject: [PATCH] Update idTeam + move &twh --- commands/teams admin/tcreate.js | 17 +- commands/{teams => teams admin}/twithdraw.js | 224 +++++++++---------- 2 files changed, 126 insertions(+), 115 deletions(-) rename commands/{teams => teams admin}/twithdraw.js (97%) diff --git a/commands/teams admin/tcreate.js b/commands/teams admin/tcreate.js index deef77c..36192f1 100644 --- a/commands/teams admin/tcreate.js +++ b/commands/teams admin/tcreate.js @@ -90,8 +90,19 @@ module.exports = { teamDescription = m.content; let idBase = teamName.toLowerCase().replace(/ /g, ''); + idBase = teamName.toLowerCase().replace('0', ''); + idBase = teamName.toLowerCase().replace('1', ''); + idBase = teamName.toLowerCase().replace('2', ''); + idBase = teamName.toLowerCase().replace('3', ''); + idBase = teamName.toLowerCase().replace('4', ''); + idBase = teamName.toLowerCase().replace('5', ''); + idBase = teamName.toLowerCase().replace('6', ''); + idBase = teamName.toLowerCase().replace('7', ''); + idBase = teamName.toLowerCase().replace('8', ''); + idBase = teamName.toLowerCase().replace('9', ''); + let id = idBase; - let increment = 1; + let increment = '-'; let exists = true; do { await new Promise((resolve, reject) => { @@ -101,7 +112,7 @@ module.exports = { } else { exists = !!row; if (exists) { - increment++; + increment =+ '-'; id = idBase + increment; } else { db.run(`INSERT INTO teams (guildId, id, name, description) VALUES (?, ?, ?, ?)`, [message.guild.id, id, teamName, teamDescription]); @@ -115,7 +126,7 @@ module.exports = { const embed = new EmbedBuilder() .setTitle('đŸ›Ąïž CrĂ©ation de team') - .setDescription(`Votre team a Ă©tĂ© crĂ©Ă©e avec succĂšs !\n\n**ID :** ${id}\n**Nom :** ${teamName}\n**Description :** ${teamDescription}\n\nVous pouvez maintenant inviter des membres dans votre team avec la commande \`&teaminvite\`.\n\nPour quitter la team, utilisez la commande \`&teamleave\`.`) + .setDescription(`Votre team a Ă©tĂ© crĂ©Ă©e avec succĂšs !\n\n**ID :** ${id}\n**Nom :** ${teamName}\n**Description :** ${teamDescription}\n\nVous pouvez maintenant inviter des membres dans votre team avec la commande \`&teaminvite\`.\n\nPour quitter la team, utilisez la commande \`&teamleave\` (vous deverez d'abord donner la team a quelqu'un d'autre).`) .setColor(await embedColor(message.author.id, message.guild.id)) .setTimestamp() .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); diff --git a/commands/teams/twithdraw.js b/commands/teams admin/twithdraw.js similarity index 97% rename from commands/teams/twithdraw.js rename to commands/teams admin/twithdraw.js index 9c4f96e..1aefb91 100644 --- a/commands/teams/twithdraw.js +++ b/commands/teams admin/twithdraw.js @@ -1,113 +1,113 @@ -const { EmbedBuilder } = require('discord.js'); -const db = require('../../fonctions/database.js'); -const embedColor = require('../../fonctions/embedColor.js'); - -module.exports = { - aliases: ['tretirer', 'teamwithdraw', 'teamretirer', 'teamwh', 'twh'], - description: 'Retire de l\'argent de la banque de votre team.', - emote: '💰', - utilisation: '', - permission: 0, - - async execute(message, args, client) { - if (args.length !== 1) { - const embed = new EmbedBuilder() - .setTitle('Retrait Impossible') - .setDescription('❌ Vous devez spĂ©cifier un montant Ă  retirer.') - .setColor(await embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); - - return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); - } else if (args[0] !== 'all' && isNaN(args[0])) { - const embed = new EmbedBuilder() - .setTitle('Retrait Impossible') - .setDescription('❌ Vous devez spĂ©cifier un montant valide Ă  retirer.') - .setColor(await embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); - - return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); - } else if (args[0] < 1) { - const embed = new EmbedBuilder() - .setTitle('Retrait Impossible') - .setDescription('❌ Vous devez retirer au moins 1 coin.') - .setColor(await embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); - - return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); - } - - const teamRole = await new Promise((resolve, reject) => { - db.get(`SELECT teamRole FROM users WHERE guildId = ? AND userId = ?`, [message.guild.id, message.author.id], (err, row) => { - if (err) reject(err); - resolve(row.teamRole); - }); - }); - - if (!teamRole || (teamRole !== 'officier' && teamRole !== 'owner')) { - const embed = new EmbedBuilder() - .setTitle('Retrait Impossible') - .setDescription('❌ Vous n\'avez pas la permission de retirer de l\'argent de la banque de l\'Ă©quipe.') - .setColor(await embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); - - return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); - } - - const team = await new Promise((resolve, reject) => { - db.get(`SELECT teamId FROM users WHERE guildId = ? AND userId = ?`, [message.guild.id, message.author.id], (err, row) => { - if (err) reject(err); - resolve(row.teamId); - }); - }); - - if (!team) { - const embed = new EmbedBuilder() - .setTitle('Retrait Impossible') - .setDescription('❌ Vous n\'ĂȘtes pas dans une team.') - .setColor(await embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); - - return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); - } else { - const bank = await new Promise((resolve, reject) => { - db.get(`SELECT bank FROM teams WHERE id = ? AND guildId = ?`, [team, message.guild.id], (err, row) => { - if (err) reject(err); - resolve(row.bank); - }); - }); - - let amount; - if (args[0] === 'all') { - amount = bank; - } else if (args[0] > bank) { - const embed = new EmbedBuilder() - .setTitle('Retrait Impossible') - .setDescription(`❌ Votre team n'a pas assez d'argent dans la banque pour retirer cette somme.\n\n💰 Votre team a actuellement **${bank} coins** dans la banque.`) - .setColor(await embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); - - return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); - } else { - amount = args[0]; - } - - db.run(`UPDATE users SET pocket = pocket + ? WHERE guildId = ? AND userId = ?`, [amount, message.guild.id, message.author.id]); - db.run(`UPDATE teams SET bank = bank - ? WHERE id = ? AND guildId = ?`, [amount, team, message.guild.id]); - - const embed = new EmbedBuilder() - .setTitle('Retrait EffectuĂ©') - .setDescription(`💰 Vous avez retirĂ© **${amount}** coins de la banque de votre team.`) - .setColor(await embedColor(message.author.id, message.guild.id)) - .setTimestamp() - .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); - - return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); - } - }, +const { EmbedBuilder } = require('discord.js'); +const db = require('../../fonctions/database.js'); +const embedColor = require('../../fonctions/embedColor.js'); + +module.exports = { + aliases: ['tretirer', 'teamwithdraw', 'teamretirer', 'teamwh', 'twh'], + description: 'Retire de l\'argent de la banque de votre team.', + emote: '💰', + utilisation: '', + permission: 0, + + async execute(message, args, client) { + if (args.length !== 1) { + const embed = new EmbedBuilder() + .setTitle('Retrait Impossible') + .setDescription('❌ Vous devez spĂ©cifier un montant Ă  retirer.') + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); + + return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); + } else if (args[0] !== 'all' && isNaN(args[0])) { + const embed = new EmbedBuilder() + .setTitle('Retrait Impossible') + .setDescription('❌ Vous devez spĂ©cifier un montant valide Ă  retirer.') + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); + + return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); + } else if (args[0] < 1) { + const embed = new EmbedBuilder() + .setTitle('Retrait Impossible') + .setDescription('❌ Vous devez retirer au moins 1 coin.') + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); + + return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); + } + + const teamRole = await new Promise((resolve, reject) => { + db.get(`SELECT teamRole FROM users WHERE guildId = ? AND userId = ?`, [message.guild.id, message.author.id], (err, row) => { + if (err) reject(err); + resolve(row.teamRole); + }); + }); + + if (!teamRole || (teamRole !== 'officier' && teamRole !== 'owner')) { + const embed = new EmbedBuilder() + .setTitle('Retrait Impossible') + .setDescription('❌ Vous n\'avez pas la permission de retirer de l\'argent de la banque de l\'Ă©quipe.') + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); + + return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); + } + + const team = await new Promise((resolve, reject) => { + db.get(`SELECT teamId FROM users WHERE guildId = ? AND userId = ?`, [message.guild.id, message.author.id], (err, row) => { + if (err) reject(err); + resolve(row.teamId); + }); + }); + + if (!team) { + const embed = new EmbedBuilder() + .setTitle('Retrait Impossible') + .setDescription('❌ Vous n\'ĂȘtes pas dans une team.') + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); + + return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); + } else { + const bank = await new Promise((resolve, reject) => { + db.get(`SELECT bank FROM teams WHERE id = ? AND guildId = ?`, [team, message.guild.id], (err, row) => { + if (err) reject(err); + resolve(row.bank); + }); + }); + + let amount; + if (args[0] === 'all') { + amount = bank; + } else if (args[0] > bank) { + const embed = new EmbedBuilder() + .setTitle('Retrait Impossible') + .setDescription(`❌ Votre team n'a pas assez d'argent dans la banque pour retirer cette somme.\n\n💰 Votre team a actuellement **${bank} coins** dans la banque.`) + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); + + return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); + } else { + amount = args[0]; + } + + db.run(`UPDATE users SET pocket = pocket + ? WHERE guildId = ? AND userId = ?`, [amount, message.guild.id, message.author.id]); + db.run(`UPDATE teams SET bank = bank - ? WHERE id = ? AND guildId = ?`, [amount, team, message.guild.id]); + + const embed = new EmbedBuilder() + .setTitle('Retrait EffectuĂ©') + .setDescription(`💰 Vous avez retirĂ© **${amount}** coins de la banque de votre team.`) + .setColor(await embedColor(message.author.id, message.guild.id)) + .setTimestamp() + .setFooter({ text: `DemandĂ© par ${message.author.tag}`, iconURL: message.author.displayAvatarURL() }); + + return message.reply({ embeds: [embed], allowedMentions: { repliedUser: false } }); + } + }, }; \ No newline at end of file