Feature/74 merge vylbot core (#80)

* Merge VylBot-Core

* Update commands to new system

* Fix issue where events would not load

src/Register.ts

@@ -0,0 +1,37 @@
+import { CoreClient } from "./client/client";
+import About from "./commands/about";
+import Ban from "./commands/ban";
+import Clear from "./commands/clear";
+import Evaluate from "./commands/eval";
+import Help from "./commands/help";
+import Kick from "./commands/kick";
+import Mute from "./commands/mute";
+import Poll from "./commands/poll";
+import Role from "./commands/role";
+import Rules from "./commands/rules";
+import Unmute from "./commands/unmute";
+import Warn from "./commands/warn";
+import MemberEvents from "./events/MemberEvents";
+import MessageEvents from "./events/MessageEvents";
+
+export default class Register {
+    public static RegisterCommands(client: CoreClient) {
+        client.RegisterCommand("about", new About());
+        client.RegisterCommand("ban", new Ban());
+        client.RegisterCommand("clear", new Clear());
+        client.RegisterCommand("eval", new Evaluate());
+        client.RegisterCommand("help", new Help());
+        client.RegisterCommand("kick", new Kick());
+        client.RegisterCommand("mute", new Mute());
+        client.RegisterCommand("poll", new Poll());
+        client.RegisterCommand("role", new Role());
+        client.RegisterCommand("rules", new Rules());
+        client.RegisterCommand("unmute", new Unmute());
+        client.RegisterCommand("warn", new Warn());
+    }
+
+    public static RegisterEvents(client: CoreClient) {
+        client.RegisterEvent(new MemberEvents());
+        client.RegisterEvent(new MessageEvents());
+    }
+}

src/client/client.ts

@@ -0,0 +1,59 @@
+import { Client } from "discord.js";
+import * as dotenv from "dotenv";
+import ICommandItem from "../contracts/ICommandItem";
+import IEventItem from "../contracts/IEventItem";
+import { Command } from "../type/command";
+import { Event } from "../type/event";
+
+import { Events } from "./events";
+import { Util } from "./util";
+
+export class CoreClient extends Client {
+    private _commandItems: ICommandItem[];
+    private _eventItems: IEventItem[];
+    
+    private _events: Events;
+    private _util: Util;
+
+    constructor() {
+        super();
+        dotenv.config();
+
+        this._commandItems = [];
+        this._eventItems = [];
+
+        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", (message) => this._events.onMessage(message, this._commandItems));
+        super.on("ready", this._events.onReady);
+
+        super.login(process.env.BOT_TOKEN);
+
+        this._util.loadEvents(this, this._eventItems);
+    }
+
+    public RegisterCommand(name: string, command: Command) {
+        const item: ICommandItem = {
+            Name: name,
+            Command: command,
+        };
+
+        this._commandItems.push(item);
+    }
+
+    public RegisterEvent(event: Event) {
+        const item: IEventItem = {
+            Event: event,
+        };
+
+        this._eventItems.push(item);
+    }
+}

src/client/events.ts

@@ -0,0 +1,76 @@
+import { Message } from "discord.js";
+import { IBaseResponse } from "../contracts/IBaseResponse";
+import ICommandItem from "../contracts/ICommandItem";
+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, commands: ICommandItem[]): 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, commands);
+
+            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,102 @@
+// 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";
+import ICommandItem from "../contracts/ICommandItem";
+import IEventItem from "../contracts/IEventItem";
+
+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, commands: ICommandItem[]): 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;
+
+        const item = commands.find(x => x.Name == name);
+
+        if (!item) {
+            message.reply('Command not found');
+
+            return {
+                valid: false,
+                message: "Command not found"
+            };
+        }
+
+        const requiredRoles = item.Command._roles;
+
+        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
+        };
+
+        item.Command.execute(context);
+
+        return {
+            valid: true,
+            context: context
+        }
+    }
+
+    // Load the events
+    loadEvents(client: Client, events: IEventItem[]): IUtilResponse {
+        const folder = process.env.FOLDERS_EVENTS;
+
+        events.forEach((e) => {
+            client.on('channelCreate', e.Event.channelCreate);
+            client.on('channelDelete', e.Event.channelDelete);
+            client.on('channelUpdate', e.Event.channelUpdate);
+            client.on('guildBanAdd', e.Event.guildBanAdd);
+            client.on('guildBanRemove', e.Event.guildBanRemove);
+            client.on('guildCreate', e.Event.guildCreate);
+            client.on('guildMemberAdd', e.Event.guildMemberAdd);
+            client.on('guildMemberRemove', e.Event.guildMemberRemove);
+            client.on('guildMemberUpdate', e.Event.guildMemberUpdate);
+            client.on('message', e.Event.message);
+            client.on('messageDelete', e.Event.messageDelete);
+            client.on('messageUpdate', e.Event.messageUpdate);
+            client.on('ready', e.Event.ready);
+        });
+
+        return {
+            valid: true
+        }
+    }
+}

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,10 +1,11 @@
-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 {
+export default class Ban extends Command {
     constructor() {
         super();
         

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/contracts/ICommandItem.ts

@@ -0,0 +1,6 @@
+import { Command } from "../type/command";
+
+export default interface ICommandItem {
+    Name: string,
+    Command: Command,
+}

src/contracts/IEventItem.ts

@@ -0,0 +1,6 @@
+
+import { Event } from "../type/event";
+
+export default interface IEventItem {
+    Event: Event,
+}

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,15 @@
+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,5 +1,6 @@
-import { CoreClient } from "vylbot-core";
+import { CoreClient } from "./client/client";
 import * as dotenv from "dotenv";
+import Register from "./Register";
 
 dotenv.config();
 
@@ -22,4 +23,8 @@ requiredConfigs.forEach(config => {
 });
 
 const client = new CoreClient();
+
+Register.RegisterCommands(client);
+Register.RegisterEvents(client);
+
 client.start();