X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Ftwitter.rb;h=3ed8e62c1c432ea3e9303550ed2adc8fb4ca3b45;hb=90656f4203a0a989b6fb110d4a07598dd186b84c;hp=16813c60118e1eb8d16ddbbb5dc5550e783cf0a4;hpb=c02cb195e052d4c98540c79407bb752d627e8412;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/twitter.rb b/data/rbot/plugins/twitter.rb
index 16813c60..3ed8e62c 100644
--- a/data/rbot/plugins/twitter.rb
+++ b/data/rbot/plugins/twitter.rb
@@ -38,14 +38,23 @@ class TwitterPlugin < Plugin
     :default => 3, :validate => Proc.new { |v| v > 0 && v <= 10},
     :desc => "Maximum number of status updates shown by 'twitter [home|mentions|retweets] status'")
 
+  URL_PATTERN = %r{twitter\.com/([^/]+)(?:/status/(\d+))?}
+
   def twitter_filter(s)
-    loc = Utils.check_location(s, Regexp.new('twitter\.com/(#!/)?.*/status/\d+'))
+    loc = Utils.check_location(s, URL_PATTERN)
     return nil unless loc
-    id = loc.first.match(/\/status\/(\d+)/)[1]
-
-    response = @app_access_token.get('/1.1/statuses/show/'+id+'.json').body
+    matches = loc.first.match URL_PATTERN
+    if matches[2] # status id matched
+      id = matches[2]
+      url = '/1.1/statuses/show/%s.json' % id
+    else # no status id, get the latest status of that user
+      user = matches[1]
+      url = '/1.1/statuses/user_timeline.json?screen_name=%s&count=1&include_rts=true' % user
+    end
+    response = @app_access_token.get(url).body
     begin
       tweet = JSON.parse(response)
+      tweet = tweet.first if tweet.instance_of? Array
       status = {
         :date => (Time.parse(tweet["created_at"]) rescue "<unknown>"),
         :id => (tweet["id_str"] rescue "<unknown>"),
@@ -57,7 +66,7 @@ class TwitterPlugin < Plugin
       }
       status[:nicedate] = String === status[:date] ? status[:date] : Utils.timeago(status[:date])
       return {
-        :title => "@#{status[:user_nick]}: #{status[:text]}",
+        :title => "@#{status[:user_nick]}",
         :content => "#{status[:text]} (#{status[:nicedate]} via #{status[:source]})"
       }
     rescue