(tasks): Linting.

src/index.ts

@@ -1,13 +1,13 @@
 import { Client as DiscordClient, GatewayIntentBits, MessageFlags, Partials } from 'discord.js';
 import { config } from './config';
 import events from './events';
-import { ScheduledTasks, Scheduler } from './scheduler';
 import { Database } from './shared/Database';
 import { openRedisClient } from './shared/RedisClient';
 import { Handler } from './types';
 import { initIfNecessary, loadHandlersFrom, refreshCommands } from './utils';
 import { initializeWebserver } from './webserver';
 import { Encrypter } from './shared/Encrypter';
+import tasks from './tasks';
 
 
 let ready = false;
@@ -31,8 +31,6 @@ const client = new DiscordClient({
   }
 });
 
-const scheduler: Scheduler = new Scheduler(client);
-
 const commands: Handler[] = [];
 const contextMenus: Handler[] = [];
 const buttons: Handler[] = [];
@@ -141,7 +139,15 @@ client.on('clientReady', async () => {
 
   await initializeWebserver(client);
 
-  ScheduledTasks.forEach(task => scheduler.add(task));
+  tasks.forEach((task) => {
+    const handler = () => {
+      Promise.resolve(task.handle(client))
+        .catch(e => console.error(`Error in '${task.id}' task:`, e));
+    };
+
+    if (task.firstRun) handler();
+    setInterval(handler, task.interval);
+  });
 
   events.forEach(event =>
     client.on(event.event, (...args) =>

src/scheduler/index.ts

@@ -1,23 +0,0 @@
-import { Client } from 'discord.js';
-import { Task } from '../types';
-import ScheduledTasks from './tasks';
-
-class Scheduler {
-  private tasks = new Map<Task, NodeJS.Timeout>();
-  private context: Client;
-
-  constructor(context: Client) {
-    this.context = context;
-  }
-
-  add(task: Task) {
-    const interval = setInterval(() => task.handle(this.context), task.interval);
-    if (task.firstRun) interval._onTimeout();
-
-    this.tasks.set(task, interval);
-  }
-}
-
-export {
-  ScheduledTasks, Scheduler
-};

src/scheduler/tasks/check-expired-bans-task.ts

@@ -1,14 +0,0 @@
-import { Client } from 'discord.js';
-import { Task } from '../../types';
-import { checkExpiredBans } from '../../utils';
-
-class CheckExpiredBansTask implements Task {
-  interval: number = 300000;
-  firstRun: boolean = true;
-
-  async handle(context: Client): Promise<void> {
-    await checkExpiredBans(context);
-  }
-}
-
-export default new CheckExpiredBansTask();

src/scheduler/tasks/close-stale-tickets-task.ts

@@ -1,14 +0,0 @@
-import { Client } from 'discord.js';
-import { Task } from '../../types';
-import { closeOldTickets } from '../../utils';
-
-class CloseStaleTicketsTask implements Task {
-  interval: number = 3.6e6;
-  firstRun: boolean = true;
-
-  async handle(context: Client): Promise<void> {
-    await closeOldTickets(context);
-  }
-}
-
-export default new CloseStaleTicketsTask();

src/scheduler/tasks/index.ts

@@ -1,9 +0,0 @@
-import checkExpiredBansTask from './check-expired-bans-task';
-import closeStaleTicketsTask from './close-stale-tickets-task';
-import pruneOldMessagesTask from './prune-old-messages-task';
-
-export default [
-  closeStaleTicketsTask,
-  checkExpiredBansTask,
-  pruneOldMessagesTask
-];

src/scheduler/tasks/prune-old-messages-task.ts

@@ -1,13 +0,0 @@
-import { Task } from '../../types';
-import { Database } from '../../shared/Database';
-
-class PruneOldMessagesTask implements Task {
-  interval: number = 3.6e6;
-  firstRun: boolean = true;
-
-  async handle(): Promise<void> {
-    await Database.pruneOldMessages();
-  }
-}
-
-export default new PruneOldMessagesTask();

src/tasks/checkExpiredBansTask.ts

@@ -0,0 +1,15 @@
+import { Client } from 'discord.js';
+import { Task } from '../types';
+import { checkExpiredBans } from '../utils';
+
+const task: Task = {
+  id: 'checkExpiredBans',
+  interval: 300000,
+  firstRun: true,
+
+  handle: async (context: Client) => {
+    await checkExpiredBans(context);
+  },
+};
+
+export default task;

src/tasks/closeStaleTicketsTask.ts

@@ -0,0 +1,15 @@
+import { Client } from 'discord.js';
+import { Task } from '../types';
+import { closeOldTickets } from '../utils';
+
+const task: Task = {
+  id: 'closeStaleTickets',
+  interval: 3.6e6,
+  firstRun: true,
+
+  handle: async (context: Client) => {
+    await closeOldTickets(context);
+  },
+};
+
+export default task;

src/tasks/index.ts

@@ -0,0 +1,9 @@
+import checkExpiredBansTask from './checkExpiredBansTask';
+import closeStaleTicketsTask from './closeStaleTicketsTask';
+import pruneOldMessagesTask from './pruneOldMessagesTask';
+
+export default [
+  closeStaleTicketsTask,
+  checkExpiredBansTask,
+  pruneOldMessagesTask
+];

src/tasks/pruneOldMessagesTask.ts

@@ -0,0 +1,15 @@
+import { Client } from 'discord.js';
+import { Database } from '../shared/Database';
+import { Task } from '../types';
+
+const task: Task = {
+  id: 'pruneOldMessages',
+  interval: 3.6e6,
+  firstRun: true,
+
+  handle: async (context: Client) => {
+    await Database.pruneOldMessages();
+  },
+};
+
+export default task;

src/types/index.d.ts

@@ -3,4 +3,4 @@ export * from './database-types.d';
 export * from './e621-types.d';
 export * from './handler.d';
 export * from './helper-types.d';
-export * from './scheduler.d';
+export * from './task.d';

src/types/task.d.ts

@@ -1,8 +1,9 @@
 import { Client } from 'discord.js';
 
 export interface Task {
+  id: string;
   interval: number;
   firstRun: boolean;
 
   handle(context: Client): Promise<void>;
-};
+}

src/utils/embed-utils.ts

@@ -1,7 +1,7 @@
 import { APIEmbed, Client } from 'discord.js';
 
-type EmbedSeverity =
+type EmbedSeverity
-  | 'info'
+  = | 'info'
   | 'warning'
   | 'error'
   | 'success'