twitter plugin: use the correct time

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / urban.rb

diff --git a/data/rbot/plugins/urban.rb b/data/rbot/plugins/urban.rb
index 0b75febea9f024dbcb74a77760c28f61236e5f7c..0c7d98387cf8a10b466a7de1a95c172f02b2c01f 100644 (file)
--- a/data/rbot/plugins/urban.rb
+++ b/data/rbot/plugins/urban.rb
@@ -1,5 +1,3 @@
-require 'uri'
-
 class UrbanPlugin < Plugin
 
   def help( plugin, topic="")
@@ -12,13 +10,14 @@ class UrbanPlugin < Plugin
 
     if words.empty?
       resp = @bot.httputil.head('http://www.urbandictionary.com/random.php',
-                               :max_redir => -1)
+                               :max_redir => -1,
+                               :cache => false)
       if resp.code == "302" && (loc = resp['location'])
         words = URI.unescape(loc.match(/define.php\?term=(.*)$/)[1]) rescue nil
       end
     end
     # we give a very high 'skip' because this will allow us to get the number of definitions by retrieving the previous definition
-    uri = "http://www.urbanwap.com/search.php?term=#{URI.escape words}&skip=65536"
+    uri = "http://www.urbanwap.com/search.php?term=#{CGI.escape words}&skip=65536"
     page = @bot.httputil.get(uri)
     if page.nil?
       m.reply "Couldn't retrieve an urban dictionary definition of #{words}"
@@ -39,7 +38,7 @@ class UrbanPlugin < Plugin
       n = numdefs
     end
     if n < numdefs
-      uri = "http://www.urbanwap.com/search.php?term=#{URI.escape words}&skip=#{n-1}"
+      uri = "http://www.urbanwap.com/search.php?term=#{CGI.escape words}&skip=#{n-1}"
       page = @bot.httputil.get(uri)
       if page.nil?
         case n % 10