X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Flastfm.rb;h=e14eb94b48857ab6b72e4d44adae6840c42fbfcf;hb=1c6b09968776c94b812317dfc4f91f09b5f0817c;hp=4995655ae5a563cd69510667b62ff4bc4f914c49;hpb=d4723313fc391899e5b15600696ae35d3137eb3a;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/lastfm.rb b/data/rbot/plugins/lastfm.rb index 4995655a..e14eb94b 100644 --- a/data/rbot/plugins/lastfm.rb +++ b/data/rbot/plugins/lastfm.rb @@ -5,9 +5,11 @@ # # Author:: Jeremy Voorhis # Author:: Giuseppe "Oblomov" Bilotta +# Author:: Casey Link # # Copyright:: (C) 2005 Jeremy Voorhis # Copyright:: (C) 2007 Giuseppe Bilotta +# Copyright:: (C) 2008 Casey Link # # License:: GPL v2 @@ -49,6 +51,18 @@ class LastFmPlugin < Plugin LASTFM = "http://www.last.fm" + def initialize + super + class << @registry + def store(val) + val + end + def restore(val) + val + end + end + end + def help(plugin, topic="") case (topic.intern rescue nil) when :event, :events @@ -60,9 +74,13 @@ class LastFmPlugin < Plugin when :album "lastfm album => show information on album from last.fm [not implemented yet]" when :now - "lastfm now => show the now playing track from last.fm" + "lastfm now [] => show the now playing track from last.fm" + when :set + "lastfm set => associate your current irc nick with a last.fm user" + when :who + "lastfm who [] => show who is at last.fm. if is empty, show who you are at lastfm." else - "lastfm => lastfm data for on last.fm where 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 [] => lastfm data for on last.fm where in [recenttracks, topartists, topalbums, toptracks, tags, friends, neighbors]. other topics: events, artist, group, song, track, album, now, set, who" end end @@ -141,15 +159,41 @@ class LastFmPlugin < Plugin def now_playing(m, params) opts = { :cache => false } - user = params[:who].to_s + user = nil + if params[:who] then + user = params[:who].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 page = nil begin page = @bot.httputil.get("#{LASTFM}/user/#{user}", opts) if page if page.match(/class="nowListening">\s*\s*(.*)<\/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*.*<\/span><\/a>?(.*)<\/a>\s*<\/td>\s*\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 " end end rescue @@ -198,16 +242,47 @@ class LastFmPlugin < Plugin m.reply "not implemented yet, sorry" end + def set_user(m, params) + user = params[:who].to_s + nick = m.sourcenick + @registry[ nick ] = user + m.reply "Ok, I'll remember that #{nick} is #{user} at last.fm" + end + + def get_user(m, params) + nick = "" + if params[:who] then + nick = params[:who].to_s + else + nick = m.sourcenick + end + if @registry.has_key?( nick ) then + 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 perhaps you need to: lastfm set " + 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 " end end end @@ -219,7 +294,13 @@ plugin.map 'lastfm [:num] event[s] [for] *who', :action => :find_event, :require plugin.map 'lastfm artist *who', :action => :find_artist, :thread => true plugin.map 'lastfm group *who', :action => :find_artist, :thread => true plugin.map 'lastfm now *who', :action => :now_playing, :thread => true +plugin.map 'lastfm now', :action => :now_playing, :thread => true plugin.map 'lastfm track *dunno', :action => :find_track plugin.map 'lastfm song *dunno', :action => :find_track plugin.map 'lastfm album *dunno', :action => :find_album +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