X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Flastfm.rb;h=e14eb94b48857ab6b72e4d44adae6840c42fbfcf;hb=1c6b09968776c94b812317dfc4f91f09b5f0817c;hp=42f2ea9eda30781350c20b2a58df12896db4694f;hpb=fdd3325c6958b9d7d4a67f2fcf541f006fcfc305;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/lastfm.rb b/data/rbot/plugins/lastfm.rb
index 42f2ea9e..e14eb94b 100644
--- a/data/rbot/plugins/lastfm.rb
+++ b/data/rbot/plugins/lastfm.rb
@@ -80,7 +80,7 @@ class LastFmPlugin < Plugin
     when :who
       "lastfm who [<nick>] => show who <nick> is at last.fm. if <nick> is empty, show who you are at lastfm."
     else
-      "lastfm => show your now playing track at lastfm. lastfm <function> <user> => lastfm data for <user> on last.fm where <function> in [recenttracks, topartists, topalbums, toptracks, tags, friends, neighbors]. other topics: events, artist, group, song, track, album, now"
+      "lastfm => show your now playing track at lastfm. lastfm <function> [<user>] => lastfm data for <user> on last.fm where <function> in [recenttracks, topartists, topalbums, toptracks, tags, friends, neighbors]. other topics: events, artist, group, song, track, album, now, set, who"
     end
   end
 
@@ -165,17 +165,35 @@ class LastFmPlugin < Plugin
     elsif @registry.has_key? ( m.sourcenick ) then
       user = @registry[ m.sourcenick ]
     else
-      m.reply "I don't know who you are on last.fm. Use 'lastfm set username' to identify yourself."
-      return
+      # m.reply "I don't know who you are on last.fm. Use 'lastfm set username' to identify yourself."
+      # return
+      user = m.sourcenick
     end
     page = nil
     begin
       page = @bot.httputil.get("#{LASTFM}/user/#{user}", opts)
       if page
         if page.match(/class="nowListening">\s*<td class="subject">\s*<a href="\/music.*?">(.*)<\/a>\s*<\/td/)
-          m.reply "#{user} is jammin to #{$1.ircify_html}"
+          track = $1
+          if page.match(/class="nowListening currentStation">\s*(.*?)<\/a>/m)
+            m.reply "#{user} is #{$1.ircify_html}"
+          end
+          m.reply "#{user} is jammin to #{track.ircify_html}"
+        elsif page.match(/class="justlistened first">\s*<td class="subject">.*<\/span><\/a>?(.*)<\/a>\s*<\/td>\s*<td class="date">\s*just/m)
+          m.reply "#{user} just jammed to #{$1.ircify_html}"
+        else
+          params[:action] = "recenttracks"
+          params[:user] = user
+          lastfm(m, params)
+        end
+      else
+        return if params[:recurs]
+        if @registry.has_key? ( user ) then
+          params[:who] = @registry[ user ]
+          params[:recurs] = true
+          now_playing(m, params)
         else
-          m.reply "#{user} isn't listening to anything right now."
+          m.reply "#{user} doesn't exist at last.fm. Perhaps you need to: lastfm set <username>"
         end
       end
     rescue
@@ -242,20 +260,29 @@ class LastFmPlugin < Plugin
       user = @registry[ nick ]
       m.reply "#{nick} is #{user} at last.fm"
     else
-      m.reply "Sorry, I don't know who #{nick} is at last.fm"
+      m.reply "Sorry, I don't know who #{nick} is at last.fm perhaps you need to: lastfm set <username>"
     end
   end
 
   def lastfm(m, params)
     action = params[:action].intern
     action = :neighbours if action == :neighbors
-    user = params[:user]
+    user = nil
+    if params[:user] then
+      user = params[:user].to_s
+    elsif @registry.has_key? ( m.sourcenick ) then
+      user = @registry[ m.sourcenick ]
+    else
+      # m.reply "I don't know who you are on last.fm. Use 'lastfm set username' to identify yourself."
+      # return
+      user = m.sourcenick
+    end
     begin
       data = @bot.httputil.get("http://ws.audioscrobbler.com/1.0/user/#{user}/#{action}.txt")
       m.reply "#{action} for #{user}:"
       m.reply data.to_a[0..3].map{|l| l.split(',',2)[-1].chomp}.join(", ")
     rescue
-      m.reply "could not find #{action} for #{user} (is #{user} a user?)"
+      m.reply "could not find #{action} for #{user} (is #{user} a user?). perhaps you need to: lastfm set <username>"
     end
   end
 end
@@ -275,4 +302,5 @@ plugin.map 'lastfm set *who', :action => :set_user, :thread => true
 plugin.map 'lastfm who *who', :action => :get_user, :thread => true
 plugin.map 'lastfm who', :action => :get_user, :thread => true
 plugin.map 'lastfm :action *user', :thread => true
+plugin.map 'lastfm :action', :thread => true
 plugin.map 'lastfm', :action => :now_playing, :thread => true