11.diff (6044B)
1 diff --git a/configs/ircServer.json b/configs/ircServer.json 2 index 854ebb1..464d34d 100644 3 --- a/configs/ircServer.json 4 +++ b/configs/ircServer.json 5 @@ -9,7 +9,7 @@ 6 "main_channel": "#hackerspace", 7 "nickserv_pass": "FreifunkBotPass", 8 "active": 1, 9 - "debug": 0 10 + "debug": 1 11 }, 12 { 13 "servername": "Hackint", 14 @@ -17,7 +17,7 @@ 15 "main_channel": "#ffnord", 16 "nickserv_pass": "FreifunkBotPass", 17 "active": 1, 18 - "debug": 0 19 + "debug": 1 20 } 21 ] 22 } 23 diff --git a/configs/params.json b/configs/params.json 24 deleted file mode 100644 25 index 0a46d88..0000000 26 --- a/configs/params.json 27 +++ /dev/null 28 @@ -1,15 +0,0 @@ 29 -{ 30 - "botname": "NordlabBot", 31 - "autoupdate": 1, 32 - "disconnect_meassage": "Bot was stopped!", 33 - "servers": [ 34 - { 35 - "servername": "Lugfl", 36 - "serveraddress": "irc.lugfl.de", 37 - "main_channel": "#hackerspace", 38 - "nickserv_pass": "NordlabBotPass", 39 - "active": 1, 40 - "debug": 0 41 - } 42 - ] 43 -} 44 \ No newline at end of file 45 diff --git a/configs/slackServer.json b/configs/slackServer.json 46 index 0556e05..fc1d51a 100644 47 --- a/configs/slackServer.json 48 +++ b/configs/slackServer.json 49 @@ -6,7 +6,7 @@ 50 "devChannel": "#bottest", 51 "token": "xoxb-26176005733-2y9kszxvi0T8isJlwwg1tx9k", 52 "active": 1, 53 - "debug": 0 54 + "debug": 1 55 } 56 ] 57 } 58 diff --git a/handlers/getNodes.js b/handlers/getNodes.js 59 index d10664d..28b1b20 100644 60 --- a/handlers/getNodes.js 61 +++ b/handlers/getNodes.js 62 @@ -21,7 +21,7 @@ var _ = require("lodash"); 63 */ 64 module.exports = { 65 saveNodes: function () { 66 - request.get('https://cdn.rawgit.com/MTRNord/gluon-web-remote/master/configs/communities.json', function (err, res, body) { 67 + request.get('https://cdn.rawgit.com/MTRNord/gluon-web-remote/5bd3a914b3c15af70b3ce46b3bfcc16bbc7b89b5/configs/communities.json', function (err, res, body) { 68 69 if (!err && res.statusCode === 200) { 70 /** 71 @@ -61,11 +61,11 @@ module.exports = { 72 var communities = obj 73 _.find(communities.communities, function (key) { 74 var ccode = key["ccode"]; 75 - if (ccode.toLowerCase() === ccode_func.toLowerCase()) { 76 + if (ccode.toLowerCase() == ccode_func.toLowerCase()) { 77 var nodesFile_link = key["nodesURL"]; 78 var name = key["name"]; 79 request.get(nodesFile_link, function (err, res, body) { 80 - if (!err && res.statusCode === 200) { 81 + if (!err && res.statusCode == 200) { 82 /** 83 * Content of communities 84 * 85 diff --git a/handlers/telegram.js b/handlers/telegram.js 86 index 335bd3f..2283e0d 100644 87 --- a/handlers/telegram.js 88 +++ b/handlers/telegram.js 89 @@ -10,8 +10,6 @@ var TelegramBot = require('node-telegram-bot-api'); 90 var jsonfile = require('jsonfile') 91 var getNodes = require('./getNodes.js'); 92 var botan = require('botanio')(botan_token); 93 -var ent = require('ent'); 94 -var decode = require('ent/decode'); 95 var util = require('util'); 96 var async = require("async"); 97 var _ = require("lodash"); 98 @@ -44,12 +42,11 @@ module.exports = { 99 var resp = match[1]; 100 bot.sendChatAction(fromId, "typing") 101 jsonfile.readFile('handlers/tmp/communities.json', 'utf8', function (err,obj) { 102 - if (err) {console.log(err)} 103 var communities = obj 104 - var communities_list = "" 105 + var communities_list 106 _.find(communities.communities, function (key) { 107 - var ccode = decode(key["ccode"]) 108 - var name = decode(key["name"]) 109 + var ccode = key["ccode"] 110 + var name = key["name"] 111 communities_list = communities_list + name + ": " + ccode + "\n" 112 }); 113 botan.track(msg, 'communities', function (err, res, body) { 114 diff --git a/handlers/tmp/communities.json b/handlers/tmp/communities.json 115 index f5e03f3..22d72de 100644 116 --- a/handlers/tmp/communities.json 117 +++ b/handlers/tmp/communities.json 118 @@ -100,16 +100,6 @@ 119 "v4mask": "/16", 120 "supported": 0 121 }, 122 - "FFRG": { 123 - "ccode": "FFRG", 124 - "name": "Freifunk Ruhrgebiet", 125 - "nodesURL": "http://map.freifunk-ruhrgebiet.de/nodes.json", 126 - "v6": "2a03:2260:50:", 127 - "v6mask": "/48", 128 - "v4": "10.53.0.0", 129 - "v4mask": "/16", 130 - "supported": 1 131 - }, 132 "FFKBU": { 133 "ccode": "FFKBU", 134 "name": "Freifunk K\u00f6ln, Bonn und Umgebung", 135 @@ -140,26 +130,6 @@ 136 "v4mask": "/16", 137 "supported": 0 138 }, 139 - "FFFR": { 140 - "ccode": "FFFR", 141 - "name": "Freifunk Franken", 142 - "nodesURL": "https://netmon.freifunk-franken.de/routerlist.php", 143 - "v6": "", 144 - "v6mask": "/", 145 - "v4": "10.50.64.0", 146 - "v4mask": "/21", 147 - "supported": 0 148 - }, 149 - "FFE": { 150 - "ccode": "FFE", 151 - "name": "Freifunk Essen", 152 - "nodesURL": "http://map.freifunk-ruhrgebiet.de/data/nodes.json", 153 - "v6": "2a03:2260:1005:", 154 - "v6mask": "/64", 155 - "v4": "10.228.0.0", 156 - "v4mask": "/16", 157 - "supported": 1 158 - }, 159 "FFEU": { 160 "ccode": "FFEU", 161 "name": "Freifunk Euskirchen", 162 @@ -180,7 +150,7 @@ 163 "v4mask": "/16", 164 "supported": 1 165 }, 166 - "FFFR1": { 167 + "FFFR": { 168 "ccode": "FFFR1", 169 "name": "Freifunk Freiburg", 170 "nodesURL": "https://freiburg.freifunk.net/ffmap-d3/nodes.json", 171 diff --git a/main.js b/main.js 172 index de15175..1f8d979 100644 173 --- a/main.js 174 +++ b/main.js 175 @@ -14,7 +14,6 @@ var params_config = require("./configs/ircServer.json"); 176 var autoupdate = params_config["autoupdate"]; 177 var async = require("async"); 178 var _ = require("lodash"); 179 -var rl = require("readline") 180 var child = require('child_process') 181 182 //LOAD MODULES DOWN HERE 183 @@ -100,7 +99,7 @@ function GetData(){ 184 } 185 //Handle "[CTRL]+[C]" 186 if (process.platform === "win32") { 187 - rl.createInterface({ 188 + var rl = require("readline").createInterface({ 189 input: process.stdin, 190 output: process.stdout 191 }).setMaxListeners(0);