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, :bold => Bold}
+ 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, :bold => Bold}
+ 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