From 6768c1b42b7967b855620c7ea88bd0eef46f75a6 Mon Sep 17 00:00:00 2001
From: Dave C-J <conway@uk.ibm.com>
Date: Mon, 10 Nov 2014 16:42:49 +0000
Subject: [PATCH] Update Pushbullet Node to allow use of Channels

---
 social/pushbullet/57-pushbullet.html | 15 ++++++++++-----
 social/pushbullet/57-pushbullet.js   | 15 ++++++++++-----
 social/pushbullet/package.json       |  4 ++--
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/social/pushbullet/57-pushbullet.html b/social/pushbullet/57-pushbullet.html
index 37a21943..396b7e98 100644
--- a/social/pushbullet/57-pushbullet.html
+++ b/social/pushbullet/57-pushbullet.html
@@ -19,6 +19,10 @@
         <label for="node-input-title"><i class="fa fa-flag"></i> Title</label>
         <input type="text" id="node-input-title" placeholder="Node-RED">
     </div>
+    <div class="form-row">
+        <label for="node-input-chan"><i class="fa fa-random"></i> Channel</label>
+        <input type="text" id="node-input-chan" placeholder="channel name">
+    </div>
     <div class="form-row">
         <label for="node-config-input-deviceid"><i class="fa fa-user"></i> Device ID</label>
         <input type="text" id="node-config-input-deviceid">
@@ -36,13 +40,13 @@
 </script>
 
 <script type="text/x-red" data-help-name="pushbullet">
-    <p>Uses PushBullet to push the <b>msg.payload</b> to an Android device that has the PushBullet app installed.</p>
+    <p>Uses PushBullet to push the <b>msg.payload</b> to a device that has the PushBullet app installed.</p>
     <p>Optionally uses <b>msg.topic</b> to set the title, if not already set in the properties.</p>
     <p>You need to configure both your <i>API key</i> and the target <i>device ID</i>.
-    The device ID may be passed in as <b>msg.deviceid</b>. You can set these per node in the edit dialog.
-    The old method of storing your credentials in the pushkey.js file in the directory <b>above</b> /node-red is being deprecated.</p>
-    <p><pre>module.exports = { pushbullet:'My-API-KEY', deviceid:'xyzzyWabc' }</pre></p>
-    <p>The deviceid can be found by hovering over your required device on the <a href="https://www.pushbullet.com/">PushBullet website</a>.</p>
+    The device ID may be passed in as <b>msg.deviceid</b>.</p>
+    <p>You can also push to any channels that you own either configured or via <b>msg.channel</b>.</p>
+    The old method of storing your credentials in the pushkey.js file in the directory <b>above</b> /node-red is deprecated.</p>
+    <p>The deviceid can be found by clicking on your required device on the <a href="https://www.pushbullet.com/">PushBullet website</a>, once you have logged in.</p>
 </script>
 
 <script type="text/javascript">
@@ -50,6 +54,7 @@
         category: 'output',
         defaults: {
             title: {value:""},
+            chan: {value:"" },
             name: {value:""}
         },
         color:"#a7c9a0",
diff --git a/social/pushbullet/57-pushbullet.js b/social/pushbullet/57-pushbullet.js
index d8858330..86a69fd3 100644
--- a/social/pushbullet/57-pushbullet.js
+++ b/social/pushbullet/57-pushbullet.js
@@ -33,6 +33,7 @@ module.exports = function(RED) {
     function PushbulletNode(n) {
         RED.nodes.createNode(this,n);
         this.title = n.title;
+        this.chan = n.chan;
         var credentials = RED.nodes.getCredentials(n.id);
         if ((credentials) && (credentials.hasOwnProperty("pushkey"))) { this.pushkey = credentials.pushkey; }
         else {
@@ -48,18 +49,22 @@ module.exports = function(RED) {
         var node = this;
 
         this.on("input",function(msg) {
-            var titl = node.title||msg.topic||"Node-RED";
-            var dev = msg.deviceid||node.deviceid;
+            var titl = node.title || msg.topic || "Node-RED";
+            var dev = node.deviceid || msg.deviceid;
+            var channel = node.chan || msg.chan;
+            if (channel != undefined) {
+                dev = { channel_tag : channel };
+            } else {
+                if (!isNaN(dev)) { dev = Number(dev); }
+            }
             if (typeof(msg.payload) === 'object') {
                 msg.payload = JSON.stringify(msg.payload);
             }
             else { msg.payload = msg.payload.toString(); }
             if (node.pushkey && dev) {
                 try {
-                    if (!isNaN(dev)) { dev = Number(dev); }
                     node.pusher.note(dev, titl, msg.payload, function(err, response) {
-                        if (err) { node.error("Pushbullet error: "+err); }
-                        //console.log(response);
+                        if (err) { node.error("Pushbullet error"); }
                     });
                 }
                 catch (err) {
diff --git a/social/pushbullet/package.json b/social/pushbullet/package.json
index d3648d4b..de4ed94d 100644
--- a/social/pushbullet/package.json
+++ b/social/pushbullet/package.json
@@ -1,9 +1,9 @@
 {
     "name"          : "node-red-node-pushbullet",
-    "version"       : "0.0.1",
+    "version"       : "0.0.2",
     "description"   : "A Node-RED node to send alerts via Pushbullet",
     "dependencies"  : {
-        "pushbullet"   : "1.*.*"
+        "pushbullet"   : "1.4.*"
     },
     "repository" : {
         "type":"git",