fix http usage, other tweaks

1 files changed, 11 insertions, 11 deletions

diff --git a/rbot/plugins/google.rb b/rbot/plugins/google.rb
index 5fa466e7..2e9aacba 100644
--- a/rbot/plugins/google.rb
+++ b/rbot/plugins/google.rb
@@ -29,21 +29,21 @@ class GooglePlugin < Plugin
 
     http = Net::HTTP.new("www.google.com", 80, proxy_host, proxy_port)
 
-    http.start {|http|
-      begin
-        resp , = http.get(query)
+    begin
+      http.start {|http|
+        resp = http.get(query)
         if resp.code == "302"
           result = resp['location']
         end
-      rescue => e
-        p e
-        if e.response && e.response['location']
-          result = e.response['location']
-        else
-          result = "error!"
-        end
+      }
+    rescue => e
+      p e
+      if e.response && e.response['location']
+        result = e.response['location']
+      else
+        result = "error!"
       end
-    }
+    end
     m.reply "#{m.params}: #{result}"
   end
 end