diff --git a/commands/wordwar.js b/commands/wordwar.js index 79076f2..a4bbe68 100644 --- a/commands/wordwar.js +++ b/commands/wordwar.js @@ -6,7 +6,7 @@ var wwId = 1; /** * This function aims to do word wars inside a discord channel. - * Someone launches a wordwar and other people can join in by clicking on the react icon. + * Someone launches a wrdwar and other people can join in by clicking on the react icon. * First argument is the time of duration of the wordwar. * Second argument is the waiting time before the wordwar. **/ @@ -85,7 +85,7 @@ module.exports = { ongoingww.set(interaction.user.id, wwRole.name); interaction.member.roles.add(wwRole.id); - commandReply = "la " + wwRole.name + " a été initiée. Elle commencera dans " + wwdelay + " minutes et durera " + wwtimer + " minutes.\nInscrits : " + getRegistered(wwRole); + const commandReply = getRegistered(wwRole.name,wwdelay,wwtimer); const row = new MessageActionRow() .addComponents( @@ -119,8 +119,8 @@ module.exports = { OnlyReply('Vous êtes déjà enregistré.e dans la wordwar ' + ongoingww.get(i.user.id), i, wwRole); } else { i.member.roles.add(wwRole); - ongoingww.set(i.user.id, wwRole); - i.message.edit(commandReply); + ongoingww.set(i.user.id, wwRole.name); + i.message.edit(getRegistered(wwRole.name, wwdelay, wwtimer)); i.deferUpdate(); } }); @@ -137,6 +137,7 @@ module.exports = { } else { i.member.roles.remove(wwRole); ongoingww.delete(i.user.id); + console.log(ongoingww); i.deferUpdate(); // Si l'utilisateur qui annule est le dernier dans cette wordwar @@ -154,7 +155,7 @@ module.exports = { console.log(wwRole.name + ' canceled'); return; }else{ - i.message.edit(commandReply); + i.message.edit(getRegistered(wwRole.name, wwdelay, wwtimer)); } } }); @@ -203,13 +204,12 @@ function OnlyReply(str, int, ww) { } } -function getRegistered(ww) { +function getRegistered(ww,d, t) { var str = ""; ongoingww.forEach(async (value, key) => { - if (value == ww.name){ + if (value == ww){ str += userMention(key) + ' '; } }); - return str; - + return "la " + ww + " a été initiée. Elle commencera dans " + d + " minutes et durera " + t + " minutes.\nInscrits : " + str; } \ No newline at end of file