diff --git a/config/prefixes.yml b/config/prefixes.yml new file mode 100644 index 0000000..6f3d0d4 --- /dev/null +++ b/config/prefixes.yml @@ -0,0 +1,5 @@ +prefixes: + - id: cosmic + spaced: true + - id: "*" + spaced: false diff --git a/config/services.yml b/config/services.yml index ab21468..741e1eb 100644 --- a/config/services.yml +++ b/config/services.yml @@ -1,3 +1,4 @@ +debug: false enableConsole: true enableMPP: true enableDiscord: true diff --git a/src/commands/CommandHandler.ts b/src/commands/CommandHandler.ts index 2f063b9..fdba2d6 100644 --- a/src/commands/CommandHandler.ts +++ b/src/commands/CommandHandler.ts @@ -8,6 +8,20 @@ import { createInventory, readInventory } from "../data/inventory"; import { hasPermission } from "../permissions"; import { Logger } from "../util/Logger"; import { balanceConfig } from "../economy/Balance"; +import { loadConfig } from "../util/config"; + +const prefixConfig = loadConfig("config/prefixes.yml", { + prefixes: [ + { + id: "cosmic", + spaced: true + }, + { + id: "*", + spaced: false + } + ] +}); export interface CommandMessage { m: "command"; @@ -32,16 +46,7 @@ export type BaseCommandMessage = Omit< export class CommandHandler { public static commandGroups = new Array(); - public static prefixes = new Array( - { - id: "cosmic", - spaced: true - }, - { - id: "*", - spaced: false - } - ); + public static prefixes = new Array(); public static logger = new Logger("Command Handler"); @@ -155,3 +160,8 @@ export class CommandHandler { } } } + +// Add prefixes +for (const prefix of prefixConfig.prefixes) { + CommandHandler.prefixes.push(prefix); +} diff --git a/src/services/index.ts b/src/services/index.ts index f2ac3cc..cc01c95 100644 --- a/src/services/index.ts +++ b/src/services/index.ts @@ -11,6 +11,7 @@ import { DiscordAgent } from "./discord"; */ const config = loadConfig("config/services.yml", { + debug: false, enableConsole: true, enableMPP: false, enableDiscord: false, @@ -62,7 +63,8 @@ export class ServiceLoader { color: mppConfig.desiredUser.color } : mppConfig.desiredUser, - env.MPPNET_TOKEN + env.MPPNET_TOKEN, + config.debug ); mppAgent.start(); diff --git a/src/services/mpp/index.ts b/src/services/mpp/index.ts index 6c3164c..8b5d793 100644 --- a/src/services/mpp/index.ts +++ b/src/services/mpp/index.ts @@ -11,7 +11,8 @@ export class MPPAgent extends ServiceAgent { uri: string, public desiredChannel: string, public desiredUser: { name: string; color: string }, - token: string + token: string, + public debug: boolean = false ) { const cl = new Client(uri, token); super("mpp", cl);