From a577fb35bf8d2ef5b2871d117811942d3dafcde6 Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Sun, 10 Apr 2022 00:31:20 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=20added=20back=20features?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/handlers/schedules.ts | 20 +++++++++++--------- src/index.ts | 8 ++++---- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 8687809..d9ff7d3 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "uuid": "^8.3.2" }, "devDependencies": { + "@types/node-schedule": "^1.3.2", "@types/uuid": "^8.3.4", "@typescript-eslint/eslint-plugin": "^5.15.0", "@typescript-eslint/parser": "^5.15.0", diff --git a/src/handlers/schedules.ts b/src/handlers/schedules.ts index be0ed30..7119d25 100644 --- a/src/handlers/schedules.ts +++ b/src/handlers/schedules.ts @@ -1,16 +1,18 @@ import schedule from 'node-schedule'; -import { shopRoles, users, guilds } from '../helpers/database/models'; +import users from '../helpers/database/models/userSchema'; +import shopRoles from '../helpers/database/models/shopRolesSchema'; +import guilds from '../helpers/database/models/guildSchema'; import logger from './logger'; - -export default async (client) => { +import { Client } from 'discord.js'; +export default async (client: Client) => { schedule.scheduleJob('*/30 * * * *', async () => { - shopRoles.find().then(async (shopRoles) => { - shopRoles.map(async (shopRole) => { + shopRoles.find().then(async (shopRoles: any) => { + shopRoles.map(async (shopRole: any) => { const payed = new Date(shopRole.lastPayed); - oneHourAfterPayed = payed.setHours(payed.getHours() + 1); + const oneHourAfterPayed = payed.setHours(payed.getHours() + 1); - if (new Date() > oneHourAfterPayed) { + if (new Date() > new Date(oneHourAfterPayed)) { // Get guild object const guild = await guilds.findOne({ guildId: shopRole.guildId, @@ -24,9 +26,9 @@ export default async (client) => { if (userDB.credits < pricePerHour) { const rGuild = await client.guilds.cache.get(`${shopRole.guildId}`); - const rMember = await rGuild.members.fetch(`${shopRole.userId}`); + const rMember = await rGuild?.members.fetch(`${shopRole.userId}`); - await rMember.roles + await rMember?.roles .remove(`${shopRole.roleId}`) .then(console.log) .catch(console.error); // Removes all roles diff --git a/src/index.ts b/src/index.ts index fdc9576..919d72a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,8 +4,8 @@ import { Client, Intents } from 'discord.js'; // discord.js import database from './helpers/database/index'; import events from './handlers/events'; import commands from './handlers/commands'; -// import { database } from './helpers'; // helpers -// import { events, commands, locale, schedules } from './handlers'; // handlers +import locale from './handlers/locale'; +import schedules from './handlers/schedules'; import config from '../config.json'; // config.json @@ -20,9 +20,9 @@ import config from '../config.json'; // config.json }); await database(); - // await locale(); + await locale(); await events(client); await commands(client); - // await schedules(client); + await schedules(client); await client.login(config.bot.token); })();