From d82661d347911e50f5e1559f0715d095497e73b5 Mon Sep 17 00:00:00 2001
From: Neko-Life <nekolife123579@gmail.com>
Date: Wed, 28 Jul 2021 13:05:57 +0700
Subject: [PATCH] Final improvement (?)

---
 cmds/moderation/src/createSchedule.js | 11 +++++++----
 resources/scheduler.js                |  5 +++--
 resources/structures.js               |  3 ---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cmds/moderation/src/createSchedule.js b/cmds/moderation/src/createSchedule.js
index 4ac8089..9bc2db6 100644
--- a/cmds/moderation/src/createSchedule.js
+++ b/cmds/moderation/src/createSchedule.js
@@ -58,7 +58,10 @@ async function init(client) {
 
 async function reset() {
     await jobManager.stop().catch(console.error);
-    await jobManager.remove().catch(console.error);
+    for (const job of jobs) {
+        await jobManager.remove(job.name).catch(console.error);
+        console.log("REMOVED " + job.name);
+    }
 
     await jobLoad();
     jobManager.add(jobs);
@@ -73,15 +76,15 @@ async function jobLoad() {
 
     const rstjb = new Date((23 * 60 * 60 * 1000) + (30 * 60 * 1000)).valueOf();
     const rsttm = {
-        name: "rsttm",
+        name: "REFRESH JOBS",
         path: join(__dirname, "./execSc.js"),
         worker: {
-            argv: ["rsttm"]
+            argv: ["REFRESH JOBS"]
         },
         timeout: rstjb
     };
     jobs.push(rsttm);
-    console.log(jobs.length + " JOBS LOADED");
+    console.log((jobs.length - 1) + " JOBS LOADED");
     return 1;
 }
 
diff --git a/resources/scheduler.js b/resources/scheduler.js
index 14d1f85..2ddd38a 100644
--- a/resources/scheduler.js
+++ b/resources/scheduler.js
@@ -16,8 +16,9 @@ function scheduler(client, jobs = []) {
         root: false,
         jobs: jobs,
         workerMessageHandler: ({ message }) => {
-            if (!message[0] || !message[1] || !message[2]) throw new Error("Value undefined!");
-            if (message === "rsttm") return require("../cmds/moderation/src/createSchedule").reset();
+            if (!message[0]) throw new Error("Value undefined!");
+            if (message[0] === "REFRESH JOBS") return require("../cmds/moderation/src/createSchedule").reset();
+            if (!message[1] || !message[2]) throw new Error("Name undefined!");
             return execPunishmentSchedule(client, message[0], message[1], message[2]);
         },
         errorHandler: (e, m) => {
diff --git a/resources/structures.js b/resources/structures.js
index 5d4f6a0..545b60c 100644
--- a/resources/structures.js
+++ b/resources/structures.js
@@ -410,14 +410,12 @@ Structures.extend("GuildMember", u => {
                 this.DB.muted.takenRoles = ROLES;
             }
             this.DB.muted.muteRole = this.guild.DB.settings.mute.role;
-            console.log(this.DB.muted.takenRoles);
 
             try {
                 if (ROLES?.length > 0) await this.roles.remove(ROLES, reason);
                 await this.roles.add(this.DB.muted.muteRole, reason);
                 if (!this.DB.muted.takenRoles) this.DB.muted.takenRoles = [];
                 await this.setDb("muted", this.DB.muted);
-                console.log(this.DB);
                 return true;
             } catch (e) {
                 if (this.DB.muted.takenRoles?.length > 0) await this.roles.add(this.DB.muted.takenRoles, reason).catch(() => { });
@@ -432,7 +430,6 @@ Structures.extend("GuildMember", u => {
         async unmute(reason) {
             if (!this.DB) await this.dbLoad();
             try {
-                console.log(this.DB);
                 if (this.DB.muted.takenRoles.length > 0) await this.roles.add(this.DB.muted.takenRoles, reason);
                 if (this.DB.muted.muteRole) await this.roles.remove(this.DB.muted.muteRole, reason);
                 console.log("clear takenRoles UM");