feat(*): add cooldowns && owners && fix a small bug

package.json

@@ -48,6 +48,7 @@
   },
   "dependencies": {
     "fs-extra": "^9.0.1",
-    "klaw": "^3.0.0"
+    "klaw": "^3.0.0",
+    "moment": "^2.27.0"
   }
 }

src/commands/Ping.ts

@@ -6,7 +6,7 @@ import { Message } from 'discord.js';
 /** @ignore */
 export default class extends Command {
     constructor(client: MoonlightClient, pool: BasePool<string, Command>) {
-        super(client, pool);
+        super(client, pool, { cooldown: 5 });
     }
 
     public async run(message: Message) {

src/events/Message.ts

@@ -3,6 +3,7 @@ import { MoonlightClient } from '../lib/Client';
 import { Message } from 'discord.js';
 import { BasePool } from '../lib/structures/Pools/Base/BasePool';
 import { Command } from '../lib/structures/Command';
+import moment from 'moment';
 
 export default class extends Event {
     constructor(client: MoonlightClient, pool: BasePool<string, Event>) {
@@ -33,9 +34,36 @@ export default class extends Event {
         const command = args.shift()?.toLowerCase();
         if (!command) return;
 
-        const cmd: Command | null = this.client.commands.get(command) || this.client.commands.get((this.client.aliases.get(command) as string)) || null;
+        const cmd: Command | null = this.client.commands.get(command.toLowerCase()) || this.client.commands.get((this.client.aliases.get(command.toLowerCase()) as string)) || null;
         if (!cmd) return;
 
+        if (!this.client.owners.some(owner => owner === message.author.id) && this.client.cooldowns.has(cmd)) {
+
+            // Shout-out to this amazing Stack Overflow answer for this solution https://stackoverflow.com/a/53829705
+            const cooldownEnd = moment(this.client.cooldowns.get(cmd));
+            const now = moment();
+            moment.relativeTimeThreshold('ss', 60);
+            moment.updateLocale('en', {
+                relativeTime: {
+                    s: function (number) {
+                        return number + ' seconds';
+                    }
+                }
+            });
+
+            const duration = moment.duration(cooldownEnd.diff(now)).humanize();
+
+            return message.channel.send(`You have already used this command recently. Please try again ${duration}.`);
+        };
+
+        const cooldownEnd = moment(new Date()).add(cmd.cooldown, 'seconds').toDate();
+
+        this.client.cooldowns.set(cmd, cooldownEnd);
+
+        setTimeout(() => {
+            this.client.cooldowns.delete(cmd);
+        }, cmd.cooldown * 1000);
+
         if (cmd.disabled) return message.channel.send(`This command was globally disabled by the bot owner.`);
 
         if (!cmd.canRunInDM && message.channel.type === 'dm') return;

src/events/OnceReady.ts

@@ -1,6 +1,7 @@
 import { Event } from '../lib/structures/Event';
 import { BasePool } from '../lib/structures/Pools/Base/BasePool';
 import { MoonlightClient } from '../lib/Client';
+import { Team } from 'discord.js';
 
 export default class extends Event {
     constructor(client: MoonlightClient, pool: BasePool<string, Event>) {
@@ -11,11 +12,22 @@ export default class extends Event {
         })
     }
 
-    public run() {
+    public async run() {
         if (this.client.options.readyMessage && typeof this.client.options.readyMessage == 'function') {
             console.log(this.client.options.readyMessage(this.client))
         }
 
+        const applicationDetails = await this.client.fetchApplication();
+
+        if ((applicationDetails.owner as Team).members) {
+            this.client.owners.push(...(applicationDetails.owner as Team).members.map(member => member.user.id));
+        } else {
+            this.client.owners.push(applicationDetails.owner!.id);
+        };
+
+        // This will remove the duplicates
+        this.client.owners = [...new Set(this.client.owners)];
+
         this.client.prefixes.push(`${this.client.user!.username}, `, `<@!${this.client.user!.id}>`);
 
         this.client.pools.forEach(pool => pool.init());

src/lib/Client.ts

@@ -46,6 +46,11 @@ export class MoonlightClient extends Client {
     /** The monitor pool that stores all monitors */
     public readonly monitors: MonitorPool<string, Monitor> = new MonitorPool(this);
 
+    /** The Map that stores command cooldowns */
+    public cooldowns: Map<Command, Date> = new Map();
+
+    public owners: string[] = new Array();
+
     // Additional options
     /** An array containing all the prefixes */
     public readonly prefixes: string[] = new Array();
@@ -63,6 +68,8 @@ export class MoonlightClient extends Client {
         if (options?.displayErrors || !options?.displayErrors) {
             this.on('error', error => console.error(`[Error] ${error}`));
         }
+
+        if (options?.owners) this.owners.push(...options.owners);
     }
 
 
@@ -110,6 +117,8 @@ export interface MoonlightClientOptions extends ClientOptions {
     prefix?: string | string[];
     /** Whether or not to display error messages send as the error event */
     displayErrors?: boolean;
+    /** An array that contains the ID's of the owners */
+    owners?: string[];
     /** 
      * Set the ready message to display when the bot is ready -> should return a string
      * @example readyMessage: (client) => `Logged in and serving in ${client.guilds.size}!` 

src/lib/structures/Command.ts

@@ -14,6 +14,8 @@ export class Command extends BasePiece<Command> {
     public readonly nsfw: boolean;
     /** Whether or not this command can be called by a user when DM-ing the bot */
     public readonly canRunInDM: boolean;
+    /** The amount of time in seconds of the command's cooldown */
+    public readonly cooldown: number;
 
     public run(_message: Message, ..._arg: any[]): void {
         throw new Error(`Run function not defined in ${__filename}`);
@@ -24,7 +26,7 @@ export class Command extends BasePiece<Command> {
         this.aliases = options?.aliases ?? new Array();
         this.nsfw = options?.nsfw ?? false;
         this.canRunInDM = options?.canRunInDM ?? true;
-
+        this.cooldown = options?.cooldown ?? 0;
     }
 }
 
@@ -35,4 +37,6 @@ interface CommandOptions extends BasePieceOptions {
     nsfw?: boolean;
     /** Whether or not this command can be called by a user when DM-ing the bot */
     canRunInDM?: boolean;
+    /** The amount of time in seconds of a command's cooldown */
+    cooldown: number;
 }

src/lib/structures/Pools/Base/BasePool.ts

@@ -69,7 +69,7 @@ export class BasePool<K, V> extends Map<K, V> {
             if ((init instanceof (this.type as Function)) == false) throw `The file at ${filePath} doesn't appear to be an instance of ${(this.type as Function).name}`;
 
             // If the user provided a name in the options then use that, otherwise use the name of the file
-            const name = init.name?.toLowerCase() || path.parse(filePath).name;
+            const name = init.name?.toLowerCase() || path.parse(filePath).name.toLowerCase();
 
 
             // If the class is an instance of Command and there are aliases present then set them