freifunk-bot

commit 941ef2fe5575b30f0a744fb034523df7ac213aa2
parent 1ccba243a526e973970f5090887728b8e2caf6b8
Author: Marcel <MTRNord@users.noreply.github.com>
Date:   Sun, 11 Sep 2016 12:53:23 +0200

Merge pull request #11 from MTRNord/v0.0.2

fix nodes feature
Diffstat:
M
configs/ircServer.json
 | 
4
++--
D
configs/params.json
 | 
16
----------------
M
configs/slackServer.json
 | 
2
+-
M
handlers/getNodes.js
 | 
6
+++---
M
handlers/telegram.js
 | 
9
+++------
M
handlers/tmp/communities.json
 | 
32
+-------------------------------
M
main.js
 | 
3
+--

7 files changed, 11 insertions(+), 61 deletions(-)
diff --git a/configs/ircServer.json b/configs/ircServer.json
@@ -9,7 +9,7 @@
       "main_channel": "#hackerspace",
       "nickserv_pass": "FreifunkBotPass",
       "active": 1,
-      "debug": 0
+      "debug": 1
     },
     {
       "servername": "Hackint",
@@ -17,7 +17,7 @@
       "main_channel": "#ffnord",
       "nickserv_pass": "FreifunkBotPass",
       "active": 1,
-      "debug": 0
+      "debug": 1
     }
   ]
 }
diff --git a/configs/params.json b/configs/params.json
@@ -1,15 +0,0 @@
-{
-  "botname": "NordlabBot",
-  "autoupdate": 1,
-  "disconnect_meassage": "Bot was stopped!",
-  "servers": [
-    {
-      "servername": "Lugfl",
-      "serveraddress": "irc.lugfl.de",
-      "main_channel": "#hackerspace",
-      "nickserv_pass": "NordlabBotPass",
-      "active": 1,
-      "debug": 0
-    }
-  ]
-}
-\ No newline at end of file
diff --git a/configs/slackServer.json b/configs/slackServer.json
@@ -6,7 +6,7 @@
       "devChannel": "#bottest",
       "token": "xoxb-26176005733-2y9kszxvi0T8isJlwwg1tx9k",
       "active": 1,
-      "debug": 0
+      "debug": 1
     }
   ]
 }
diff --git a/handlers/getNodes.js b/handlers/getNodes.js
@@ -21,7 +21,7 @@ var _ = require("lodash");
  */
 module.exports = {
   saveNodes: function () {
-    request.get('https://cdn.rawgit.com/MTRNord/gluon-web-remote/master/configs/communities.json', function (err, res, body) {
+    request.get('https://cdn.rawgit.com/MTRNord/gluon-web-remote/5bd3a914b3c15af70b3ce46b3bfcc16bbc7b89b5/configs/communities.json', function (err, res, body) {
 
       if (!err && res.statusCode === 200) {
         /**
@@ -61,11 +61,11 @@ module.exports = {
       var communities = obj
       _.find(communities.communities, function (key) {
         var ccode = key["ccode"];
-        if (ccode.toLowerCase() === ccode_func.toLowerCase()) {
+        if (ccode.toLowerCase() == ccode_func.toLowerCase()) {
           var nodesFile_link = key["nodesURL"];
           var name = key["name"];
           request.get(nodesFile_link, function (err, res, body) {
-            if (!err && res.statusCode === 200) {
+            if (!err && res.statusCode == 200) {
               /**
                 * Content of communities
                 *
diff --git a/handlers/telegram.js b/handlers/telegram.js
@@ -10,8 +10,6 @@ var TelegramBot = require('node-telegram-bot-api');
 var jsonfile = require('jsonfile')
 var getNodes = require('./getNodes.js');
 var botan = require('botanio')(botan_token);
-var ent = require('ent');
-var decode = require('ent/decode');
 var util = require('util');
 var async = require("async");
 var _ = require("lodash");
@@ -44,12 +42,11 @@ module.exports = {
           var resp = match[1];
           bot.sendChatAction(fromId, "typing")
           jsonfile.readFile('handlers/tmp/communities.json', 'utf8', function (err,obj) {
-            if (err) {console.log(err)}
             var communities = obj
-            var communities_list = ""
+            var communities_list
             _.find(communities.communities, function (key) {
-                var ccode = decode(key["ccode"])
-                var name = decode(key["name"])
+                var ccode = key["ccode"]
+                var name = key["name"]
                 communities_list = communities_list + name + ": " + ccode + "\n"
             });
             botan.track(msg, 'communities', function (err, res, body) {
diff --git a/handlers/tmp/communities.json b/handlers/tmp/communities.json
@@ -100,16 +100,6 @@
 	    	"v4mask": "/16",
 	    	"supported": 0
 	    },
-	    "FFRG": {
-	        "ccode": "FFRG",
-	    	"name": "Freifunk Ruhrgebiet",
-	    	"nodesURL": "http://map.freifunk-ruhrgebiet.de/nodes.json",
-	    	"v6": "2a03:2260:50:",
-	    	"v6mask": "/48",
-	    	"v4": "10.53.0.0",
-	    	"v4mask": "/16",
-	    	"supported": 1
-	    },
 	    "FFKBU": {
 	        "ccode": "FFKBU",
 	    	"name": "Freifunk K\u00f6ln, Bonn und Umgebung",
@@ -140,26 +130,6 @@
 	    	"v4mask": "/16",
 	    	"supported": 0
 	    },
-	    "FFFR": {
-	        "ccode": "FFFR",
-	    	"name": "Freifunk Franken",
-	    	"nodesURL": "https://netmon.freifunk-franken.de/routerlist.php",
-	    	"v6": "",
-	    	"v6mask": "/",
-	    	"v4": "10.50.64.0",
-	    	"v4mask": "/21",
-	    	"supported": 0
-	    },
-	    "FFE": {
-	        "ccode": "FFE",
-	    	"name": "Freifunk Essen",
-	    	"nodesURL": "http://map.freifunk-ruhrgebiet.de/data/nodes.json",
-	    	"v6": "2a03:2260:1005:",
-	    	"v6mask": "/64",
-	    	"v4": "10.228.0.0",
-	    	"v4mask": "/16",
-	    	"supported": 1
-	    },
 	    "FFEU": {
 	        "ccode": "FFEU",
 	    	"name": "Freifunk Euskirchen",
@@ -180,7 +150,7 @@
 	    	"v4mask": "/16",
 	    	"supported": 1
 	    },
-	    "FFFR1": {
+	    "FFFR": {
 	        "ccode": "FFFR1",
 	    	"name": "Freifunk Freiburg",
 	    	"nodesURL": "https://freiburg.freifunk.net/ffmap-d3/nodes.json",
diff --git a/main.js b/main.js
@@ -14,7 +14,6 @@ var params_config = require("./configs/ircServer.json");
 var autoupdate = params_config["autoupdate"];
 var async = require("async");
 var _ = require("lodash");
-var rl = require("readline")
 var child = require('child_process')
 
 //LOAD MODULES DOWN HERE
@@ -100,7 +99,7 @@ function GetData(){
 }
 //Handle "[CTRL]+[C]"
 if (process.platform === "win32") {
-	rl.createInterface({
+	var rl = require("readline").createInterface({
 		input: process.stdin,
 		output: process.stdout
 	}).setMaxListeners(0);