Merge branch 'develop'

This commit is contained in:
yago 2015-01-12 20:50:58 +01:00
commit ff36d07e01
2 changed files with 39 additions and 1 deletions

View File

@ -145,7 +145,7 @@ function create_config( )
"9gag", "9gag",
"echo", "echo",
"get", "get",
"help" "help",
"images", "images",
"img_google", "img_google",
"location", "location",

38
plugins/google.lua Normal file
View File

@ -0,0 +1,38 @@
function googlethat(query)
local api = "http://ajax.googleapis.com/ajax/services/search/web?v=1.0&"
local parameters = "q=".. (URL.escape(query) or "")
-- Do the request
local res, code = https.request(api..parameters)
if code ~=200 then return nil end
local data = json:decode(res)
local results={}
for key,result in ipairs(data.responseData.results) do
table.insert(results,{result.titleNoFormatting, result.url})
end
return results
end
function stringlinks(results)
local stringresults=""
for key,val in ipairs(results) do
stringresults=stringresults..val[1].." - "..val[2].."\n"
end
return stringresults
end
function run(msg, matches)
vardump(matches)
local results = googlethat(matches[1])
return stringlinks(results)
end
return {
description = "Searches Google",
usage = "!google terms",
patterns = {
"^!google (.*)$",
"^%.[g|G]oogle (.*)$"
},
run = run
}