freifunk-bot

commit 71cd2b7b5007a8d66fca543ce06ed54c30744a8a
parent bd425a0ca96158dcedd8d73eb7f029cafcdfb955
Author: Marcel Radzio <marcel@radzio-sh.de>
Date:   Sat, 19 Dec 2015 00:57:28 +0100

Some optimizings

Diffstat:
M
configs/commands.json
 | 
2
+-
M
configs/params.json
 | 
2
+-
M
handlers/irc.js
 | 
2
+-
M
main.js
 | 
30
++++++++++++++++--------------

4 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/configs/commands.json b/configs/commands.json
@@ -82,7 +82,7 @@
     },
     {
       "keyword": "todo",
-      "message": "- Add config\n-- Add ability to do multiple server connections\n- Add SSH Admin Control Server for editing the bot easily",
+      "message": "- Add ability to do multiple server connections\n- Add SSH Admin Control Server for editing the bot easily",
       "argument": "0",
       "target": "from"
     }
diff --git a/configs/params.json b/configs/params.json
@@ -9,7 +9,7 @@
       "main_channel": "#hackerspace",
       "nickserv_pass": "NordlabBotPass",
       "active": 1,
-      "debug": 0
+      "debug": 1
     }
   ]
 }
 \ No newline at end of file
diff --git a/handlers/irc.js b/handlers/irc.js
@@ -38,7 +38,7 @@ for (var key in params_config["servers"]) {
     }
     if (active == 1) {
       var bot = new irc.Client(serveraddress, botname, {
-        debug: false,
+        debug: debug,
         channels: [main_channel],
         autoRejoin: false,
         autoConnect: false,
diff --git a/main.js b/main.js
@@ -25,22 +25,24 @@ request.get('http://www.nordlab-ev.de/doorstate/status.txt', function (error, re
       door_status = error;
       //console.log(error);
     }
-    // console.log("Current Real State:" + door_status + "\n");
-    // console.log("Current Last State:" + door_status2 + "\n");
-    // console.log("Next Check!");
-    if (door_status2 !== door_status){
-      if (door_status2 !== "1") {
-        door_status2 = door_status;
-        if (door_status == "geschlossen"){
-          door_status = "closed";
+    if (!error && response.statusCode == 200) {
+      // console.log("Current Real State:" + door_status + "\n");
+      // console.log("Current Last State:" + door_status2 + "\n");
+      // console.log("Next Check!");
+      if (door_status2 !== door_status){
+        if (door_status2 !== "1") {
+          door_status2 = door_status;
+          if (door_status == "geschlossen"){
+            door_status = "closed";
+          }else{
+            door_status = "open";
+          }
+          //ADD MODULE RUNTIMES DOWN HERE
+          pushbullet.pushbulletSend(door_status);
+          irc.ircSend(door_status);
         }else{
-          door_status = "open";
+          door_status2 = door_status;
         }
-        //ADD MODULE RUNTIMES DOWN HERE
-        pushbullet.pushbulletSend(door_status);
-        irc.ircSend(door_status);
-      }else{
-        door_status2 = door_status;
       }
     }
     // console.log("WAIT!");