Merge pull request #59 from C0casio45/dev

Dev
C0casio45 · May 12, 2022 · cae5c1c · cae5c1c
2 parents b75c0ee + 2d46f08
commit cae5c1c
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 41 deletions.
diff --git a/bot_modules/monitor.js b/bot_modules/monitor.js
@@ -2,10 +2,10 @@ const { logs } = require("../config.json");
 
 module.exports = {
   execute: async function (client) {
-    const netinq = await client.users.fetch("248069530381844481");
     if (!logs) return;
-    client.application?.fetch().then(() => {
+    client.application?.fetch().then(async () => {
       const cocasio = client.application?.owner;
+      const netinq = await client.users.fetch("248069530381844481");
 
       const fs = require("fs");
 
@@ -130,10 +130,10 @@ module.exports = {
     });
   },
   log: async function (message, client) {
-    const netinq = await client.users.fetch("248069530381844481");
-
-    client.application?.fetch().then(() => {
+
+    client.application?.fetch().then(async () => {
       const cocasio = client.application?.owner;
+      const netinq = await client.users.fetch("248069530381844481");
 
       cocasio.send(message);
       netinq.send(message);

diff --git a/bot_modules/unban.js b/bot_modules/unban.js
@@ -0,0 +1,10 @@
+const db = require("../utils/db/dbLibrary.js");
+
+module.exports = {
+    unban: function (interaction) {
+
+        let ub = interaction.customId.split(" ");
+        db.unbanUser(ub[0], ub[1])
+
+    }
+}
diff --git a/bot_modules/unbanFunction.js b/bot_modules/unbanFunction.js
diff --git a/button/unban.js → button/deprecatedUnban.js b/button/unban.js → button/deprecatedUnban.js
@@ -1,11 +1,15 @@
 const { MessageActionRow, MessageButton } = require('discord.js');
+const { deprecate } = require('util');
 const db = require("../utils/db/dbLibrary.js");
 
 module.exports = {
     name: 'unban',
     description: "Méthode Enregistrer qu'un utilisateur a bien été débanni",
     execute: function (interaction) {
-
+        /**
+         * 
+         * @deprecated
+         */
         let ub = interaction.customId.split(" ");
 
 

diff --git a/button/mp_loop_close.js → button/mpLoopClose.js b/button/mp_loop_close.js → button/mpLoopClose.js
diff --git a/button/mp_loop_continue.js → button/mpLoopContinue.js b/button/mp_loop_continue.js → button/mpLoopContinue.js
diff --git a/button/avertissement.js → button/mpResponseAvertissement.js b/button/avertissement.js → button/mpResponseAvertissement.js
diff --git a/button/perm.js → button/mpResponsePerm.js b/button/perm.js → button/mpResponsePerm.js
diff --git a/commands/ban.js b/commands/ban.js
@@ -1,8 +1,8 @@
 const db = require("../utils/db/dbLibrary.js");
 const dp = require(`../bot_modules/deploy.js`);
 
-const { mp_sanction_buttons } = require("../utils/buttons/mp_sanction_buttons");
-const { mp_loop_buttons } = require("../utils/buttons/mp_loop_buttons");
+const { mpSanction } = require("../utils/buttons/mpSanction");
+const { mpLoop } = require("../utils/buttons/mpLoop");
 const faceit = require("../bot_modules/faceit.js");
 
 const Message = require("../utils/embeds/MessagesLibrary");
@@ -93,7 +93,7 @@ module.exports = {
       msg.channel
         .send({
           embeds: [Message.requestBanDuration(pseudo)],
-          components: [mp_sanction_buttons()],
+          components: [mpSanction()],
         })
         .then(async (rmsg) => {
           listenDay(i, liengame, rmsg, pseudo);
@@ -154,7 +154,7 @@ module.exports = {
       msg.channel
         .send({
           embeds: [Message.requestOtherBans(array.length, array)],
-          components: [mp_loop_buttons()],
+          components: [mpLoop()],
         })
         .then(async (rmsg) => {
           rmsg.channel

diff --git a/utils/buttons/mp_loop_buttons.js → utils/buttons/mpLoop.js b/utils/buttons/mp_loop_buttons.js → utils/buttons/mpLoop.js
@@ -14,11 +14,11 @@ const button_close = () => {
     .setStyle("DANGER");
 };
 
-const mp_loop_buttons = () => {
+const mpLoop = () => {
   return new MessageActionRow()
     .addComponents(button_continue())
     .addComponents(button_close());
 };
 module.exports = {
-  mp_loop_buttons,
+  mpLoop,
 };
diff --git a/utils/buttons/mp_sanction_buttons.js → utils/buttons/mpSanction.js b/utils/buttons/mp_sanction_buttons.js → utils/buttons/mpSanction.js
@@ -16,11 +16,11 @@ const button_perm = () => {
     .setEmoji("🚨");
 };
 
-const mp_sanction_buttons = () => {
+const mpSanction = () => {
   return new MessageActionRow()
     .addComponents(button_avertissement())
     .addComponents(button_perm());
 };
 module.exports = {
-  mp_sanction_buttons,
+  mpSanction,
 };
diff --git a/utils/embeds/MessagesLibrary.js b/utils/embeds/MessagesLibrary.js
@@ -27,9 +27,9 @@ class Message {
         return new MessageFactory(content);
 
         function textBuilder(ban) {
-            if (ban[1] == 99999) return "ban permanent";
-            if (ban[1] == 0) return "averti";
-            return `banni pendant ${ban[1]} jours`;
+            if (ban == 99999) return "ban permanent";
+            if (ban == 0) return "averti";
+            return `banni pendant ${ban} jours`;
         }
     }