quiz: stop quizzes and timers on cleanup

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / twitter.rb

diff --git a/data/rbot/plugins/twitter.rb b/data/rbot/plugins/twitter.rb
index 1c8f61dd0556b7064e3e21a2b1a9a26659bbd527..2ce8142fea50373d6340b63adc10a65c61555a16 100644 (file)
--- a/data/rbot/plugins/twitter.rb
+++ b/data/rbot/plugins/twitter.rb
@@ -90,7 +90,7 @@ class TwitterPlugin < Plugin
       return false
     end
 
-    count = @bot.config['twitter.friends_status_count']
+    count = friends ? @bot.config['twitter.friends_status_count'] : @bot.config['twitter.status_count']
     user = URI.escape(nick)
     if @has_oauth and @registry.has_key?(m.sourcenick + "_access_token")
         if friends
@@ -98,7 +98,6 @@ class TwitterPlugin < Plugin
           uri = "https://api.twitter.com/1/statuses/friends_timeline.xml?count=#{count}"
           response = @access_token.get(uri).body
         else
-          count = @bot.config['twitter.status_count']
           uri = "https://api.twitter.com/1/statuses/user_timeline.xml?screen_name=#{user}&count=#{count}"
           response = @access_token.get(uri).body
         end
@@ -192,14 +191,19 @@ class TwitterPlugin < Plugin
       return false
     end
 
-    @consumer = OAuth::Consumer.new(key, secret, {   
+    @consumer = OAuth::Consumer.new(key, secret, {
       :site => "https://api.twitter.com",
       :request_token_path => "/oauth/request_token",
       :access_token_path => "/oauth/access_token",
       :authorize_path => "/oauth/authorize"
-      } )
-    @request_token = @consumer.get_request_token
-    @registry[m.sourcenick + "_request_token"] = YAML::dump(@request_token)        
+    } )
+    begin
+      @request_token = @consumer.get_request_token
+    rescue OAuth::Unauthorized
+      m.reply _("My authorization failed! Did you block me? Or is my Twitter Consumer Key/Secret pair incorrect?")
+      return false
+    end
+    @registry[m.sourcenick + "_request_token"] = YAML::dump(@request_token)
     m.reply "Go to this URL to get your authorization PIN, then use 'twitter pin <pin>' to finish authorization: " + @request_token.authorize_url
   end