]> git.netwichtig.de Git - user/henk/code/ruby/rbot.git/commitdiff
last.fm plugin: fixed taste comparison xml parsing failing in case of nonexistent...
authorRaine Virta <rane@kapsi.fi>
Thu, 12 Feb 2009 22:22:52 +0000 (00:22 +0200)
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Sat, 14 Feb 2009 21:24:17 +0000 (22:24 +0100)
data/rbot/plugins/lastfm.rb

index 96bdaa485bb551022e33d2a21fd88e9dc2fb1ea9..f9fb1fd35f489e71643881c072b7ddc69660ec29 100644 (file)
@@ -158,15 +158,16 @@ class LastFmPlugin < Plugin
       m.reply _("last.fm parsing failed")
       return
     end
-    if xml.class == Net::HTTPInternalServerError
+    if xml.class == Net::HTTPBadRequest
       if doc.root.elements["error"].attributes["code"] == "7" then
         error = doc.root.elements["error"].text
         error.match(/Invalid username: \[(.*)\]/);
-        if @registry.has_key? $1 and not params[:recurs]
-          if user1 == $1
-            params[:user1] = @registry[ $1 ]
-          elsif user2 == $1
-            params[:user2] = @registry[ $1 ]
+        baduser = $1
+        if @registry.has_key? baduser and not params[:recurs]
+          if user1 == baduser
+            params[:user1] = @registry[baduser]
+          elsif user2 == baduser
+            params[:user2] = @registry[baduser]
           end
           params[:recurs] = true
           tasteometer(m, params)