(Web definitions for .*?) ').pre_match.scan(GOOGLE_WAP_LINK)
+
if results.length == 0
m.reply "no results found for #{what}"
return
end
+
single ||= (results.length==1)
+
urls = Array.new
+ n = 0
results = results[0...hits].map { |res|
- n = res[0]
- t = Utils.decode_html_entities res[2].gsub(filter, '').strip
- u = URI.unescape res[1]
+ n += 1
+ t = res[2].ircify_html(:img => "[%{src} %{alt} %{dimensions}]").strip
+ u = URI.unescape(res[0] || res[1])
urls.push(u)
- single ? u : "#{n}. #{Bold}#{t}#{Bold}: #{u}"
- }.join(" | ")
+ "%{n}%{b}%{t}%{b}%{sep}%{u}" % {
+ :n => (single ? "" : "#{n}. "),
+ :sep => (single ? " -- " : ": "),
+ :b => Bold, :t => t, :u => u
+ }
+ }
+
+ if params[:lucky]
+ m.reply results.first
+ return
+ end
+
+ result_string = results.join(" | ")
# 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
+ m.reply "Result for %s: %s -- %s" % [what, result_string, Utils.get_first_pars(urls, first_pars)], :overlong => :truncate
return
end
- m.reply "Results for #{what}: #{results}", :split_at => /\s+\|\s+/
+ m.reply "Results for #{what}: #{result_string}", :split_at => /\s+\|\s+/
return unless first_pars > 0
@@ -109,12 +134,45 @@ class SearchPlugin < Plugin
end
+ def google_define(m, what, params)
+ begin
+ wml = @bot.httputil.get(GOOGLE_SEARCH + CGI.escape(what))
+ raise unless wml
+ rescue => e
+ m.reply "error googling for #{what}"
+ return
+ end
+
+ begin
+ related_index = wml.index(/Related phrases:/, 0)
+ raise unless related_index
+ defs_index = wml.index(/Definitions of /, related_index)
+ raise unless defs_index
+ defs_end = wml.index(/ e
+ m.reply "no results found for #{what}"
+ return
+ end
+
+ related = wml[related_index...defs_index]
+ defs = wml[defs_index...defs_end]
+
+ m.reply defs.ircify_html(:a_href => Underline), :split_at => (Underline + ' ')
+
+ 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)
-
+
debug "Getting gcalc thing: #{searchfor.inspect}"
- url = GOOGLE_SEARCH + searchfor
+ url = GOOGLE_WAP_SEARCH + searchfor
begin
html = @bot.httputil.get(url)
@@ -124,24 +182,53 @@ class SearchPlugin < Plugin
end
debug "#{html.size} bytes of html recieved"
-
- results = html.scan(GOOGLE_CALC_RESULT)
+
+ intro, result, junk = html.split(/\s*
(.*?)
(.*?)\s-\s+(.*?)<\/a>/im
+GOOGLE_WAP_LINK = /(.*?)<\/a>/im
+GOOGLE_CALC_RESULT = %r{.*?
(.*?)
(.*?)\s-\s+]+>(.+?)<(br|/td)>}
class SearchPlugin < Plugin
Config.register Config::IntegerValue.new('google.hits',
@@ -43,6 +46,8 @@ class SearchPlugin < Plugin
"gcalc ] to only search the national Wikipedia"
when "unpedia"
@@ -54,6 +59,10 @@ class SearchPlugin < Plugin
def google(m, params)
what = params[:words].to_s
+ if what.match(/^define:/)
+ return google_define(m, what, params)
+ end
+
searchfor = CGI.escape what
# This method is also called by other methods to restrict searching to some sites
if params[:site]
@@ -68,10 +77,11 @@ class SearchPlugin < Plugin
url = GOOGLE_WAP_SEARCH + site + searchfor
hits = params[:hits] || @bot.config['google.hits']
+ hits = 1 if params[:lucky]
first_pars = params[:firstpar] || @bot.config['google.first_par']
- single = (hits == 1 and first_pars == 1)
+ single = params[:lucky] || (hits == 1 and first_pars == 1)
begin
wml = @bot.httputil.get(url)
@@ -80,28 +90,43 @@ class SearchPlugin < Plugin
m.reply "error googling for #{what}"
return
end
- results = wml.scan(GOOGLE_WAP_LINK)
+ results = wml.match('
','