From fe71589989e0f63553b5c48d25fd2f10be8d7940 Mon Sep 17 00:00:00 2001 From: Neko-Life Date: Wed, 28 Jul 2021 12:38:46 +0700 Subject: [PATCH] Improvement (?) --- cmds/moderation/src/createSchedule.js | 8 ++++---- resources/scheduler.js | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cmds/moderation/src/createSchedule.js b/cmds/moderation/src/createSchedule.js index 844044a..4ac8089 100644 --- a/cmds/moderation/src/createSchedule.js +++ b/cmds/moderation/src/createSchedule.js @@ -36,7 +36,7 @@ async function createSchedule(client, { guildID, userID, type, until }) { try { await jobManager.remove(NAME).catch(() => { }); - if ((until.valueOf() - CHK) < new Date(0, 0, 0, 24, 0, 0, 0)) { + if ((until.valueOf() - CHK) < new Date(24 * 60 * 60 * 1000)) { jobManager.add(SC); jobManager.start(NAME); } @@ -68,10 +68,10 @@ async function reset() { async function jobLoad() { const CHK = new Date().valueOf(); - const CHK2 = new Date(0, 0, 0, 24, 0, 0, 0).valueOf(); + const CHK2 = new Date(24 * 60 * 60 * 1000).valueOf(); jobs = (await col.find({}).toArray()).filter((v) => (v.date.valueOf() - CHK) < CHK2); - const rstjb = new Date(0, 0, 0, 23, 30, 0, 0).valueOf(); + const rstjb = new Date((23 * 60 * 60 * 1000) + (30 * 60 * 1000)).valueOf(); const rsttm = { name: "rsttm", path: join(__dirname, "./execSc.js"), @@ -89,7 +89,7 @@ function jobStart() { const CHK = new Date().valueOf(); jobManager.start(); jobs.forEach((v) => { - if (v.date.valueOf() < CHK) jobManager.run(v.name); + if (v.date?.valueOf() < CHK) jobManager.run(v.name); }); console.log("SCHEDULER STARTED"); return 1; diff --git a/resources/scheduler.js b/resources/scheduler.js index 59924c6..14d1f85 100644 --- a/resources/scheduler.js +++ b/resources/scheduler.js @@ -3,7 +3,6 @@ const Bree = require("bree"); const cabin = require("cabin"); const { Client } = require("discord.js"); -const { reset } = require("../cmds/moderation/src/createSchedule"); const { errLog } = require("./functions"); /** @@ -18,7 +17,7 @@ function scheduler(client, jobs = []) { jobs: jobs, workerMessageHandler: ({ message }) => { if (!message[0] || !message[1] || !message[2]) throw new Error("Value undefined!"); - if (message === "rsttm") return reset(); + if (message === "rsttm") return require("../cmds/moderation/src/createSchedule").reset(); return execPunishmentSchedule(client, message[0], message[1], message[2]); }, errorHandler: (e, m) => {