Merge branch 'dev' of https://github.com/Khaaz/AxonCore into dev

Author: Khaaz

package.json

@@ -27,7 +27,7 @@
     "mongoose": "^5.7.7",
     "signale": "^1.4.0",
     "superagent": "^5.2.1",
-    "typescript": "^3.7.5",
+    "typescript": "^3.9.7",
     "winston": "^3.2.1",
     "yarn": "^1.22.0"
   },

src/Core/Models/GuildConfig.js

@@ -219,12 +219,17 @@ class GuildConfig {
         if (guildConfig.guildID !== this.guildID) {
             return Promise.resolve(null);
         }
+        const update = {};
         for (const key in guildConfig) {
             this[key] = guildConfig[key];
+            if (!key.startsWith('_') ) {
+                update[key] = guildConfig[key];
+            }
         }
         this.updatedAt = new Date();
+        update.updatedAt = new Date();
 
-        const newConf = await this._axon.DBProvider.saveGuild(this.guildID, this);
+        const newConf = await this._axon.DBProvider.saveGuild(this.guildID, update);
         return newConf ? this : null;
     }
 

src/Utility/AxonUtils.js

@@ -172,8 +172,8 @@ class AxonUtils {
      * @memberof AxonUtils
      */
     isBotStaff(uID) {
-        for (const rank in this.axon.staff) {
-            if (rank.find(u => u === uID) ) {
+        for (const rank of Object.values(this.axon.staff) ) {
+            if (rank.includes(uID) ) {
                 return true;
             }
         }
@@ -257,7 +257,7 @@ class AxonUtils {
      * @memberof AxonUtils
      */
     sendDM(user, content, options = {} ) {
-        this.library.user.getDM(user)
+        return this.library.user.getDM(user)
             .then(chan => this.sendMessage(chan, content, options) )
             .catch(err => {
                 this.logger.verbose(`DM disabled/Bot blocked [${user.username}#${user.discriminator} - ${user.id}]!`);

types/AxonClient.ts

@@ -1,11 +1,11 @@
 import { EventEmitter } from 'events';
 import {
-    AxonConfs, AxonParams, Info, AxonInfo, ALogger, AxonUtils, LibClient, LibraryInterface, Utils, ADBProvider, ModuleRegistry, CommandRegistry, ListenerRegistry,
-    EventManager, GuildConfigCache, AxonConfig, ModuleLoader, CommandDispatcher, MessageManager, AxonStaffIDs, AxonOptions, Collection, AHandler, Listener, Resolver,
-    Webhooks, AxonTemplate, Module, Command, LOG_LEVELS, Ctx, LibMessage, GuildConfig, DEBUG_FLAGS, Executor, ExtentionInitReturn,
+    AxonConfs, AxonParams, Info, AxonInfo, ALogger, AxonUtils, LibClient, LibraryInterface, Utils, ADBProvider, ModuleRegistry, CommandRegistry, ListenerRegistry, EventManager,
+    GuildConfigCache, AxonConfig, ModuleLoader, CommandDispatcher, MessageManagerType, AxonStaffIDs, AxonOptions, Collection, AHandler, Listener, Resolver, Webhooks,
+    AxonTemplate, Module, Command, LOG_LEVELS, Ctx, LibMessage, GuildConfig, DEBUG_FLAGS, Executor, ExtentionInitReturn, AxonLanguageResponse, DefaultLanguageResponse, LibDMChannel,
 } from './';
 
-export declare class AxonClient extends EventEmitter {
+export declare class AxonClient<L extends AxonLanguageResponse = DefaultLanguageResponse> extends EventEmitter {
     /** Configs (webhooks, template, custom) */
     private _configs: AxonConfs;
     /** Bot settings */
@@ -49,7 +49,7 @@ export declare class AxonClient extends EventEmitter {
     public dispatcher: CommandDispatcher;
     public executor: Executor;
     /** Message manager object accessible with `<AxonClient>.l` */
-    private _messageManager: MessageManager;
+    private _messageManager: MessageManagerType<L>;
 
     /** Bot Staff (owners, admins, +...) */
     public staff: AxonStaffIDs;
@@ -119,7 +119,7 @@ export declare class AxonClient extends EventEmitter {
      * @readonly
      * @memberof AxonClient
      */
-    readonly l: MessageManager;
+    readonly l: MessageManagerType<L>;
 
     /**
      * Get a module from AxonClient with the given label.
@@ -221,7 +221,7 @@ export declare class AxonClient extends EventEmitter {
      *
      * @memberof AxonClient
      */
-    public sendFullHelp(msg: LibMessage, guildConfig?: GuildConfig): Promise<void>;
+    public sendFullHelp(msg: LibMessage<LibDMChannel>, guildConfig?: GuildConfig): Promise<void>;
     /**
      * Register a guild prefix.
      * Shortcut to guildConfig.registerPrefix()

types/Core/Base.ts

@@ -1,6 +1,6 @@
 import {
-    AxonClient, LibClient, ALogger, Resolver, AxonUtils, Utils, MessageManager, Module, Command,
-    LOG_LEVELS, Ctx, LibUser, AxonMSGCont, AxonMSGOpt, LibMessage, LibTextableChannel, CommandResponse,
+    AxonClient, LibClient, ALogger, Resolver, AxonUtils, Utils, MessageManager, Module, Command, LOG_LEVELS,
+    Ctx, LibUser, AxonMSGCont, AxonMSGOpt, LibMessage, LibTextableChannel, CommandResponse, LibDMChannel,
 } from '../';
 
 /**
@@ -112,7 +112,7 @@ export declare class Base {
      * @returns Message Object
      * @memberof Base
      */
-    public sendDM(user: LibUser, content: AxonMSGCont, options?: AxonMSGOpt): Promise<LibMessage|void>;
+    public sendDM(user: LibUser, content: AxonMSGCont, options?: AxonMSGOpt): Promise<LibMessage<LibDMChannel>|void>;
     /**
      * Send a message.
      * Check for bot permissions + message/embed length
@@ -127,7 +127,7 @@ export declare class Base {
      * @returns Message Object
      * @memberof Base
      */
-    public sendMessage(channel: LibTextableChannel, content: AxonMSGCont, options?: AxonMSGOpt): Promise<LibMessage>;
+    public sendMessage<T extends LibTextableChannel>(channel: T, content: AxonMSGCont, options?: AxonMSGOpt): Promise<LibMessage<T>>;
     /**
      * Edit a message
      * Check for bot permissions + message embed/length
@@ -137,7 +137,7 @@ export declare class Base {
      * @returns Message Object
      * @memberof Base
      */
-    public editMessage(message: LibMessage, content: AxonMSGCont): Promise<LibMessage>;
+    public editMessage<T extends LibTextableChannel>(message: LibMessage<T>, content: AxonMSGCont): Promise<LibMessage<T>>;
     /**
      * Send a success message. If the content is a string, suffix the success emote to the content.
      * Check for sendMessage perms.

types/Core/Command/CommandEnvironment.ts

@@ -1,5 +1,5 @@
 import {
-    COMMAND_EXECUTION_TYPES, CommandEnvironmentProps, CommandEnvironmentParams, LibMessage, GuildConfig, Command,
+    COMMAND_EXECUTION_TYPES, CommandEnvironmentProps, CommandEnvironmentParams, LibMessage, GuildConfig, Command, LibTextableChannel,
 } from '../../';
 
 /**
@@ -9,11 +9,11 @@ import {
  *
  * @class CommandEnvironment
  */
-export declare class CommandEnvironment implements CommandEnvironmentProps {
+export declare class CommandEnvironment<T extends LibTextableChannel = LibTextableChannel> implements CommandEnvironmentProps {
     /** The raw message content */
     public raw: string;
     public command: string;
-    public msg: LibMessage;
+    public msg: LibMessage<T>;
     public args: string[];
     public prefix: string;
     public guildConfig: GuildConfig;

types/Langs/MessageManager.ts

@@ -1,5 +1,5 @@
 import {
-    AxonClient, Languages, TranslationManager, MessageParser, AxonLanguageResponse,
+    AxonClient, Languages, TranslationManager, MessageParser, AxonLanguageResponse, DefaultLanguageResponse,
 } from '..';
 
 /**
@@ -10,11 +10,11 @@ import {
  *
  * @class MessageManager
  */
-export declare class MessageManager {
+export declare class MessageManager<L extends AxonLanguageResponse = DefaultLanguageResponse> {
     private _axon: AxonClient;
     /** All messages (all langs) */
-    private _messages: Languages;
-    public translation: TranslationManager;
+    private _messages: Languages<L>;
+    public translation: TranslationManager<L>;
     public parser: MessageParser;
 
     /**
@@ -23,15 +23,15 @@ export declare class MessageManager {
      *
      * @memberof MessageManager
      */
-    constructor(axonClient: AxonClient, messages: Languages, baseLang: string)
+    constructor(axonClient: AxonClient, messages: Languages<L>, baseLang: string)
 
     /**
      * Returns all messages (all langs)
      *
      * @readonly
      * @memberof MessageManager
      */
-    readonly messages: Languages;
+    readonly messages: Languages<L>;
     /**
      * All message from the given lang (or default lang)
      *
@@ -45,12 +45,18 @@ export declare class MessageManager {
      * @returns The message
      * @memberof MessageManager
      */
-    public getMessage(message: string, lang?: string): string;
+    public getMessage(message: keyof L, lang?: string): string;
     /**
      * Get the message in the correct lang, parsed to replace {{key}} with the correct argument
      *
      * @returns The actual message
      * @memberof MessageManager
      */
-    public get(message: string, args: AxonLanguageResponse, lang: string): string;
+    public get(message: keyof L, args: AxonLanguageResponse, lang: string): string;
 }
+
+type DynamicMethods<L extends AxonLanguageResponse = DefaultLanguageResponse> = {
+    [P in keyof L]: (args: AxonLanguageResponse, lang: string) => string;
+}
+
+export declare type MessageManagerType<L extends AxonLanguageResponse = DefaultLanguageResponse> = MessageManager<L> & DynamicMethods<L>;

types/Langs/MessageParser.ts

@@ -8,29 +8,29 @@ import { AxonLanguageResponse } from '..';
  * @class MessageParser
  */
 export declare class MessageParser {
-    public match: RegExp;
-    constructor();
-    /**
- * Generator function that will match all occurrence of the regex and yield a Match structure
- *
- * @generator
- * @yields Match
- * @memberof MessageParser
- */
-    public matchAll(message: string): Generator<RegExpExecArray, void, unknown>;
-    /**
- * Parse the message by replacing the dynamic content.
- *
- * @param args - Custom object with all arguments that needs to be inserted in the string
- * @returns - The Parsed message
- * @memberof MessageParser
- */
-    public parse(message: string, args: AxonLanguageResponse): string;
-    /**
- * Same as above but arguments are unnamed and passed as parameters instead of inside one object.
- *
- * @returns The Parsed message
- * @memberof MessageParser
- */
-    public parse2(message: string, args: string[] ): string;
+  public match: RegExp;
+  constructor();
+  /**
+   * Generator function that will match all occurrence of the regex and yield a Match structure
+   *
+   * @generator
+   * @yields Match
+   * @memberof MessageParser
+   */
+  public matchAll(message: string): Generator<RegExpExecArray, void, unknown>;
+  /**
+  * Parse the message by replacing the dynamic content.
+  *
+  * @param args - Custom object with all arguments that needs to be inserted in the string
+  * @returns - The Parsed message
+  * @memberof MessageParser
+  */
+  public parse(message: string, args: AxonLanguageResponse): string;
+  /**
+   * Same as above but arguments are unnamed and passed as parameters instead of inside one object.
+   *
+   * @returns The Parsed message
+   * @memberof MessageParser
+   */
+  public parse2(message: string, args: string[] ): string;
 }

types/Langs/TranslationManager.ts

@@ -1,4 +1,4 @@
-import { MessageManager, Languages, AxonLanguageResponse } from '..';
+import { MessageManager, Languages, AxonLanguageResponse, DefaultLanguageResponse } from '..';
 
 /**
  * Class dedicated to manage translations.
@@ -8,33 +8,33 @@ import { MessageManager, Languages, AxonLanguageResponse } from '..';
  *
  * @class TranslationManager
  */
-export declare class TranslationManager {
-    private _manager: MessageManager;
+export declare class TranslationManager<L extends AxonLanguageResponse = DefaultLanguageResponse> {
+    private _manager: MessageManager<L>;
     /** The default lang */
     public lang: string;
     /**
      * Creates an instance of TranslationManager.
      * @memberof TranslationManager
      */
-    constructor(manager: MessageManager, lang: string);
+    constructor(manager: MessageManager<L>, lang: string);
 
     /**
      * Returns all messages (all langs)
      *
      * @readonly
      * @memberof TranslationManager
      */
-    readonly messages: Languages;
+    readonly messages: Languages<L>;
     /**
      * Return all messages for the specified lang or the default lang if no specified lang.
      *
      * @memberof TranslationManager
      */
-    public getMessages(lang: string): AxonLanguageResponse;
+    public getMessages(lang: string): L;
     /**
      * Return a specified message for the specified lang or the default lang if no specified lang
      *
      * @memberof TranslationManager
      */
-    public getMessage(message: string, lang: string): string;
+    public getMessage(message: keyof L, lang?: string): string;
 }

types/Libraries/definitions/Channel.ts

@@ -1,5 +1,5 @@
 import {
-    LibraryInterface, LibChannel, LibGuild, LibUser, AxonMSGCont, LibMessage,
+    LibraryInterface, LibChannel, LibGuild, LibUser, AxonMSGCont, LibMessage, LibTextableChannel,
 } from '../../';
 
 export declare class Channel {
@@ -43,5 +43,5 @@ export declare class Channel {
      * Send a message in the channel
      * @memberof Channel
      */
-    public sendMessage(channel: LibChannel, content: AxonMSGCont): Promise<LibMessage | LibMessage[]>; // Not Implemented // LibMessage[] is for Discord.JS
+    public sendMessage<T extends LibTextableChannel = LibTextableChannel>(channel: T, content: AxonMSGCont): Promise<LibMessage<T> | LibMessage<T>[]>; // Not Implemented // LibMessage[] is for Discord.JS
 }