X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Flastfm.rb;h=6482b543067ce63c90a1c8e6d0f3ffeadcd40469;hb=c31697b2d75aa46df9163ebce92ee68fd0f9ce7f;hp=1efb58fd40db571993e6b6ebad1c39242a5157f1;hpb=fdad9f8d3bffb4ff2e2f9380231c7f7e3b0cc5fe;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/lastfm.rb b/data/rbot/plugins/lastfm.rb index 1efb58fd..6482b543 100644 --- a/data/rbot/plugins/lastfm.rb +++ b/data/rbot/plugins/lastfm.rb @@ -28,10 +28,10 @@ class ::LastFmEvent if @artists.length > 10 #more than 10 artists and it floods diff = @artists.length - 10 - @artist_string = @artists[0..10].join(', ') + @artist_string = Bold + @artists[0..10].join(', ') + Bold @artist_string << _(" and %{n} more...") % {:n => diff} else - @artist_string = @artists.join(', ') + @artist_string = Bold + @artists.join(', ') + Bold end end @@ -85,8 +85,10 @@ class LastFmPlugin < Plugin _("lastfm set nick => associate your current irc nick with a last.fm user. lastfm set verb => set your preferred now playing verb. default \"listening\" and \"listened\".") when :who _("lastfm who [] => show who is at last.fm. if is empty, show who you are at lastfm.") + when :compare + _("lastfm compare => show musical taste compatibility between nick1 and nick2.") else - _("lastfm [] => show your or 's now playing track at lastfm. np [] => same as 'lastfm'. other topics: events, artist, album, track, now, set, who") + _("lastfm [] => show your or 's now playing track at lastfm. np [] => same as 'lastfm'. other topics: events, artist, album, track, now, set, who, compare") end end @@ -108,7 +110,7 @@ class LastFmPlugin < Plugin doc = Document.new xml.body if xml.class == Net::HTTPInternalServerError - if doc.root.attributes["status"] == "failed" + if doc.root and doc.root.attributes["status"] == "failed" m.reply doc.root.elements["error"].text else m.reply _("Could not retrieve events") @@ -122,7 +124,7 @@ class LastFmPlugin < Plugin venue = e.elements["venue"].elements["name"].text city = e.elements["venue"].elements["location"].elements["city"].text country = e.elements["venue"].elements["location"].elements["country"].text - h[:location] = Bold + venue + Bold + " #{city}, #{country}" + h[:location] = Underline + venue + Underline + " #{Bold + city + Bold}, #{country}" date = e.elements["startDate"].text.split h[:date] = Time.utc(date[3].to_i, date[2], date[1].to_i) h[:desc] = e.elements["description"].text