elsif venue
begin
venues = search_venue_by(:name => venue.to_s, :limit => 1)
- rescue Exception => e
- error e
+ rescue Exception => err
+ error err
m.reply _("an error occurred looking for venue %{venue}: %{e}") % {
:venue => venue.to_s,
- :e => e.message
+ :e => err.message
}
end
return
end
if xml.class == Net::HTTPBadRequest
- if doc.root.elements["error"].text == "Invalid user name supplied" then
- m.reply _("%{user} doesn't exist on last.fm, perhaps they need to: lastfm user <username>") % {
- :user => user
+ if doc.root.elements["error"].attributes["code"] == "6" then
+ m.reply _("%{user} doesn't exist on last.fm, perhaps they need to: %{prefix}lastfm set user <username>") % {
+ :user => user,
+ :prefix => @bot.config['core.address_prefix'].first
}
return
else
if @registry.has_key? "#{m.sourcenick}_verb_present"
verb = @registry["#{m.sourcenick}_verb_present"]
end
- reply = _("%{u} %{v} \"%{t}\" by %{a}%{b}") % {:u => user, :v => verb, :t => track, :a => artist, :b => album}
+ reply = _("%{u} %{v} \"%{t}\" by %{bold}%{a}%{bold}%{b}") % {:u => user, :v => verb, :t => track, :a => artist, :b => album, :bold => Bold}
else
verb = _("listened to")
if @registry.has_key? "#{m.sourcenick}_verb_past"
verb = @registry["#{m.sourcenick}_verb_past"]
end
ago = Utils.timeago(past)
- reply = _("%{u} %{v} \"%{t}\" by %{a}%{b} %{p}") % {:u => user, :v => verb, :t => track, :a => artist, :b => album, :p => ago}
+ reply = _("%{u} %{v} \"%{t}\" by %{bold}%{a}%{bold}%{b} %{p};") % {:u => user, :v => verb, :t => track, :a => artist, :b => album, :p => ago, :bold => Bold}
end
- reply << _("; see %{uri} for more") % { :uri => "http://www.last.fm/user/#{CGI.escape user}"}
+ if @bot.plugins['spotify'] && Object.const_defined?('Spotify')
+ if track = Spotify.search(:track, "#{artist} #{track}")
+ reply << _(" [%{u}%{url}%{u}]") % {:u => Underline, :url => track.url}
+ end
+ end
+
+ reply << _(" -- see %{uri} for more") % { :uri => "http://www.last.fm/user/#{CGI.escape user}"}
m.reply reply
end
if results > 0
begin
hits = []
- doc.root.each_element("results/trackmatches/track") do |track|
+ doc.root.each_element("results/trackmatches/track") do |trck|
hits << _("%{bold}%{t}%{bold} by %{bold}%{a}%{bold} (%{n} listeners)") % {
- :t => track.elements["name"].text,
- :a => track.elements["artist"].text,
- :n => track.elements["listeners"].text,
+ :t => trck.elements["name"].text,
+ :a => trck.elements["artist"].text,
+ :n => trck.elements["listeners"].text,
:bold => Bold
}
end
begin
res = @bot.httputil.get_response(uri)
raise _("no response body") unless res.body
- rescue Exception => e
- m.reply _("I had problems accessing last.fm: %{e}") % {:e => e.message}
+ rescue Exception => err
+ m.reply _("I had problems accessing last.fm: %{e}") % {:e => err.message}
return
end
doc = Document.new(res.body)
:user => user,
:total => friends.size,
:friends => Utils.comma_list(friends.shuffle[0, num]),
- :uri => "http://www.last.fm/user/#{CGI.escape user}/friends",
- :seemore => seemore
+ :seemore => seemore % { :uri => "http://www.last.fm/user/#{CGI.escape user}/friends" }
}
when :lovedtracks
loved = doc.root.get_elements("lovedtracks/track").map do |track|
else
reply = _("%{user} has loved %{total} tracks, including %{tracks}%{seemore}")
end
+
m.reply reply % {
:user => user,
:total => loved.size,
:tracks => Utils.comma_list(loved_prep),
- :uri => "http://www.last.fm/user/#{CGI.escape user}/library/loved",
- :seemore => seemore
+ :seemore => seemore % { :uri => "http://www.last.fm/user/#{CGI.escape user}/library/loved" }
}
when :neighbours
nbrs = doc.root.get_elements("neighbours/user").map do |u|
m.reply reply % {
:user => user,
:nbrs => Utils.comma_list(nbrs.shuffle[0, num]),
- :uri => "http://www.last.fm/user/#{CGI.escape user}/neighbours",
- :seemore => seemore
+ :seemore => seemore % { :uri => "http://www.last.fm/user/#{CGI.escape user}/neighbours" }
}
when :recenttracks
tracks = doc.root.get_elements("recenttracks/track").map do |track|
event_map_options = {
:action => :find_events,
- :requirements => { :num => /\d+/ },
+ :requirements => {
+ :num => /\d+/,
+ :sort_order => /(?:asc|desc)(?:ending)?/
+ },
:thread => true
}
plugin = LastFmPlugin.new
-plugin.map 'lastfm [:num] event[s] in *location [sort[ed] by :sort_by] [in] [:sort_order] [order]', event_map_options.dup
-plugin.map 'lastfm [:num] event[s] by *who [sort[ed] by :sort_by] [in] [:sort_order] [order]', event_map_options.dup
-plugin.map 'lastfm [:num] event[s] at *venue [sort[ed] by :sort_by] [in] [:sort_order] [order]', event_map_options.dup
-plugin.map 'lastfm [:num] event[s] [for] *who [sort[ed] by :sort_by] [in] [:sort_order] [order]', event_map_options.dup
+plugin.map 'lastfm [:num] event[s] in *location [sort[ed] by :sort_by] [[in] :sort_order [order]]', event_map_options.dup
+plugin.map 'lastfm [:num] event[s] by *who [sort[ed] by :sort_by] [[in] :sort_order [order]]', event_map_options.dup
+plugin.map 'lastfm [:num] event[s] at *venue [sort[ed] by :sort_by] [[in] :sort_order [order]]', event_map_options.dup
+plugin.map 'lastfm [:num] event[s] [for] *who [sort[ed] by :sort_by] [[in] :sort_order [order]]', event_map_options.dup
plugin.map 'lastfm artist *artist', :action => :find_artist, :thread => true
plugin.map 'lastfm album *album [by *artist]', :action => :find_album
plugin.map 'lastfm track *track', :action => :find_track, :thread => true