reaction: document 'reaction move' syntax

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

diff --git a/data/rbot/plugins/search.rb b/data/rbot/plugins/search.rb
index a7ac64cb78427e9ee41a32d58ee74cd4c275a23f..a485b0dfc3052be32ee9c16273c667aae32666a4 100644 (file)
--- a/data/rbot/plugins/search.rb
+++ b/data/rbot/plugins/search.rb
@@ -18,7 +18,7 @@
 GOOGLE_SEARCH = "http://www.google.com/search?oe=UTF-8&q="
 GOOGLE_WAP_SEARCH = "http://www.google.com/wml/search?hl=en&q="
 GOOGLE_WAP_LINK = /<a accesskey="(\d)" href=".*?u=(.*?)">(.*?)<\/a>/im
-GOOGLE_CALC_RESULT = %r{<img src=/images/calc_img\.gif(?: width=40 height=30 alt="")?></td><td>&nbsp;</td><td nowrap(?: dir=ltr)?>(?:<h2 class=r>)?<font size=\+1><b>(.+)</b>(?:</h2>)?</td>}
+GOOGLE_CALC_RESULT = %r{<img src=/images/calc_img\.gif(?: width=40 height=30 alt="")?>.*?<h2 class=r[^>]*><b>(.+?)</b>}
 GOOGLE_COUNT_RESULT = %r{<font size=-1>Results <b>1<\/b> - <b>10<\/b> of about <b>(.*)<\/b> for}
 GOOGLE_DEF_RESULT = %r{<p> (Web definitions for .*?)<br/>(.*?)<br/>(.*?)\s-\s+<a href}
 
@@ -96,6 +96,11 @@ class SearchPlugin < Plugin
       single ? u : "#{n}. #{Bold}#{t}#{Bold}: #{u}"
     }.join(" | ")
 
+    if params[:lucky]
+      m.reply urls.first
+      return
+    end
+
     # If we return a single, full result, change the output to a more compact representation
     if single
       m.reply "Result for %s: %s -- %s" % [what, results, Utils.get_first_pars(urls, first_pars)], :overlong => :truncate
@@ -110,6 +115,11 @@ class SearchPlugin < Plugin
 
   end
 
+  def lucky(m, params)
+    params.merge!(:lucky => true)
+    google(m, params)
+  end
+
   def gcalc(m, params)
     what = params[:words].to_s
     searchfor = CGI.escape(what)
@@ -224,6 +234,7 @@ plugin = SearchPlugin.new
 
 plugin.map "search *words", :action => 'google', :threaded => true
 plugin.map "google *words", :action => 'google', :threaded => true
+plugin.map "lucky *words", :action => 'lucky', :threaded => true
 plugin.map "gcount *words", :action => 'gcount', :threaded => true
 plugin.map "gcalc *words", :action => 'gcalc', :threaded => true
 plugin.map "gdef *words", :action => 'gdef', :threaded => true