GOOGLE_WAP_SEARCH = "http://www.google.com/m/search?hl=en&q="
# GOOGLE_WAP_LINK = /<a accesskey="(\d)" href=".*?u=(.*?)">(.*?)<\/a>/im
GOOGLE_WAP_LINK = /<a href="(?:.*?u=(.*?)|(http:\/\/.*?))">(.*?)<\/a>/im
-GOOGLE_CALC_RESULT = %r{<img src=/images/calc_img\.gif(?: width=40 height=30 alt="")?>.*?<h2 class=r[^>]*><b>(.+?)</b>}
+GOOGLE_CALC_RESULT = %r{<img src=/images/calc_img\.gif(?: width=40 height=30 alt="")?>.*?<h[1-6] 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{<a href="([^"]*)"[^>]*>(Web definitions for .*?)<br/>(.*?)<br/>(.*?)\s-\s+<a href}
GOOGLE_TIME_RESULT = %r{alt="Clock"></td><td valign=[^>]+>(.+?)<(br|/td)>}
m.reply "error googling for #{what}"
return
end
- results = wml.scan(GOOGLE_WAP_LINK)
+ results = wml.match('<p align="center">').pre_match.scan(GOOGLE_WAP_LINK)
if results.length == 0
m.reply "no results found for #{what}"
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}" % {
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)
debug "#{html.size} bytes of html recieved"
- results = html.scan(GOOGLE_CALC_RESULT)
- debug "results: #{results.inspect}"
+ intro, result, junk = html.split(/\s*<br\/>\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)