X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ftwitter.rb;h=a5ca23f87a16ae1d6e1b8ba0fdc1b93d0c578ec7;hb=22e6cefa54de681b131ecb97fc9383ff5e990dfe;hp=b29f51b43b8b5d8e000448bf281eefc56d528233;hpb=b6f846703b5e348a2cb22839ef1f6101b965da81;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/twitter.rb b/data/rbot/plugins/twitter.rb
index b29f51b4..a5ca23f8 100644
--- a/data/rbot/plugins/twitter.rb
+++ b/data/rbot/plugins/twitter.rb
@@ -19,6 +19,9 @@ 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
@@ -39,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 [nick] => show nick's (or your) status | twitter update [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 | twitter actions [on|off] => enable/disable twitting of actions (/me does ...)"
   end
 
   # update the status on twitter
@@ -55,7 +58,12 @@ class TwitterPlugin < Plugin
     user = URI.escape(nick)
 
     count = @bot.config['twitter.status_count']
-    uri = "http://twitter.com/statuses/user_timeline/#{user}.xml?count=#{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
@@ -66,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}"
@@ -118,10 +136,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
 
@@ -131,6 +150,31 @@ class TwitterPlugin < Plugin
     @registry[m.sourcenick + "_password"] = params[:password].to_s
     m.reply "you're all setup!"
   end
+
+  # update on ACTION if the user has enabled the option
+  def ctcp_listen(m)
+    return unless m.action?
+    return unless @registry[m.sourcenick + "_actions"]
+    update_status(m, :status => m.message, :notify => true)
+  end
+
+  # show or toggle action twitting
+  def actions(m, params)
+    case params[:toggle]
+    when 'on'
+      @registry[m.sourcenick + "_actions"] = true
+      m.okay
+    when 'off'
+      @registry.delete(m.sourcenick + "_actions")
+      m.okay
+    else
+      if @registry[m.sourcenick + "_actions"]
+        m.reply _("actions will be twitted")
+      else
+        m.reply _("actions will not be twitted")
+      end
+    end
+  end
 end
 
 # create an instance of our plugin class and register for the "length" command
@@ -138,4 +182,6 @@ 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 actions [:toggle]', :action => "actions", :requirements => { :toggle => /^on|off$/ }
+plugin.map 'twitter :friends [status] [:nick]', :action => "get_status", :requirements => { :friends => /^friends?$/ }, :threaded => true