Bug in topic plugin introduced in [440]

[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 dd275e2de7a995e1c90f3fdc7d7287d5a3dcc1a2..c317eab1697e5d1782d772fff25cfdba1f8a0de0 100644 (file)
--- a/data/rbot/plugins/urban.rb
+++ b/data/rbot/plugins/urban.rb
@@ -1,11 +1,18 @@
 require 'cgi'
-require 'rubyful_soup'
+begin
+  require 'rubyful_soup'
+rescue
+  warning "could not load rubyful_soup, urban dictionary disabled"
+  warning "please get it from http://www.crummy.com/software/RubyfulSoup/"
+  warning "or install it via gem"
+  return
+end
 require 'uri/common'
 
 class UrbanPlugin < Plugin
 
   def help( plugin, topic="")
-    "~urban [word] [n]. Give the [n]th definition of [word] from urbandictionary.com."
+    "urban [word] [n]. Give the [n]th definition of [word] from urbandictionary.com."
   end
 
   def privmsg( m )
@@ -30,11 +37,11 @@ class UrbanPlugin < Plugin
       uri = URI.parse( "http://www.urbandictionary.com/define.php?term=#{ URI.escape query}" )
     end
 
-    soup = BeautifulSoup.new( @bot.httputil.get( uri ) )
+    soup = BeautifulSoup.new( @bot.httputil.get_cached( uri ) )
     if titleNavi = soup.find_all( 'td', :attrs => { 'class' => 'def_word' } )[0] then
       title = titleNavi.contents
       results = soup.find_all( 'div', :attrs => { 'class' => 'def_p' } )
-      debug PP.pp(results,'')
+      # debug PP.pp(results,'')
       output = Array.new
       if results[definitionN] then
         results[definitionN].p.contents.each { |s| output.push( strip_tags( s.to_s ) ) }