X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ftwitter.rb;h=14b0c2d65f0c01d3e67de1e401bd07a07101d3fa;hb=24bb60775741d3731400f1e430ef6bf3a2e1b933;hp=65bc8eb7bcb1d5539a96a7616b092a67a19e1e9b;hpb=09404cd444f9a9acacbffcb917b180454bf95c7e;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/twitter.rb b/data/rbot/plugins/twitter.rb
index 65bc8eb7..14b0c2d6 100644
--- a/data/rbot/plugins/twitter.rb
+++ b/data/rbot/plugins/twitter.rb
@@ -7,6 +7,7 @@
 # Author:: Giuseppe "Oblomov" Bilotta <giuseppe.bilotta@gmail.com>
 #
 # Copyright:: (C) 2007 Carter Parks
+# Copyright:: (C) 2007 Giuseppe Bilotta
 #
 # Users can setup their twitter username and password and then begin updating
 # twitter whenever
@@ -15,6 +16,13 @@ require 'rexml/rexml'
 require 'cgi'
 
 class TwitterPlugin < Plugin
+  Config.register Config::IntegerValue.new('twitter.status_count',
+    :default => 1, :validate => Proc.new { |v| v > 0 && v <= 10},
+    :desc => "Maximum number of status updates shown by 'twitter status'")
+  Config.register Config::IntegerValue.new('twitter.friends_status_count',
+    :default => 3, :validate => Proc.new { |v| v > 0 && v <= 10},
+    :desc => "Maximum number of status updates shown by 'twitter friends status'")
+
   def initialize
     super
 
@@ -34,7 +42,7 @@ class TwitterPlugin < Plugin
 
   # return a help string when the bot is asked for help on this plugin
   def help(plugin, topic="")
-    return "twitter status [status] => updates your status on twitter | twitter identify [username] [password] => ties your nick to your twitter username and password"
+    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 identify [username] [password] => ties your nick to your twitter username and password"
   end
 
   # update the status on twitter
@@ -47,9 +55,15 @@ class TwitterPlugin < Plugin
       return false
     end
 
+    user = URI.escape(nick)
 
-    # TODO configurable count
-    uri = "http://twitter.com/statuses/user_timeline/#{URI.escape(nick)}.xml?count=3"
+    count = @bot.config['twitter.status_count']
+    unless params[: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"
+    end
 
     response = @bot.httputil.get(uri, :headers => @header, :cache => false)
     debug response
@@ -60,14 +74,24 @@ class TwitterPlugin < Plugin
       begin
         rex = REXML::Document.new(response)
         rex.root.elements.each("status") { |st|
-          month, day, hour, min, sec, year = st.elements['created_at'].text.match(/\w+ (\w+) (\d+) (\d+):(\d+):(\d+) \S+ (\d+)/)[1..6]
-          debug [year, month, day, hour, min, sec].inspect
-          time = Time.local(year.to_i, month, day.to_i, hour.to_i, min.to_i, sec.to_i)
+          # month, day, hour, min, sec, year = st.elements['created_at'].text.match(/\w+ (\w+) (\d+) (\d+):(\d+):(\d+) \S+ (\d+)/)[1..6]
+          # debug [year, month, day, hour, min, sec].inspect
+          # time = Time.local(year.to_i, month, day.to_i, hour.to_i, min.to_i, sec.to_i)
+          time = Time.parse(st.elements['created_at'].text)
           now = Time.now
-          delta = now - time
+          # Sometimes, time can be in the future; invert the relation in this case
+          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})"
-          texts << Utils.decode_html_entities(msg).ircify_html
+          author = ""
+          if params[: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]
+          # 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}"
@@ -90,9 +114,26 @@ class TwitterPlugin < Plugin
       return false
     end
 
-    uri = "http://#{URI.escape(@registry[m.sourcenick + "_username"])}:#{URI.escape(@registry[m.sourcenick + "_password"])}@twitter.com/statuses/update.xml"
+    user = URI.escape(@registry[m.sourcenick + "_username"])
+    pass = URI.escape(@registry[m.sourcenick + "_password"])
+    uri = "http://#{user}:#{pass}@twitter.com/statuses/update.xml"
+
+    msg = params[:status].to_s
+
+    if msg.length > 160
+      m.reply "your status message update is too long, please keep it under 140 characters if possible, 160 characters maximum"
+      return
+    end
+
+    if msg.length > 140
+      m.reply "your status message is longer than 140 characters, which is not optimal, but I'm going to update anyway"
+    end
+
+    source = "source=rbot"
+    msg = "status=#{CGI.escape(msg)}"
+    body = [source,msg].join("&")
 
-    response = @bot.httputil.post(uri, "status=#{CGI.escape(params[:status].to_s)}", :headers => @header)
+    response = @bot.httputil.post(uri, body, :headers => @header)
     debug response
 
     if response.class == Net::HTTPOK
@@ -115,4 +156,5 @@ plugin = TwitterPlugin.new
 plugin.map 'twitter identify :username :password', :action => "identify", :public => false
 plugin.map 'twitter update *status', :action => "update_status", :threaded => true
 plugin.map 'twitter status [:nick]', :action => "get_status", :threaded => true
+plugin.map 'twitter :friends [status] [:nick]', :action => "get_status", :requirements => { :friends => /^friends?$/ }, :threaded => true