Merge branch 'f0ckdev' into 'master'

gitfap pls -.-

See merge request !46

src/cfg.js

@@ -0,0 +1,74 @@
+var mysql = require('mysql');
+
+var self = Cfg.prototype;
+var haDC = () => {
+  self.sql = mysql.createConnection(require('../cfg/mysql.json'));
+  self.sql.connect((err) => {
+    if(err) setTimeout(haDC, 2000);
+  });
+  self.sql.on('error', (err) => {
+    if(err.code === 'PROTOCOL_CONNECTION_LOST') haDC();
+  });
+};
+haDC();
+
+module.exports = Cfg;
+function Cfg() {
+  self.cfg;
+}
+
+self.read = (cb, kat, key) => {
+  // main, websrv, irc
+  var out = {
+    irc: {},
+    main: {},
+    websrv: {},
+    trigger: {}
+  };
+  self.sql.query("select * from `f0ck`.`cfg`" + (kat?" where `class` = '"+kat+"'"+(key?" && `key` = '"+key+"'":""):""), (err, rows) => {
+    if(err || rows.length < 1)
+      cb(err);
+    else {
+      rows.forEach(e => {
+        out[e.class][e.key] = ((type, value) => {
+          switch(type) {
+            case 'string':
+              return value;
+            break;
+            case 'int':
+              return parseInt(value);
+            break;
+            case 'bool':
+              return (value === 'true')?true:false;
+            break;
+            case 'json':
+              return JSON.parse(value);
+            break;
+          }
+        })(e.type, e.value);
+      });
+      if(cb)
+        cb( key?out[kat][key]:out );
+      else
+        if(!kat && !key)
+          self.cfg = out;
+    }
+  });
+};
+
+self.write = (kat, key, value, type, cb) => {
+  self.sql.query("select * from `f0ck`.`cfg` where `class` = ? && `key` = ? limit 1", [kat, key], (err, rows) => {
+    if(rows.length > 0) {
+      self.sql.query("update `f0ck`.`cfg` set `value` = ? where `class` = ? && `key` = ?", [value, kat, key], (err) => {
+        self.read();
+        if(cb) cb(err);
+      });
+    }
+    else {
+      self.sql.query("insert into `f0ck`.`cfg` (`class`,`key`,`value`,`type`) values (?,?,?,?)", [kat, key, value, type], (err) => {
+        self.read();
+        if(cb) cb(err);
+      });
+    }
+  });
+};

src/events/message.js

@@ -3,8 +3,8 @@ module.exports = (lib) => {
     lib.trigger.trigger.forEach((entry,i,a) => {
       if(e.message.match(entry.call)) {
         let active = false;
-        if(lib.trigger.chans[e.network+e.channel.getName()] !== undefined) {
+        if(lib.cfg.trigger[e.network+e.channel.getName()] !== undefined) {
-          if(lib.trigger.chans[e.network+e.channel.getName()][entry.name])
+          if(lib.cfg.trigger[e.network+e.channel.getName()][entry.name])
             active = true;
         }
         else

src/lib.js

@@ -4,7 +4,6 @@ var https = require('https');
 var exec = require('child_process').exec;
 var crypto = require('crypto');
 var request = require('request');
-var mysql = require('mysql');
 
 var self = Lib.prototype;
 self.bot = require('coffea')();
@@ -25,29 +24,17 @@ self.trigger = {
     });
   }
 };
-var haDC = () => {
-  self.sql = mysql.createConnection(require('../cfg/mysql.json'));
-  self.sql.connect((err) => {
-    if(err) setTimeout(haDC, 2000);
-  });
-  self.sql.on('error', (err) => {
-    if(err.code === 'PROTOCOL_CONNECTION_LOST') haDC();
-  });
-};
-haDC();
 
 module.exports = Lib;
-function Lib() {
+function Lib(config) {
-  self.cfg = {};
+  self.config = config;
-  self.getcfg('main', cfg => {
+  self.sql = config.sql;
-    self.cfg.main = cfg;
+  self.cfg = config.cfg;
   self.debug = self.cfg.main.debug;
   self.loadIRC();
   self.loadUser((cb) => console.log((cb)?"Admins wurden geladen":"Admins konnten nicht geladen werden"));
   self.loadTrigger();
   self.loadEvents();
-    self.getChanTrigger();
-  });
 }
 
 self.getUserlevel = (user, network, channel, cb) => {
@@ -229,40 +216,7 @@ self.levelToModes = level => {
   return "";
 };
 
-self.getcfg = (kat, cb, key) => {
-  // main, websrv, irc
-  var out = {};
-  self.sql.query("select * from `f0ck`.`cfg` where `class` = ?"+(key?" && `key` = '"+key+"'":""), kat, (err, rows) => {
-    if(err || rows.length < 1)
-      cb(err);
-    else {
-      rows.forEach(e => {
-        out[e.key] = ((type, value) => {
-          switch(type) {
-            case 'string':
-              return value;
-            break;
-            case 'int':
-              return parseInt(value);
-            break;
-            case 'bool':
-              return (value === 'true')?true:false;
-            break;
-            case 'json':
-              return JSON.parse(value);
-            break;
-          }
-        })(e.type, e.value);
-      });
-      if(cb)
-        cb( key?out[key]:out );
-    }
-  });
-};
-
 self.loadIRC = () => {
-  self.getcfg('irc', cfg => {
-    self.cfg.irc = cfg;
   self.cfg.irc.irccfg.forEach(e => {
     self.bot.add({
       "name": e.name,
@@ -278,15 +232,6 @@ self.loadIRC = () => {
     });
     console.log("Server "+e.name+" wurde geladen");
   });
-  });
-};
-
-self.getChanTrigger = () => {
-  self.trigger.chans = {};
-  self.getcfg('trigger', cb => {
-    for(let tmp in cb)
-      self.trigger.chans[tmp] = cb[tmp];
-  });
 };
 
 self.genStdTrigger = () => {

src/main.js

@@ -1,5 +1,14 @@
+var Cfg = require('./cfg.js');
 var Lib = require('./lib.js');
 var Websrv = require('./websrv.js');
 
-var lib = new Lib();
+var cfg = new Cfg();
+cfg.read(config => {
+  if(config) {
+    cfg.cfg = config;
+    var lib = new Lib(cfg);
     var websrv = new Websrv(lib);
+  }
+  else
+    console.log(config);
+});

src/trigger/cfg.js

@@ -0,0 +1,64 @@
+module.exports = (lib) => {
+  var kats = {
+    main: [
+      "allowedMimes",
+      "debugchannel",
+      "disallowedHosts",
+      "maxFileSize"
+    ]
+  };
+  
+  lib.trigger.add({
+    name: 'cfg',
+    call: /^!cfg/i,
+    level: 100,
+    active: 1,
+    func: (e) => {
+      // irc, main, websrv, trigger
+      var msg = e.message.replace('!cfg.','');
+      if(msg.match(/=/)) {
+        var tmp = e.message.split('=');
+        var value = tmp[1].trim();
+        var cmd = tmp[0].trim().split('.');
+        
+        if(cmd.length == 2) {
+          var kat = cmd[0];
+          if(kat in kats) {
+            var key = cmd[1];
+            if(kats[kat].indexOf(key) !== -1) {
+              e.reply("kat: "+kat+" ; key: "+key+" ; val: "+value);
+            }
+            else {
+              e.reply("key not found");
+            }
+          }
+          else {
+            e.reply("kat not found");
+          }
+        }
+        else {
+          e.reply("nope");
+        }
+      }
+      else {
+        var cmd = msg.trim().split('.');
+        var kat = cmd[0];
+        if(kat in kats) {
+          var key = cmd[1];
+          if(kats[kat].indexOf(key) !== -1) {
+            lib.getcfg(kat, (cb) => {
+              e.reply(kat+"."+key+" = "+JSON.stringify(cb));
+            }, key);
+          }
+          else {
+            e.reply("key not found");
+          }
+        }
+        else {
+          e.reply("kat not found");
+        }
+      }
+    },
+    desc: 'cfg'
+  });
+};

src/trigger/del.js

@@ -2,24 +2,30 @@ var fs = require('fs-extra');
 
 module.exports = (lib) => {
   lib.trigger.add({
-    name: 'delete',
+    name: 'del',
-    call: /^\!(del|rm) (\d+)$/i,
+    call: /^\!(del|rm)/i,
     level: 100,
     active: 0,
     func: (e) => {
-      var id = e.message.split(' ')[1];
+      var ids = e.message.split(' ');
-      lib.sql.query("select `dest` from `f0ck`.`items` where `id` = ?", id, (err, rows, fields) => {
+      ids.shift();
+      ids.forEach(id => {
+        if(Number.isInteger(parseInt(id))) {
+          lib.sql.query("select `dest` from `f0ck`.`items` where `id` = ? limit 1", id, (err, rows) => {
             if(rows[0]) {
-          lib.sql.query("delete from `f0ck`.`items` where `id` = ?", id).on('end', () => {
+              lib.sql.query("delete from `f0ck`.`items` where `id` = ? limit 1", id, err => {
-            fs.unlink(rows[0].dest);
+                if(!err) {
-            fs.unlink("./t/"+id+".png");
+                  fs.unlink(rows[0].dest, err => {});
-            e.reply("f0ck "+id+" deleted");
+                  fs.unlink("./t/"+id+".png", err => {});
+                }
+                else
+                  e.reply(err);
               });
             }
-        else {
+          });
-          e.reply("404 - f0ck not found");
         }
       });
+      e.reply("f0ck"+(ids.length>1?"s":"")+" deleted");
     },
     desc: 'delete f0ck'
   });

src/trigger/trigger.js

@@ -6,21 +6,18 @@ module.exports = (lib) => {
     active: 1,
     func: (e) => {
       var args = e.message.split(' ');
-      lib.getcfg('trigger', cb => {
+      if(!lib.cfg.trigger[e.network+e.channel])
-        if(!cb)
+        lib.cfg.trigger[e.network+e.channel] = lib.genStdTrigger();
-          cb = lib.genStdTrigger();
       switch(args[1]) {
         case "std":
           e.reply(JSON.stringify(lib.genStdTrigger()));
         break;
         case "toggle":
           if(trigger = args[2].toLowerCase()) {
-              cb = triggertoggle(cb, trigger);
+            lib.cfg.trigger[e.network+e.channel] = triggertoggle(lib.cfg.trigger[e.network+e.channel], trigger);
-              writecfg('trigger', e.network+e.channel, JSON.stringify(cb), cbwc => {
+            lib.config.write('trigger', e.network+e.channel, JSON.stringify(lib.cfg.trigger[e.network+e.channel]), 'json', cbwc => {
-                if(!cbwc) {
+              if(!cbwc)
-                  e.reply("trigger "+ trigger +" in channel "+e.channel.getName() + lib.bot.format.get(cb[trigger]?'green':'red')+" "+(cb[trigger]?"activated":"deactivated"));
+                e.reply("trigger "+ trigger +" in channel "+e.channel.getName() + lib.bot.format.get(lib.cfg.trigger[e.network+e.channel][trigger]?'green':'red')+" "+(lib.cfg.trigger[e.network+e.channel][trigger]?'activated':'deactivated'));
-                  lib.getChanTrigger();
-                }
               else
                 e.reply(cbwc);
             });
@@ -29,12 +26,11 @@ module.exports = (lib) => {
         default:
           var output = "";
           e.reply("Trigger in "+e.channel.getName()+" (green: activated, red: deactivated):");
-            for(var key in cb)
+          for(var key in lib.cfg.trigger[e.network+e.channel])
-              output += lib.bot.format.get(cb[key]?'green':'red')+" "+key;
+            output += lib.bot.format.get(lib.cfg.trigger[e.network+e.channel][key]?'green':'red')+" "+key;
           e.reply(output);
         break;
       }
-      }, e.network+e.channel);
     },
     desc: 'muh'
   });
@@ -44,19 +40,4 @@ module.exports = (lib) => {
       trigger[key] = !trigger[key];
     return trigger;
   };
-
-  var writecfg = (kat, key, value, cb) => {
-    lib.sql.query("select * from `f0ck`.`cfg` where `class` = ? && `key` = ? limit 1", [kat, key], (err, rows) => {
-      if(rows.length > 0) {
-        lib.sql.query("update `f0ck`.`cfg` set `value` = ? where `class` = ? && `key` = ?", [value, kat, key], (err) => {
-          if(cb) cb(err);
-        });
-      }
-      else {
-        lib.sql.query("insert into `f0ck`.`cfg` (`class`,`key`,`value`,`type`) values (?,?,?,?)", [kat, key, value, 'json'], (err) => {
-          if(cb) cb(err);
-        });
-      }
-    });
-  };
 };

src/websrv.js

@@ -11,11 +11,7 @@ var lib;
 module.exports = Websrv;
 function Websrv(tlib) {
   this.lib = lib = tlib;
-  
-  lib.getcfg('websrv', cfg => {
-    lib.cfg.websrv = cfg;
   Websrv.prototype.getTpls();
-    
   http.createServer((req, res) => {
     if(lib.cfg.websrv.wlip.hasOwnProperty(req.connection.remoteAddress)) {
       var filePath = '.' + req.url;
@@ -35,7 +31,6 @@ function Websrv(tlib) {
             var eventname = body.event_name;
             var autor = body.user_name;
             var branch = body.ref.split('/')[2];
-              
             if(branch === "master") {
               var commit = "";
               try {
@@ -60,10 +55,9 @@ function Websrv(tlib) {
           res.writeHead(200, { 'Content-Type': 'text/html' });
           res.end('muh', 'utf-8');
         }
-          else {
+        else
           res.writeHead(403);
       }
-        }
       else {
         var extname = String(path.extname(filePath)).toLowerCase();
         var contentType = 'text/html';
@@ -79,7 +73,7 @@ function Websrv(tlib) {
           '.webm': 'video/webm',
           '.ogg': 'audio/ogg',
           '.mov': 'video/quicktime'
-          };
+        }; // Todo: hat hier nichts zu suchen!
         if(filePath == "./index.html") { // mainpage
           var tpl = swig.compile(templates.index);
           var data = {
@@ -135,11 +129,9 @@ function Websrv(tlib) {
               }
               data.id = e.id;
               data.username = e.username;
-                
               data.srcurl = e.src;
               data.src = urlm.parse(e.src).hostname;
               data.thumb = (e.thumb != '' && e.thumb.match(/sndcdn\.com/i))?e.thumb:null;
-                
               data.dest = e.dest;
               data.mime = e.mime;
               data.size = lib.formatSize(e.size);
@@ -260,7 +252,6 @@ function Websrv(tlib) {
           else if(url[2] == "p" && Number.isInteger(parseInt(url[3]))) { // pagination
             var eps = 50;
             var id = url[3];
-              
             lib.sql.query("select * from `f0ck`.`items` where `id` < ? order by `id` desc limit ?", [id, eps], (err, rows, fields) => {
               var items = {
                 "items": [],
@@ -320,7 +311,6 @@ function Websrv(tlib) {
       res.end('403 - forbidden');
     }
   }).listen(lib.cfg.websrv.port);
-  });
 }
 
 Websrv.prototype.getTpls = () => {