freifunk-bot

commit caf71ca970c7c99021f6502bbbb56ff5825122be
parent 4dd4241bab3bf177a00d302d09cd0f498ac5a605
Author: MTRNord <mtrnord1@gmail.com>
Date:   Thu,  5 May 2016 02:02:46 +0200

Try fixing Botan

Diffstat:
M
configs/ircServer.json
 | 
4
++--
M
configs/slackServer.json
 | 
2
+-
M
handlers/telegram.js
 | 
11
+----------
M
handlers/tmp/communities.json
 | 
14
++++++++++++--
M
main.js
 | 
1
-
M
package.json
 | 
2
+-

6 files changed, 17 insertions(+), 17 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/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/telegram.js b/handlers/telegram.js
@@ -2,9 +2,7 @@
 var token = '165809140:AAEEpJP4hgcEsf6ry1Vd6Lp0_8rfRrXFB3A';
 var TelegramBot = require('node-telegram-bot-api');
 var jsonfile = require('jsonfile')
-var async = require('async')
 var getNodes = require('./getNodes.js');
-var fs = require('fs')
 var botan = require('botanio')(token);
 var ent = require('ent');
 var decode = require('ent/decode');
@@ -12,13 +10,6 @@ var decode = require('ent/decode');
 var bot = new TelegramBot(token, {polling: true});
 module.exports = {
   start: function () {
-    // Matches /echo [whatever]
-    bot.onText(/\/echo (.+)/, function (msg, match) {
-      var fromId = msg.from.id;
-      var resp = match[1];
-      bot.sendMessage(fromId, resp);
-    });
-
     bot.onText(/\/nodes (.+)/, function (msg, match) {
       var fromId = msg.chat.id;
       var resp = match[1];
@@ -49,8 +40,8 @@ module.exports = {
             communities_list = communities_list + name + ": " + ccode + "\n"
           }
         }
-        bot.sendMessage(fromId, communities_list);
         botan.track(msg, 'communities');
+        bot.sendMessage(fromId, communities_list);
       });
     });
   }
diff --git a/handlers/tmp/communities.json b/handlers/tmp/communities.json
@@ -32,7 +32,7 @@
 	    },
 	    "FFHL": {
 	        "ccode": "FFHL",
-	    	"name": "Freifunk Lübeck",
+	    	"name": "Freifunk Lübeck",
 	    	"nodesURL": "https://map.luebeck.freifunk.net/data/nodes.json",
 	    	"v6": "fdef:ffc0:3dd7:",
 	    	"v6mask": "/64",
@@ -53,7 +53,7 @@
 	    "FFAC": {
 	        "ccode": "FFAC",
 	    	"name": "Freifunk Aachen",
-	    	"nodesURL": "http://map.freifunk-aachen.de/v2/data/nodes.json",
+	    	"nodesURL": "https://data.aachen.freifunk.net/nodes.json",
 	    	"v6": "2a03:2260:114:",
 	    	"v6mask": "/48",
 	    	"v4": "10.5.0.0",
@@ -189,6 +189,16 @@
 	    	"v4": "10.60.0.0",
 	    	"v4mask": "/16",
 	    	"supported": 0
+	    },
+	    "FFHH": {
+	        "ccode": "FFHH",
+	    	"name": "Freifunk Hamburg",
+	    	"nodesURL": "https://map.hamburg.freifunk.net/nodes.json",
+	    	"v6": "2a03:2267::",
+	    	"v6mask": "/48",
+	    	"v4": "10.112.0.0",
+	    	"v4mask": "/18",
+	    	"supported": 1
 	    }
     }
 }
diff --git a/main.js b/main.js
@@ -10,7 +10,6 @@ var request = require('request');
 var git = require('simple-git');
 var schedule = require('node-schedule');
 var argv = require('yargs').argv;
-var fs = require('fs');
 var params_config = require("./configs/ircServer.json");
 var autoupdate = params_config["autoupdate"];
 
diff --git a/package.json b/package.json
@@ -20,11 +20,11 @@
     "notification"
   ],
   "dependencies": {
-    "async": "^2.0.0-rc.3",
     "botanio": "0.0.6",
     "curlrequest": "*",
     "ent": "git+https://github.com/substack/node-ent.git",
     "express": "^4.13.4",
+    "filecache": "^0.2.1",
     "html-entities": "^1.2.0",
     "irc": "0.4.0",
     "jsonfile": "^2.3.0",