return
end
if xml.class == Net::HTTPBadRequest
- if doc.root.elements["error"].text == "Invalid user name supplied" then
+ if doc.root.elements["error"].attributes["code"] == "6" then
m.reply _("%{user} doesn't exist on last.fm, perhaps they need to: lastfm user <username>") % {
:user => user
}
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 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
: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|