Merge pull request #32 from cjzhang/master

Update tumblrdottext to work with api v 1.1

Author: kgc

botmily/config.py

@@ -28,6 +28,10 @@ def getConfig():
     global tumblr_tumbling
     global wolframalpha_api_key
     global lastfm_api_key
+    global oauth_token
+    global oauth_secret
+    global consumer_key
+    global consumer_secret
     config = ConfigParser()
     config.read('config.ini')
     name = config.get('main', 'name')
@@ -41,6 +45,10 @@ def getConfig():
     tumblr_title = config.get('tumblr','post_titles')
     wolframalpha_api_key = config.get('wolframalpha', 'api_key')
     lastfm_api_key = config.get('lastfm', 'api_key')
+    oauth_token = config.get('twitter', 'oauth_token')
+    oauth_secret = config.get('twitter', 'oauth_secret')
+    consumer_key = config.get('twitter', 'consumer_key')
+    consumer_secret = config.get('twitter', 'consumer_secret')
     print("I will use the name: " + name)
     print("I will connect to the server: " + server)
     print("I will connect to the channels: " + ", ".join(channels))

plugins/tumblrdottext.py

@@ -3,12 +3,16 @@
 from __future__ import unicode_literals
 
 from twitter import Twitter
+from twitter import OAuth
+from botmily import config
 import random
-#randomly return one of the last 50 tweets from https://twitter.com/TumblrTXT
+#randomly return one of the last 200 tweets from https://twitter.com/TumblrTXT
+#rate limit is 300 requests per 15 minutes
 def tumblr(message_data, bot):
-    t = Twitter(api_version=1)
-    tweetno = random.randint(0,49)
-    tweet = t.statuses.user_timeline.tumblrtxt(count=50)[tweetno]
+    t = Twitter(api_version=1.1, auth=OAuth(config.oauth_token,
+    config.oauth_secret, config.consumer_key, config.consumer_secret))
+    tweetno = random.randint(0,199)
+    tweet = t.statuses.user_timeline.tumblrtxt(count=200)[tweetno]
     return tweet['text']