From f651c642eaa7c856396262d9732a64ce185a76e8 Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Wed, 27 Jul 2016 21:14:09 +0200 Subject: [PATCH] Googl: InlineQuery --- otouto/plugins/googl.lua | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/otouto/plugins/googl.lua b/otouto/plugins/googl.lua index 802fa27..aebc333 100644 --- a/otouto/plugins/googl.lua +++ b/otouto/plugins/googl.lua @@ -14,6 +14,8 @@ function googl:init(config) googl.triggers = { "goo.gl/([A-Za-z0-9-_-/-/]+)" } + + googl.inline_triggers = googl.triggers end local BASE_URL = 'https://www.googleapis.com/urlshortener/v1' @@ -24,11 +26,20 @@ local makeOurDate = function(dateString) return day..'.'..month..'.'..year end +function googl:inline_callback(inline_query, config, matches) + local shorturl = matches[1] + local text, longUrl = googl:send_googl_info(shorturl) + if not longUrl then return end + + local results = '[{"type":"article","id":"'..math.random(100000000000000000)..'","title":"Verlängerte URL","description":"'..longUrl..'","url":"'..longUrl..'","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/generic/internet.jpg","thumb_width":165,"thumb_height":150,"hide_url":true,"input_message_content":{"message_text":"'..text..'"}}]' + utilities.answer_inline_query(self, inline_query, results, 1) +end + function googl:send_googl_info (shorturl) local apikey = cred_data.google_apikey local url = BASE_URL..'/url?key='..apikey..'&shortUrl=http://goo.gl/'..shorturl..'&projection=FULL&fields=longUrl,created,analytics(allTime(shortUrlClicks))' local res,code = https.request(url) - if code ~= 200 then return "HTTP-FEHLER" end + if code ~= 200 then return nil end local data = json.decode(res) local longUrl = data.longUrl @@ -36,12 +47,14 @@ function googl:send_googl_info (shorturl) local created = makeOurDate(data.created) local text = longUrl..'\n'..shortUrlClicks..' mal geklickt (erstellt am '..created..')' - return text + return text, longUrl end function googl:action(msg, config, matches) local shorturl = matches[1] - utilities.send_reply(self, msg, googl:send_googl_info(shorturl)) + local text = googl:send_googl_info(shorturl) + if not text then utilities.send_reply(self, msg, config.errors.connection) return end + utilities.send_reply(self, msg, text) end return googl