X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ftwitter.rb;h=2ce8142fea50373d6340b63adc10a65c61555a16;hb=052217de30c59206d7025b582d4604557a747470;hp=f56186def4a24f01fc4111329a087e9ce07cb1a3;hpb=036dbad139010cf965dbf66310e425007eb3f8e3;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/twitter.rb b/data/rbot/plugins/twitter.rb
index f56186de..2ce8142f 100644
--- a/data/rbot/plugins/twitter.rb
+++ b/data/rbot/plugins/twitter.rb
@@ -58,6 +58,10 @@ class TwitterPlugin < Plugin
     m.reply [failed_action, "I cannot authenticate to Twitter (OAuth not available)"].join(' because ')
   end
 
+  def report_key_missing(m, failed_action)
+    m.reply [failed_action, "no Twitter Consumer Key/Secret is defined"].join(' because ')
+  end
+
   def help(plugin, topic="")
     return "twitter status [nick] => show nick's (or your) status, use 'twitter friends status [nick]' to also show the friends' timeline | twitter update [status] => updates your status on twitter | twitter authorize => Generates an authorization URL which will give you a PIN to authorize the bot to use your twitter account. | twitter pin [pin] => Finishes bot authorization using the PIN provided by the URL from twitter authorize. | twitter deauthorize => Makes the bot forget your Twitter account. | twitter actions [on|off] => enable/disable twitting of actions (/me does ...)"
   end
@@ -86,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
@@ -94,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
@@ -138,7 +141,11 @@ class TwitterPlugin < Plugin
         end
         return false
       end
-      m.reply texts.reverse.join("\n")
+      if texts.empty?
+        m.reply "No status updates!"
+      else
+        m.reply texts.reverse.join("\n")
+      end
       return true
     else
       if friends
@@ -163,8 +170,9 @@ class TwitterPlugin < Plugin
   end
 
   def authorize(m, params)
+    failed_action = "we can't complete the authorization process"
     unless @has_oauth
-      report_oauth_missing(m, "we can't complete the authorization process")
+      report_oauth_missing(m, failed_action)
       return false
     end
 
@@ -178,14 +186,24 @@ class TwitterPlugin < Plugin
 
     key = @bot.config['twitter.key']
     secret = @bot.config['twitter.secret']
-    @consumer = OAuth::Consumer.new(key, secret, {   
+    if key.empty? or secret.empty?
+      report_key_missing(m, failed_action)
+      return false
+    end
+
+    @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