extends: String#ircify_html now has an option to obey non-breakable spaces or turn...

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

diff --git a/data/rbot/plugins/dict.rb b/data/rbot/plugins/dict.rb
index be7923a28b9848e38d57e91a223e1fba6b22c724..ca5f25882147c94cb7c268cb5d27e31dda216fa6 100644 (file)
--- a/data/rbot/plugins/dict.rb
+++ b/data/rbot/plugins/dict.rb
@@ -108,9 +108,14 @@ class DictPlugin < Plugin
     word = params[:word].join\r
     [word, word + "_1"].each { |check|\r
       url = @oxurl % CGI.escape(check)\r
-      h = @bot.httputil.head(url, :max_redir => 5)\r
-      if h\r
-        m.reply("#{word} found: #{url}") unless justcheck\r
+      if params[:british]\r
+        url << "?view=uk"\r
+      end\r
+      h = @bot.httputil.get(url, :max_redir => 5)\r
+      if h and h.match(%r!<h2>#{word}(?:<sup>1</sup>)?</h2>!)\r
+        m.reply("#{word} : #{url}") unless justcheck\r
+        defn = $'\r
+        m.reply("#{Bold}%s#{Bold}: %s" % [word, defn.ircify_html(:nbsp => :space)], :overlong => :truncate)\r
         return true\r
       end\r
     }\r
@@ -119,7 +124,7 @@ class DictPlugin < Plugin
   end\r
 \r
   def is_british?(word)\r
-    return oxford(nil, :word => word, :justcheck => true)\r
+    return oxford(nil, :word => word, :justcheck => true, :british => true)\r
   end\r
 \r
 \r