Merge VylBot-Core

src/client/client.ts

@@ -0,0 +1,32 @@
+import { Client } from "discord.js";
+import * as dotenv from "dotenv";
+
+import { Events } from "./events";
+import { Util } from "./util";
+
+export class CoreClient extends Client {
+    private _events: Events;
+    private _util: Util;
+
+    constructor() {
+        super();
+        dotenv.config();
+
+        this._events = new Events();
+        this._util = new Util();
+    }
+
+    public start() {
+        if (!process.env.BOT_TOKEN) throw "BOT_TOKEN is not defined in .env";
+        if (!process.env.BOT_PREFIX) throw "BOT_PREFIX is not defined in .env";
+        if (!process.env.FOLDERS_COMMANDS) throw "FOLDERS_COMMANDS is not defined in .env";
+        if (!process.env.FOLDERS_EVENTS) throw "FOLDERS_EVENTS is not defined in .env";
+
+        super.on("message", this._events.onMessage);
+        super.on("ready", this._events.onReady);
+
+        super.login(process.env.BOT_TOKEN);
+
+        this._util.loadEvents(this);
+    }
+}

src/client/events.ts

@@ -0,0 +1,75 @@
+import { Message } from "discord.js";
+import { IBaseResponse } from "../contracts/IBaseResponse";
+import { Util } from "./util";
+
+export interface IEventResponse extends IBaseResponse {
+    context?: {
+        prefix: string;
+        name: string;
+        args: string[];
+        message: Message;
+    }
+}
+
+export class Events {
+    private _util: Util;
+
+    constructor() {
+        this._util = new Util();
+    }
+
+    // Emit when a message is sent
+    // Used to check for commands
+    public onMessage(message: Message): IEventResponse {
+        if (!message.guild) return {
+            valid: false,
+            message: "Message was not sent in a guild, ignoring.",
+        };
+
+        if (message.author.bot) return {
+            valid: false,
+            message: "Message was sent by a bot, ignoring.",
+        };
+
+        const prefix = process.env.BOT_PREFIX as string;
+
+        if (message.content.substring(0, prefix.length).toLowerCase() == prefix.toLowerCase()) {
+            const args = message.content.substring(prefix.length).split(" ");
+            const name = args.shift();
+
+            if (!name) return {
+                valid: false,
+                message: "Command name was not found",
+            };
+
+            const res = this._util.loadCommand(name, args, message);
+
+            if (!res.valid) {
+                return {
+                    valid: false,
+                    message: res.message,
+                };
+            }
+
+            return {
+                valid: true,
+                context: {
+                    prefix: prefix,
+                    name: name,
+                    args: args,
+                    message: message,
+                },
+            };
+        }
+
+        return {
+            valid: false,
+            message: "Message was not a command, ignoring.",
+        }
+    }
+
+    // Emit when bot is logged in and ready to use
+    public onReady() {
+        console.log("Ready");
+    }
+}

src/client/util.ts

@@ -0,0 +1,132 @@
+// Required Components
+import { Client, Message } from "discord.js";
+import { readdirSync, existsSync } from "fs";
+import { IBaseResponse } from "../contracts/IBaseResponse";
+import { Command } from "../type/command";
+import { Event } from "../type/event";
+import { ICommandContext } from "../contracts/ICommandContext";
+
+export interface IUtilResponse extends IBaseResponse {
+    context?: {
+        name: string;
+        args: string[];
+        message: Message;
+    }
+}
+
+// Util Class
+export class Util {
+
+    public loadCommand(name: string, args: string[], message: Message): IUtilResponse {
+        if (!message.member) return {
+            valid: false,
+            message: "Member is not part of message",
+        };
+
+        const disabledCommands = process.env.COMMANDS_DISABLED?.split(',');
+
+        if (disabledCommands?.find(x => x == name)) {
+            message.reply(process.env.COMMANDS_DISABLED_MESSAGE || "This command is disabled.");
+
+            return {
+                valid: false,
+                message: "Command is disabled",
+            };
+        }
+
+        const folder = process.env.FOLDERS_COMMANDS;
+
+        if (existsSync(`${process.cwd()}/${folder}/`)) {
+            if (existsSync(`${process.cwd()}/${folder}/${name}.ts`)) {
+                const commandFile = require(`${process.cwd()}/${folder}/${name}.ts`).default;
+                const command = new commandFile() as Command;
+
+                const requiredRoles = command._roles;
+
+                if (!command._category) command._category = "none";
+    
+                for (const i in requiredRoles) {
+                    if (!message.member.roles.cache.find(role => role.name == requiredRoles[i])) {
+                        message.reply(`You require the \`${requiredRoles[i]}\` role to run this command`);
+
+                        return {
+                            valid: false,
+                            message: `You require the \`${requiredRoles[i]}\` role to run this command`,
+                        };
+                    }
+                }
+				
+				const context: ICommandContext = {
+					name: name,
+					args: args,
+					message: message,
+				}
+    
+                // Run the command and pass the command context with it
+                command.execute(context);
+
+                return {
+                    valid: true,
+                    context: {
+                        name: name,
+                        args: args,
+                        message: message,
+                    }
+                }
+            } else {
+                return {
+                    valid: false,
+                    message: "File does not exist",
+                }
+            }
+        } else {
+            return {
+                valid: false,
+                message: "Command folder does not exist",
+            }
+        }
+    }
+
+    // Load the events
+    loadEvents(client: Client): IUtilResponse {
+        const folder = process.env.FOLDERS_EVENTS;
+		
+        if (existsSync(`${process.cwd()}/${folder}/`)) {
+            const eventFiles = readdirSync(`${process.cwd()}/${folder}/`);
+			
+            for (let i = 0; i < eventFiles.length; i++) {
+                if (eventFiles[i].includes('.ts')) {
+					const eventName = eventFiles[i].split('.')[0];
+					
+                    const file = require(`${process.cwd()}/${folder}/${eventName}.ts`);
+					
+                    const event = new file[eventName]() as Event;
+					
+					// Load events
+					client.on('channelCreate', event.channelCreate);
+					client.on('channelDelete', event.channelDelete);
+					client.on('channelUpdate', event.channelUpdate);
+					client.on('guildBanAdd', event.guildBanAdd);
+					client.on('guildBanRemove', event.guildBanRemove);
+					client.on('guildCreate', event.guildCreate);
+					client.on('guildMemberAdd', event.guildMemberAdd);
+					client.on('guildMemberRemove', event.guildMemberRemove);
+					client.on('guildMemberUpdate', event.guildMemberUpdate);
+					client.on('message', event.message);
+					client.on('messageDelete', event.messageDelete);
+					client.on('messageUpdate', event.messageUpdate);
+					client.on('ready', event.ready);
+                }
+            }
+
+            return {
+                valid: true,
+            }
+        } else {
+            return {
+                valid: false,
+                message: "Event folder does not exist",
+            }
+        }
+    }
+}

src/commands/about.ts

@@ -1,5 +1,6 @@
-import { Command, ICommandContext } from "vylbot-core";
-import PublicEmbed from "../helpers/PublicEmbed";
+import { ICommandContext } from "../contracts/ICommandContext";
+import PublicEmbed from "../helpers/embeds/PublicEmbed";
+import { Command } from "../type/command";
 
 export default class About extends Command {
     constructor() {
@@ -10,7 +11,6 @@ export default class About extends Command {
     public override execute(context: ICommandContext) {
         const embed = new PublicEmbed(context, "About", "")
             .addField("Version", process.env.BOT_VER)
-            .addField("VylBot Core", process.env.CORE_VER)
             .addField("Author", process.env.BOT_AUTHOR)
             .addField("Date", process.env.BOT_DATE);
         

src/commands/ban.ts

@@ -1,8 +1,9 @@
-import { Command, ICommandContext } from "vylbot-core";
-import ErrorEmbed from "../helpers/ErrorEmbed";
+import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
 import ErrorMessages from "../constants/ErrorMessages";
-import LogEmbed from "../helpers/LogEmbed";
-import PublicEmbed from "../helpers/PublicEmbed";
+import LogEmbed from "../helpers/embeds/LogEmbed";
+import PublicEmbed from "../helpers/embeds/PublicEmbed";
+import { Command } from "../type/command";
+import { ICommandContext } from "../contracts/ICommandContext";
 
 export default class Bane extends Command {
     constructor() {

src/commands/clear.ts

@@ -1,7 +1,8 @@
-import { Command, ICommandContext } from "vylbot-core";
-import ErrorEmbed from "../helpers/ErrorEmbed";
+import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
 import { TextChannel } from "discord.js";
-import PublicEmbed from "../helpers/PublicEmbed";
+import PublicEmbed from "../helpers/embeds/PublicEmbed";
+import { Command } from "../type/command";
+import { ICommandContext } from "../contracts/ICommandContext";
 
 export default class Clear extends Command {
     constructor() {

src/commands/eval.ts

@@ -1,6 +1,7 @@
-import { Command, ICommandContext } from "vylbot-core";
-import ErrorEmbed from "../helpers/ErrorEmbed";
-import PublicEmbed from "../helpers/PublicEmbed";
+import { ICommandContext } from "../contracts/ICommandContext";
+import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
+import PublicEmbed from "../helpers/embeds/PublicEmbed";
+import { Command } from "../type/command";
 
 export default class Evaluate extends Command {
     constructor() {

src/commands/help.ts

@@ -1,8 +1,9 @@
 import { existsSync, readdirSync } from "fs";
-import { Command, ICommandContext } from "vylbot-core";
-import ErrorEmbed from "../helpers/ErrorEmbed";
-import PublicEmbed from "../helpers/PublicEmbed";
+import { ICommandContext } from "../contracts/ICommandContext";
+import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
+import PublicEmbed from "../helpers/embeds/PublicEmbed";
 import StringTools from "../helpers/StringTools";
+import { Command } from "../type/command";
 
 interface ICommandData {
     Exists: boolean;

src/commands/kick.ts

@@ -1,8 +1,9 @@
-import { Command, ICommandContext } from "vylbot-core";
 import ErrorMessages from "../constants/ErrorMessages";
-import ErrorEmbed from "../helpers/ErrorEmbed";
-import LogEmbed from "../helpers/LogEmbed";
-import PublicEmbed from "../helpers/PublicEmbed";
+import { ICommandContext } from "../contracts/ICommandContext";
+import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
+import LogEmbed from "../helpers/embeds/LogEmbed";
+import PublicEmbed from "../helpers/embeds/PublicEmbed";
+import { Command } from "../type/command";
 
 export default class Kick extends Command {
     constructor() {

src/commands/mute.ts

@@ -1,8 +1,9 @@
-import { Command, ICommandContext } from "vylbot-core";
 import ErrorMessages from "../constants/ErrorMessages";
-import ErrorEmbed from "../helpers/ErrorEmbed";
-import LogEmbed from "../helpers/LogEmbed";
-import PublicEmbed from "../helpers/PublicEmbed";
+import { ICommandContext } from "../contracts/ICommandContext";
+import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
+import LogEmbed from "../helpers/embeds/LogEmbed";
+import PublicEmbed from "../helpers/embeds/PublicEmbed";
+import { Command } from "../type/command";
 
 export default class Mute extends Command {
     constructor() {

src/commands/poll.ts

@@ -1,6 +1,7 @@
-import { Command, ICommandContext } from "vylbot-core";
-import ErrorEmbed from "../helpers/ErrorEmbed";
-import PublicEmbed from "../helpers/PublicEmbed";
+import { ICommandContext } from "../contracts/ICommandContext";
+import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
+import PublicEmbed from "../helpers/embeds/PublicEmbed";
+import { Command } from "../type/command";
 
 export default class Poll extends Command {
     constructor() {

src/commands/role.ts

@@ -1,7 +1,8 @@
-import { Command, ICommandContext } from "vylbot-core";
-import ErrorEmbed from "../helpers/ErrorEmbed";
-import PublicEmbed from "../helpers/PublicEmbed";
+import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
+import PublicEmbed from "../helpers/embeds/PublicEmbed";
 import { Role as DiscordRole } from "discord.js";
+import { Command } from "../type/command";
+import { ICommandContext } from "../contracts/ICommandContext";
 
 export default class Role extends Command {
     constructor() {

src/commands/rules.ts

@@ -1,7 +1,8 @@
 import { existsSync, readFileSync } from "fs";
-import { Command, ICommandContext } from "vylbot-core";
-import ErrorEmbed from "../helpers/ErrorEmbed";
-import PublicEmbed from "../helpers/PublicEmbed";
+import { ICommandContext } from "../contracts/ICommandContext";
+import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
+import PublicEmbed from "../helpers/embeds/PublicEmbed";
+import { Command } from "../type/command";
 
 interface IRules {
     title?: string;

src/commands/unmute.ts

@@ -1,8 +1,9 @@
-import { Command, ICommandContext } from "vylbot-core";
 import ErrorMessages from "../constants/ErrorMessages";
-import ErrorEmbed from "../helpers/ErrorEmbed";
-import LogEmbed from "../helpers/LogEmbed";
-import PublicEmbed from "../helpers/PublicEmbed";
+import { ICommandContext } from "../contracts/ICommandContext";
+import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
+import LogEmbed from "../helpers/embeds/LogEmbed";
+import PublicEmbed from "../helpers/embeds/PublicEmbed";
+import { Command } from "../type/command";
 
 export default class Unmute extends Command {
     constructor() {

src/commands/warn.ts

@@ -1,7 +1,8 @@
-import { Command, ICommandContext } from "vylbot-core";
-import ErrorEmbed from "../helpers/ErrorEmbed";
-import LogEmbed from "../helpers/LogEmbed";
-import PublicEmbed from "../helpers/PublicEmbed";
+import { ICommandContext } from "../contracts/ICommandContext";
+import ErrorEmbed from "../helpers/embeds/ErrorEmbed";
+import LogEmbed from "../helpers/embeds/LogEmbed";
+import PublicEmbed from "../helpers/embeds/PublicEmbed";
+import { Command } from "../type/command";
 
 export default class Warn extends Command {
     constructor() {

src/contracts/IBaseResponse.ts

@@ -0,0 +1,4 @@
+export interface IBaseResponse {
+    valid: boolean;
+    message?: string;
+}

src/contracts/ICommandContext.ts

@@ -0,0 +1,7 @@
+import { Message } from "discord.js";
+
+export interface ICommandContext {
+	name: string;
+	args: string[];
+	message: Message;
+}

src/events/MemberEvents.ts

@@ -1,6 +1,6 @@
-import { Event } from "vylbot-core";
+import { Event } from "../type/event";
 import { GuildMember } from "discord.js";
-import EventEmbed from "../helpers/EventEmbed";
+import EventEmbed from "../helpers/embeds/EventEmbed";
 import GuildMemberUpdate from "./MemberEvents/GuildMemberUpdate";
 
 export default class MemberEvents extends Event {

src/events/MemberEvents/GuildMemberUpdate.ts

@@ -1,5 +1,5 @@
 import { GuildMember } from "discord.js";
-import EventEmbed from "../../helpers/EventEmbed";
+import EventEmbed from "../../helpers/embeds/EventEmbed";
 
 export default class GuildMemberUpdate {
     private _oldMember: GuildMember;

src/events/MessageEvents.ts

@@ -1,6 +1,6 @@
-import { Event } from "vylbot-core";
+import { Event } from "../type/event";
 import { Message } from "discord.js";
-import EventEmbed from "../helpers/EventEmbed";
+import EventEmbed from "../helpers/embeds/EventEmbed";
 
 export default class MessageEvents extends Event {
     constructor() {

src/helpers/embeds/ErrorEmbed.ts

@@ -1,5 +1,5 @@
 import { MessageEmbed } from "discord.js";
-import { ICommandContext } from "vylbot-core";
+import { ICommandContext } from "../../contracts/ICommandContext";
 
 export default class ErrorEmbed extends MessageEmbed {
     private _context: ICommandContext;

src/helpers/embeds/EventEmbed.ts

@@ -1,6 +1,4 @@
 import { MessageEmbed, TextChannel, User, Guild } from "discord.js";
-import ErrorMessages from "../constants/ErrorMessages";
-import ErrorEmbed from "./ErrorEmbed";
 
 export default class EventEmbed extends MessageEmbed {
     private _guild: Guild;

src/helpers/embeds/LogEmbed.ts

@@ -1,6 +1,6 @@
 import { MessageEmbed, TextChannel, User } from "discord.js";
-import { ICommandContext } from "vylbot-core";
-import ErrorMessages from "../constants/ErrorMessages";
+import ErrorMessages from "../../constants/ErrorMessages";
+import { ICommandContext } from "../../contracts/ICommandContext";
 import ErrorEmbed from "./ErrorEmbed";
 
 export default class LogEmbed extends MessageEmbed {

src/helpers/embeds/PublicEmbed.ts

@@ -1,5 +1,5 @@
 import { MessageEmbed } from "discord.js";
-import { ICommandContext } from "vylbot-core";
+import { ICommandContext } from "../../contracts/ICommandContext";
 
 export default class PublicEmbed extends MessageEmbed {
     private _context: ICommandContext;

src/type/command.ts

@@ -0,0 +1,16 @@
+import { Message } from "discord.js";
+import { ICommandContext } from "../contracts/ICommandContext";
+
+export class Command {
+    public _roles: string[];
+
+    public _category?: string;
+
+    constructor() {
+        this._roles = [];
+    }
+
+    public execute(context: ICommandContext) {
+
+    }
+}

src/type/event.ts

@@ -0,0 +1,55 @@
+import { Channel, Guild, User, GuildMember, Message, PartialDMChannel, PartialGuildMember, PartialMessage } from "discord.js";
+
+export class Event {	
+	public channelCreate(channel: Channel) {
+		
+	}
+	
+	public channelDelete(channel: Channel | PartialDMChannel) {
+		
+	}
+	
+	public channelUpdate(oldChannel: Channel, newChannel: Channel) {
+		
+	}
+	
+	public guildBanAdd(guild: Guild, user: User) {
+		
+	}
+	
+	public guildBanRemove(guild: Guild, user: User) {
+		
+	}
+	
+	public guildCreate(guild: Guild) {
+		
+	}
+	
+	public guildMemberAdd(member: GuildMember) {
+		
+	}
+	
+	public guildMemberRemove(member: GuildMember | PartialGuildMember) {
+		
+	}
+	
+	public guildMemberUpdate(oldMember: GuildMember | PartialGuildMember, newMember: GuildMember) {
+		
+	}
+	
+	public message(message: Message) {
+		
+	}
+	
+	public messageDelete(message: Message | PartialMessage) {
+		
+	}
+	
+	public messageUpdate(oldMessage: Message | PartialMessage, newMessage: Message | PartialMessage) {
+		
+	}
+
+	public ready() {
+
+	}
+}

src/vylbot.ts

@@ -1,4 +1,4 @@
-import { CoreClient } from "vylbot-core";
+import { CoreClient } from "./client/client";
 import * as dotenv from "dotenv";
 
 dotenv.config();