freifunk-bot

commit 349b50186007d8ac878bcfa939608d5f42b8b5d7
parent a6f5c4f65cf6777ad140ac4206339cafa67900aa
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sun, 11 Sep 2016 12:21:04 +0200

Fix some files

Diffstat:
M
.gitignore
 | 
30
------------------------------
M
handlers/getNodes.js
 | 
10
+++++-----

2 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Logs
 logs
 *.log
@@ -30,32 +29,3 @@ install.js
 uninstall.js
 daemon
 serviceRestart.bat
-=======
-# Logs
-logs
-*.log
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
-node_modules
->>>>>>> master
diff --git a/handlers/getNodes.js b/handlers/getNodes.js
@@ -79,25 +79,25 @@ module.exports = {
                 nodes = JSON.parse(body)
                 _.find(nodes.nodes, function (key) {
                   if (key.hasOwnProperty('flags')) {
-                    if (key["flags"]["online"] === true) {
+                    if (key["flags"]["online"] == true) {
                       count++;
                     }
                   }
                   if (key.hasOwnProperty('status')) {
-                    if (key["status"]["online"] === true) {
+                    if (key["status"]["online"] == true) {
                       count++;
                     }
                   }
                 });
                 var output = "Current nodes in " + name + ": " + count
-                if(handler === "telegram"){
+                if(handler == "telegram"){
                   bot.sendMessage(TfromId, output)
                   botan.track(Tmsg, 'nodes ' + ccode_func)
                 }else {
-                  if(handler === "irc"){
+                  if(handler == "irc"){
                     bot.say(IRCto, output);
                   }else {
-                    if(handler === "slack"){
+                    if(handler == "slack"){
                       slack.slackSend(Schannel, output);
                     }
                   }