zumito-framework 1.0.26 → 1.1.1

package/dist/ZumitoFramework.d.ts

@@ -18,6 +18,7 @@ export declare class ZumitoFramework {
     modules: Map<String, Module>;
     commands: Map<String, Command>;
     events: Map<String, FrameworkEvent>;
+    translations: Map<String, String>;
     routes: any;
     models: any;
     database: any;
@@ -41,7 +42,6 @@ export declare class ZumitoFramework {
     private registerModules;
     private registerModule;
     private initializeDiscordClient;
-    private commandHandler;
     static splitCommandLine(commandLine: any): any;
     memberHasPermission(member: GuildMember, channel: TextChannel, permission: bigint): Promise<boolean>;
 }

package/dist/ZumitoFramework.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZumitoFramework = void 0;
-const discord_js_1 = require("discord.js");
 const Module_1 = require("./types/Module");
-const express_1 = require("express");
 const ApiResponse_1 = require("./definitions/ApiResponse");
+const express = require("express");
 const fs = require('fs');
 const path = require('path');
 const { Collection, Client } = require('discord.js');
@@ -29,7 +28,8 @@ class ZumitoFramework {
     settings;
     modules;
     commands;
-    events = new Map();
+    events;
+    translations;
     routes;
     models;
     database;
@@ -52,6 +52,8 @@ class ZumitoFramework {
         this.settings = settings;
         this.modules = new Map();
         this.commands = new Map();
+        this.events = new Map();
+        this.translations = new Map();
         mongoose.connect(settings.mongoQueryString, { useNewUrlParser: true, useUnifiedTopology: true }).then(() => {
             console.log('[✅] DB connection successful');
         }).catch(err => {
@@ -62,10 +64,9 @@ class ZumitoFramework {
         this.startApiServer();
         this.registerModules();
         this.initializeDiscordClient();
-        this.commandHandler();
     }
     startApiServer() {
-        this.app = (0, express_1.express)();
+        this.app = express();
         let port = process.env.PORT || '80';
         this.app.set('port', port);
         var server = http.createServer(this.app);
@@ -76,8 +77,8 @@ class ZumitoFramework {
         server.on('listening', () => {
             console.log('[✅] API web server listening on port ' + port);
         });
-        this.app.use(express_1.express.json());
-        this.app.use(express_1.express.urlencoded({ extended: false }));
+        this.app.use(express.json());
+        this.app.use(express.urlencoded({ extended: false }));
         this.app.use(cookieParser());
         //this.app.use(express.static(path.join(__dirname, "public")));
         //To allow cross-origin requests
@@ -132,6 +133,8 @@ class ZumitoFramework {
         this.commands = new Map([...this.commands, ...moduleInstance.getCommands()]);
         // Register module events
         this.events = new Map([...this.events, ...moduleInstance.getEvents()]);
+        // Register translations
+        this.translations = new Map([...this.translations, ...moduleInstance.getTranslations()]);
         /*
 
         // Register module routes
@@ -148,104 +151,6 @@ class ZumitoFramework {
         });
         this.client.login(this.settings.discordClientOptions.token);
     }
-    commandHandler() {
-        this.client.on('messageCreate', async (message) => {
-            let channel = message.channel;
-            let prefix = this.settings.defaultPrefix;
-            const args = ZumitoFramework.splitCommandLine(message.content.slice(prefix.length));
-            const command = args.shift().toLowerCase();
-            let commandInstance;
-            if (message.content.startsWith(prefix)) {
-                if (!this.commands.has(command)) {
-                    let commandNames = Array.from(this.commands.keys());
-                    var autocorrect = require('autocorrect')({ words: commandNames });
-                    var correctedCommand = autocorrect(command);
-                    if (this.commands.has(correctedCommand)) {
-                        commandInstance = this.commands.get(correctedCommand);
-                    }
-                    else {
-                        return; // Command not found
-                    }
-                }
-                else {
-                    commandInstance = this.commands.get(command);
-                }
-                if (message.guild == null && commandInstance.dm == false)
-                    return;
-                if (commandInstance.adminOnly || commandInstance.permissions.length > 0) {
-                    let denied = false;
-                    if (this.memberHasPermission(message.member, message.channel, discord_js_1.PermissionsBitField.Flags.Administrator) || message.member.id != message.guild.ownerId) {
-                        if (commandInstance.permissions.length > 0) {
-                            commandInstance.permissions.forEach(permission => {
-                                if (!this.memberHasPermission(message.member, message.channel, permission)) {
-                                    denied = true;
-                                }
-                            });
-                        }
-                    }
-                    if (denied) {
-                        return message.reply({
-                            content: 'You do not have permission to use this command.',
-                            allowedMentions: {
-                                repliedUser: false,
-                            }
-                        });
-                    }
-                }
-                if (message.channel.isTextBased) {
-                    let channel = message.channel;
-                    // Check command is nsfw and if channel is allowed
-                    if (commandInstance.nsfw && !channel.nsfw && !channel.permissionsFor(message.member).has(discord_js_1.PermissionsBitField.Flags.Administrator) && message.member.id != message.guild.ownerId) {
-                        return message.reply({
-                            content: 'This command is nsfw and this channel is not nsfw.',
-                            allowedMentions: {
-                                repliedUser: false,
-                            }
-                        });
-                    }
-                }
-                try {
-                    let parsedArgs = new Map();
-                    args.forEach(function (arg, index) {
-                        parsedArgs.set(commandInstance.args?.[index]?.name || index, {
-                            name: commandInstance.args?.[index]?.name || index,
-                            value: arg
-                        });
-                    });
-                    await commandInstance.execute({
-                        message,
-                        args: parsedArgs,
-                        client: this.client,
-                    });
-                    if (!message.channel.isDMBased && !message.deletable && (false)) { // false = settings.deleteCommands
-                        try {
-                            message.delete().catch(function () {
-                                console.error('can\'t delete user command');
-                            });
-                            const metadata = await fetch('https://tulipo.ga/api/last_command/' + command).then(res => res.json());
-                        }
-                        catch (err) {
-                            console.error(err.name, err.message);
-                        }
-                    }
-                }
-                catch (error) {
-                    // let content = await getErrorEmbed({
-                    //     name: error.name,
-                    //     message: error.message,
-                    //     comid: com,
-                    //     args: args,
-                    //     stack: error.stack,
-                    // }, true);
-                    // try {
-                    //     message.reply(content);
-                    // } catch (e) {
-                    //     channel.send(content);
-                    // }
-                }
-            }
-        });
-    }
     static splitCommandLine(commandLine) {
         //log( 'commandLine', commandLine ) ;
         //  Find a unique marker for the space character.

package/dist/baseModule/events/discord/messageCreate.d.ts

@@ -0,0 +1,6 @@
+import { EventParameters } from "../../../types/EventParameters";
+import { FrameworkEvent } from "../../../types/FrameworkEvent";
+export declare abstract class InteractionCreate extends FrameworkEvent {
+    once: boolean;
+    execute({ message, client, framework }: EventParameters): Promise<import("discord.js").Message<boolean>>;
+}

package/dist/baseModule/events/discord/messageCreate.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InteractionCreate = void 0;
+const discord_js_1 = require("discord.js");
+const FrameworkEvent_1 = require("../../../types/FrameworkEvent");
+const ZumitoFramework_1 = require("../../../ZumitoFramework");
+class InteractionCreate extends FrameworkEvent_1.FrameworkEvent {
+    once = false;
+    async execute({ message, client, framework }) {
+        let channel = message.channel;
+        let prefix = framework.settings.defaultPrefix;
+        const args = ZumitoFramework_1.ZumitoFramework.splitCommandLine(message.content.slice(prefix.length));
+        const command = args.shift().toLowerCase();
+        let commandInstance;
+        if (message.content.startsWith(prefix)) {
+            if (!framework.commands.has(command)) {
+                let commandNames = Array.from(framework.commands.keys());
+                var autocorrect = require('autocorrect')({ words: commandNames });
+                var correctedCommand = autocorrect(command);
+                if (framework.commands.has(correctedCommand)) {
+                    commandInstance = framework.commands.get(correctedCommand);
+                }
+                else {
+                    return; // Command not found
+                }
+            }
+            else {
+                commandInstance = framework.commands.get(command);
+            }
+            if (message.guild == null && commandInstance.dm == false)
+                return;
+            if (commandInstance.adminOnly || commandInstance.permissions.length > 0) {
+                let denied = false;
+                if (framework.memberHasPermission(message.member, message.channel, discord_js_1.PermissionsBitField.Flags.Administrator) || message.member.id != message.guild.ownerId) {
+                    if (commandInstance.permissions.length > 0) {
+                        commandInstance.permissions.forEach(permission => {
+                            if (!framework.memberHasPermission(message.member, message.channel, permission)) {
+                                denied = true;
+                            }
+                        });
+                    }
+                }
+                if (denied) {
+                    return message.reply({
+                        content: 'You do not have permission to use this command.',
+                        allowedMentions: {
+                            repliedUser: false,
+                        }
+                    });
+                }
+            }
+            if (message.channel.isTextBased) {
+                let channel = message.channel;
+                // Check command is nsfw and if channel is allowed
+                if (commandInstance.nsfw && !channel.nsfw && !channel.permissionsFor(message.member).has(discord_js_1.PermissionsBitField.Flags.Administrator) && message.member.id != message.guild.ownerId) {
+                    return message.reply({
+                        content: 'This command is nsfw and this channel is not nsfw.',
+                        allowedMentions: {
+                            repliedUser: false,
+                        }
+                    });
+                }
+            }
+            try {
+                let parsedArgs = new Map();
+                args.forEach(function (arg, index) {
+                    parsedArgs.set(commandInstance.args?.[index]?.name || index, {
+                        name: commandInstance.args?.[index]?.name || index,
+                        value: arg
+                    });
+                });
+                await commandInstance.execute({
+                    message,
+                    args: parsedArgs,
+                    client: framework.client,
+                });
+                if (!message.channel.isDMBased && !message.deletable && (false)) { // false = settings.deleteCommands
+                    try {
+                        message.delete().catch(function () {
+                            console.error('can\'t delete user command');
+                        });
+                        const metadata = await fetch('https://tulipo.ga/api/last_command/' + command).then(res => res.json());
+                    }
+                    catch (err) {
+                        console.error(err.name, err.message);
+                    }
+                }
+            }
+            catch (error) {
+                // let content = await getErrorEmbed({
+                //     name: error.name,
+                //     message: error.message,
+                //     comid: com,
+                //     args: args,
+                //     stack: error.stack,
+                // }, true);
+                // try {
+                //     message.reply(content);
+                // } catch (e) {
+                //     channel.send(content);
+                // }
+            }
+        }
+    }
+}
+exports.InteractionCreate = InteractionCreate;

package/dist/types/FrameworkEvent.d.ts

@@ -1,4 +1,4 @@
 export declare abstract class FrameworkEvent {
     once: boolean;
-    abstract execute(...args: any[]): Promise<void>;
+    abstract execute(...args: any[]): any;
 }

package/dist/types/Module.d.ts

@@ -4,9 +4,13 @@ export declare abstract class Module {
     protected path: string;
     protected commands: Map<String, Command>;
     protected events: Map<String, FrameworkEvent>;
+    protected translations: Map<String, String>;
     constructor(path: any);
     registerCommands(): void;
     getCommands(): Map<String, Command>;
     registerEvents(): void;
     getEvents(): Map<String, FrameworkEvent>;
+    registerTranslations(): void;
+    getTranslations(): Map<String, String>;
+    parseTranslation(path: String, json: any): any;
 }

package/dist/types/Module.js

@@ -7,12 +7,16 @@ class Module {
     path;
     commands = new Map();
     events = new Map();
+    translations = new Map();
     constructor(path) {
         this.path = path;
         this.registerCommands();
         this.registerEvents();
+        this.registerTranslations();
     }
     registerCommands() {
+        if (!fs.existsSync(path.join(this.path, 'commands')))
+            return;
         fs.readdirSync(path.join(this.path, 'commands')).forEach(file => {
             if (file.endsWith('.js') || file.endsWith('.ts')) {
                 let command = require(`${this.path}/commands/${file}`);
@@ -26,6 +30,8 @@ class Module {
         return this.commands;
     }
     registerEvents() {
+        if (!fs.existsSync(path.join(this.path, 'events')))
+            return;
         fs.readdirSync(path.join(this.path, 'events')).forEach(file => {
             if (file.endsWith('.js') || file.endsWith('.ts')) {
                 let event = require(`${this.path}/events/${file}`);
@@ -38,5 +44,28 @@ class Module {
     getEvents() {
         return this.events;
     }
+    registerTranslations() {
+        if (!fs.existsSync(path.join(this.path, 'translations')))
+            return;
+        fs.readdirSync(path.join(this.path, 'translations')).forEach(file => {
+            if (file.endsWith('.json')) {
+                let json = require(`${this.path}/translations/${file}`);
+                this.parseTranslation('', json);
+            }
+        });
+    }
+    getTranslations() {
+        return this.translations;
+    }
+    parseTranslation(path, json) {
+        if (typeof json === 'object') {
+            for (let key in json) {
+                this.parseTranslation(path + key + '.', json[key]);
+            }
+        }
+        else {
+            this.translations.set(path, json);
+        }
+    }
 }
 exports.Module = Module;

package/dist/types/Translation.d.ts

@@ -0,0 +1,9 @@
+export declare class Translation {
+    text: Map<String, String>;
+    constructor();
+    get(language: string): String;
+    set(language: string, text: string): void;
+    has(language: string): boolean;
+    getAll(): Map<String, String>;
+    setAll(text: Map<String, String>): void;
+}

package/dist/types/Translation.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Translation = void 0;
+class Translation {
+    text = new Map();
+    constructor() { }
+    get(language) {
+        if (this.has(language)) {
+            return this.text.get(language);
+        }
+        else {
+            return this.text.get('en');
+        }
+    }
+    set(language, text) {
+        this.text.set(language, text);
+    }
+    has(language) {
+        return this.text.has(language);
+    }
+    getAll() {
+        return this.text;
+    }
+    setAll(text) {
+        this.text = text;
+    }
+}
+exports.Translation = Translation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zumito-framework",
-  "version": "1.0.26",
+  "version": "1.1.1",
   "description": "Discord.js bot framework",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",