changed triggersystem

src/lib.js

@@ -17,10 +17,24 @@ function Lib(tbot, tsql) {
   Lib.prototype.loadUser((cb) => {
     console.log((cb)?"Admins wurden geladen":"Admins konnten nicht geladen werden");
   });
+  Lib.prototype.loadTrigger();
 }
 
 Lib.prototype.admins = [];
 Lib.prototype.debug = false;
+Lib.prototype.trigger = {
+  trigger: [],
+  add: (args) => {
+    Lib.prototype.trigger.trigger.push({
+      name: args.name,
+      call: args.call,
+      func: args.func,
+      desc: args.desc,
+      level: args.level,
+      active: args.active
+    });
+  }
+};
 
 Lib.prototype.getUserlevel = (user, network, channel, cb) => {
   bot.whois(user, network, (err, data) => {
@@ -107,4 +121,14 @@ Lib.prototype.generateThumbs = () => {
 Lib.prototype.log = (msg) => {
   if(Lib.prototype.debug)
     bot.send("#f0ck", msg, 'n0xy');
+};
+
+Lib.prototype.loadTrigger = () => {
+  var files = fs.readdirSync(__dirname+'/trigger/');
+  files.forEach((file) => {
+    if(file.substr(-3, 3) === '.js') {
+      console.log('Loading trigger', file);
+      require(__dirname+'/trigger/' + file)(bot, Lib.prototype);
+    }
+  });
 };

src/main.js

@@ -41,7 +41,7 @@ bot.on('motd', (e) => {
 });
 
 bot.on('message', (e) => {
-  trigger.trigger.forEach((entry,i,a) => {
+  lib.trigger.trigger.forEach((entry,i,a) => {
     if(e.message.match(entry.call) && entry.active == 1) {
       lib.log('trigger: '+entry.name);
       lib.getUserlevel(e.user.getNick(), e.network, e.channel.getName(), (cb) => {
@@ -52,29 +52,4 @@ bot.on('message', (e) => {
       });
     }
   });
-});
+});
-
-var trigger = {
-  trigger: [],
-  add: (args) => {
-    trigger.trigger.push({
-      name: args.name,
-      call: args.call,
-      func: args.func,
-      desc: args.desc,
-      level: args.level,
-      active: args.active
-    });
-  }
-};
-
-var loadPlugins = () => {
-  var files = fs.readdirSync(__dirname+'/trigger/');
-  files.forEach((file) => {
-    if(file.substr(-3, 3) === '.js') {
-      console.log('Loading plugin', file);
-      require(__dirname+'/trigger/' + file)(bot, trigger, lib);
-    }
-  });
-};
-loadPlugins();

src/trigger/clean.js

@@ -1,7 +1,7 @@
 var fs = require('fs-extra');
 
-module.exports = (bot, trigger, lib) => {
+module.exports = (bot, lib) => {
-  trigger.add({
+  lib.trigger.add({
     name: 'clean',
     call: /^\!clean/i,
     level: 100,

src/trigger/debug.js

@@ -1,5 +1,5 @@
-module.exports = (bot, trigger, lib) => {
+module.exports = (bot, lib) => {
-  trigger.add({
+  lib.trigger.add({
     name: 'debug',
     call: /^\!debug$/i,
     level: 100,

src/trigger/del.js

@@ -1,5 +1,5 @@
-module.exports = (bot, trigger, lib) => {
+module.exports = (bot, lib) => {
-  trigger.add({
+  lib.trigger.add({
     name: 'delete',
     call: /^\!del (\d+)$/i,
     level: 100,

src/trigger/level.js

@@ -1,5 +1,5 @@
-module.exports = (bot, trigger, lib) => {
+module.exports = (bot, lib) => {
-  trigger.add({
+  lib.trigger.add({
     name: 'level',
     call: /^\!level(?: +\@.*)?/i,
     level: 0,

src/trigger/parser.js

@@ -5,8 +5,8 @@ var cloudscraper = require('cloudscraper');
 var Mime = require('mime');
 var cfg = require('../../cfg/main.json');
 
-module.exports = (bot, trigger, lib) => {
+module.exports = (bot, lib) => {
-  trigger.add({
+  lib.trigger.add({
     name: 'parser',
     call: /https?:\/\/[\w-]+(\.[\w-]+)+\.?(:\d+)?(\/\S*)?/gi,
     level: 0,

src/trigger/stats.js

@@ -1,7 +1,7 @@
 var du = require('du');
 
-module.exports = (bot, trigger, lib) => {
+module.exports = (bot, lib) => {
-  trigger.add({
+  lib.trigger.add({
     name: 'stats',
     call: /^\!stats$/i,
     level: 10,

src/trigger/test.js

@@ -1,5 +1,5 @@
-module.exports = (bot, trigger, lib) => {
+module.exports = (bot, lib) => {
-  trigger.add({
+  lib.trigger.add({
     name: 'test',
     call: /^\!test/,
     level: 0,

src/trigger/thumb.js

@@ -1,7 +1,7 @@
 var fs = require('fs-extra');
 
-module.exports = (bot, trigger, lib) => {
+module.exports = (bot, lib) => {
-  trigger.add({
+  lib.trigger.add({
     name: 'thumbnailer',
     call: /^\!thumb (\d+)$/i,
     level: 100,

src/trigger/umode.js

@@ -2,8 +2,8 @@ var allowedModes = [
   'q','a','o','h','v'
 ];
 
-module.exports = (bot, trigger, lib) => {
+module.exports = (bot, lib) => {
-  trigger.add({
+  lib.trigger.add({
     name: 'umode',
     call: /^\!umode .*/i,
     level: 100,

src/trigger/user.js

@@ -1,5 +1,5 @@
-module.exports = (bot, trigger, lib) => {
+module.exports = (bot, lib) => {
-  trigger.add({
+  lib.trigger.add({
     name: 'user',
     call: /^\!user( \@.*)?/i,
     level: 0,

src/trigger/ytdl.js

@@ -2,8 +2,8 @@ var fs = require('fs-extra');
 var ytdl = require('ytdl-core');
 var uuid = require('uuid');
 
-module.exports = (bot, trigger, lib) => {
+module.exports = (bot, lib) => {
-  trigger.add({
+  lib.trigger.add({
     name: 'ytdl',
     call: /https?:\/\/(www\.)?(yotu\.be\/|youtube\.com\/)((.+\/)?(watch(\?v=|.+&v=))?(v=)?)([\w_-]{11})(&.+)?/gi,
     level: 0,