').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 += 1
- t = Utils.decode_html_entities res[2].gsub(filter, '').strip
+ t = res[2].ircify_html(:img => "[%{src} %{alt} %{dimensions}]").strip
u = URI.unescape(res[0] || res[1])
urls.push(u)
"%{n}%{b}%{t}%{b}%{sep}%{u}" % {
@@ -104,20 +111,22 @@ class SearchPlugin < Plugin
:sep => (single ? " -- " : ": "),
:b => Bold, :t => t, :u => u
}
- }.join(" | ")
+ }
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
@@ -125,6 +134,34 @@ 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)
@@ -135,7 +172,7 @@ class SearchPlugin < Plugin
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)
@@ -146,17 +183,16 @@ class SearchPlugin < Plugin
debug "#{html.size} bytes of html recieved"
- results = html.scan(GOOGLE_CALC_RESULT)
- debug "results: #{results.inspect}"
+ intro, result, junk = html.split(/\s*
\s*/, 3)
+ debug "result: #{result.inspect}"
- if results.length != 1
+ unless result.include? '='
m.reply "couldn't calculate #{what}"
return
end
- result = results[0][0].ircify_html
debug "replying with: #{result.inspect}"
- m.reply "#{result}"
+ m.reply result.ircify_html
end
def gcount(m, params)