From fea750f11ffbdd0d85e3b17d80c04b8783c0f920 Mon Sep 17 00:00:00 2001 From: Flummi Date: Mon, 27 Nov 2017 00:09:41 +0100 Subject: [PATCH] derp --- src/bot.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/bot.js b/src/bot.js index 588b383..e67c8b8 100644 --- a/src/bot.js +++ b/src/bot.js @@ -11,13 +11,12 @@ read().then(() => { trigger: trigger }; - /*fs.readdirSync(`${__dirname}/inc/trigger/`).forEach(file => { + fs.readdirSync(`${__dirname}/inc/trigger/`).forEach(file => { if(file.substr(-3, 3) === ".js") { logger.info(`(main) loading trigger: ${file}`); require(`${__dirname}/inc/trigger/${file}`)(self); } - });*/ - require(`${__dirname}/inc/trigger/kernel.js`)(self); + }); bot.on("message", e => { // Todo: eventhandler for (var [name, trigger] of self._trigger.entries()) { @@ -41,7 +40,6 @@ read().then(() => { break; } - console.log(trigger); trigger.f(e); } logger.info(`${e.network} -> ${e.channel} -> ${e.user.nick}: ${e.message}`); @@ -52,10 +50,10 @@ read().then(() => { }); }); -function trigger(args, trigger) { +function trigger(args) { this.call = args.call; this.level = args.level || 0; - this.active = args.active || true; + this.active = args.hasOwnProperty("active") ? args.active : true; this.clients = args.clients || ["irc", "tg"]; this.f = args.f; } \ No newline at end of file