X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ftwitter.rb;h=ec5e3b92a474e36cf9565c3ac1f54f135eee8b28;hb=16336b4a240a4265d1f2df1e30d7b68d3a924287;hp=0ac88ef76bfe727885ae3010d1be8902e90a1f14;hpb=e999932b5e4971febc4aa2f255b907e2fc9cefaf;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/twitter.rb b/data/rbot/plugins/twitter.rb
index 0ac88ef7..ec5e3b92 100644
--- a/data/rbot/plugins/twitter.rb
+++ b/data/rbot/plugins/twitter.rb
@@ -50,6 +50,8 @@ class TwitterPlugin < Plugin
 
     nick = params[:nick] || @registry[m.sourcenick + "_username"]
 
+    friends = params[:friends]
+
     if not nick
       m.reply "you should specify the username of the twitter touse, or identify using 'twitter identify [username] [password]'"
       return false
@@ -58,11 +60,18 @@ class TwitterPlugin < Plugin
     user = URI.escape(nick)
 
     count = @bot.config['twitter.status_count']
-    unless params[:friends]
+    unless friends
       uri = "http://twitter.com/statuses/user_timeline/#{user}.xml?count=#{count}"
     else
       count = @bot.config['twitter.friends_status_count']
-      uri = "http://twitter.com/statuses/friends_timeline/#{user}.xml"
+      auth = ""
+      if m.private?
+        auth << URI.escape(@registry[m.sourcenick + "_username"])
+        auth << ":"
+        auth << URI.escape(@registry[m.sourcenick + "_password"])
+        auth << "@"
+      end
+      uri = "http://#{auth}twitter.com/statuses/friends_timeline/#{user}.xml"
     end
 
     response = @bot.httputil.get(uri, :headers => @header, :cache => false)
@@ -83,24 +92,34 @@ class TwitterPlugin < Plugin
           delta = ((time > now) ? time - now : now - time)
           msg = st.elements['text'].to_s + " (#{Utils.secs_to_string(delta.to_i)} ago via #{st.elements['source'].to_s})"
           author = ""
-          if params[:friends]
+          if friends
             author = Utils.decode_html_entities(st.elements['user'].elements['name'].text) + ": " rescue ""
           end
           texts << author+Utils.decode_html_entities(msg).ircify_html
         }
-        if params[:friends]
+        if friends
           # friends always return the latest 20 updates, so we clip the count
           texts[count..-1]=nil
         end
       rescue
         error $!
-        m.reply "could not parse status for #{nick}"
+        if friends
+          m.reply "could not parse status for #{nick}'s friends"
+        else
+          m.reply "could not parse status for #{nick}"
+        end
         return false
       end
       m.reply texts.reverse.join("\n")
       return true
     else
-      m.reply "could not get status for #{nick}"
+      if friends
+        rep = "could not get status for #{nick}'s friends"
+        rep << ", try asking in private" unless m.private?
+      else
+        rep = "could not get status for #{nick}"
+      end
+      m.reply rep
       return false
     end
   end
@@ -136,10 +155,11 @@ class TwitterPlugin < Plugin
     response = @bot.httputil.post(uri, body, :headers => @header)
     debug response
 
+    reply_method = params[:notify] ? :notify : :reply
     if response.class == Net::HTTPOK
-      m.reply "status updated"
+      m.__send__(reply_method, "status updated")
     else
-      m.reply "could not update status"
+      m.__send__(reply_method, "could not update status")
     end
   end
 
@@ -154,7 +174,7 @@ class TwitterPlugin < Plugin
   def ctcp_listen(m)
     return unless m.action?
     return unless @registry[m.sourcenick + "_actions"]
-    update_status(m, :status => m.message)
+    update_status(m, :status => m.message, :notify => true)
   end
 
   # show or toggle action twitting
@@ -164,7 +184,7 @@ class TwitterPlugin < Plugin
       @registry[m.sourcenick + "_actions"] = true
       m.okay
     when 'off'
-      @registry[m.sourcenick + "_actions"] = false
+      @registry.delete(m.sourcenick + "_actions")
       m.okay
     else
       if @registry[m.sourcenick + "_actions"]