From cb8a3f064efa675063133f309b2ff62b5330139e Mon Sep 17 00:00:00 2001
From: Nicholas O'Leary <nick.oleary@gmail.com>
Date: Sun, 24 Nov 2013 16:48:24 +0000
Subject: [PATCH] Twitter doc updates and rate limit fixes

---
 nodes/core/social/27-twitter.html | 17 +++++++++++++++--
 nodes/core/social/27-twitter.js   | 10 +++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/nodes/core/social/27-twitter.html b/nodes/core/social/27-twitter.html
index 2515a3541..b81af1d46 100644
--- a/nodes/core/social/27-twitter.html
+++ b/nodes/core/social/27-twitter.html
@@ -129,7 +129,11 @@
 </script>
 
 <script type="text/x-red" data-help-name="twitter in">
-    <p>Twitter input node. Watches either the public or the user's stream for tweets containing the configured search term.</p>
+    <p>Twitter input node. Can be used to search either:
+    <ul><li>the public or a user's stream for tweets containing the configured search term</li>
+        <li>all tweets by specific users</li>
+        <li>direct messages received by the authenticated user</li>
+    </ul></p>
     <p>Use space for <i>and</i> and comma , for <i>or</i> when searching for multiple terms.</p>
     <p>Sets the <b>msg.topic</b> to <i>tweets/</i> and then appends the senders screen name.</p>
     <p>Sets <b>msg.location</b> to the tweeters location if known.</p>
@@ -151,7 +155,16 @@
         outputs:1,
         icon: "twitter.png",
         label: function() {
-            return this.name||this.tags;
+            if (this.name) {
+                return this.name;
+            }
+            if (this.user == "dm") {
+                var user = RED.nodes.node(this.twitter);
+                return (user?user.label()+" ":"")+"DMs";
+            } else if (this.user == "user") {
+                return this.tags+" tweets";
+            }
+            return this.tags;
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
diff --git a/nodes/core/social/27-twitter.js b/nodes/core/social/27-twitter.js
index 966a643b7..25828face 100644
--- a/nodes/core/social/27-twitter.js
+++ b/nodes/core/social/27-twitter.js
@@ -43,6 +43,14 @@ function TwitterInNode(n) {
             access_token_secret: credentials.access_token_secret
         });
 
+        
+        //setInterval(function() {
+        //        twit.get("/application/rate_limit_status.json",null,function(err,cb) {
+        //                console.log("direct_messages:",cb["resources"]["direct_messages"]);
+        //        });
+        //        
+        //},10000);
+        
         var node = this;
         if (this.user === "user") {
             node.poll_ids = [];
@@ -132,7 +140,7 @@ function TwitterInNode(n) {
                                 node.error(err);
                             }
                         });
-                },65000));
+                },120000));
             });
             
         } else if (this.tags !== "") {