From c36c6ef12523866da3a79e27bf7d1bd15df24a9e Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Sat, 2 Jul 2016 01:31:50 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Unterst=C3=BCtzung=20f=C3=BCr=20Callback=5F?= =?UTF-8?q?Querys,=20allerdings=20wei=C3=9F=20ich=20nicht,=20ob=20mir=20di?= =?UTF-8?q?e=20aktuelle=20L=C3=B6sung=20gef=C3=A4llt.=20Mal=20ne=20Nacht?= =?UTF-8?q?=20dr=C3=BCber=20schlafen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- otouto/bot.lua | 20 +++++++++++- otouto/plugins/gImages.lua | 62 ++++++++++++++++++++++++++------------ otouto/utilities.lua | 14 +++++++-- 3 files changed, 74 insertions(+), 22 deletions(-) diff --git a/otouto/bot.lua b/otouto/bot.lua index 9378400..402c7b5 100644 --- a/otouto/bot.lua +++ b/otouto/bot.lua @@ -85,6 +85,24 @@ function bot:on_msg_receive(msg, config) -- The fn run whenever a message is rec end end +function bot:on_callback_receive(callback, msg, config) -- whenever a new callback is received + -- remove comment to enable debugging + -- vardump(msg) + -- vardump(callback) + + if msg.date < os.time() - 3600 then -- Do not process old messages. + utilities.answer_callback_query(self, callback, 'Nachricht älter als eine Stunde, bitte sende den Befehl selbst noch einmal.', true) + return + end + + msg = utilities.enrich_message(msg) + for _,plugin in ipairs(self.plugins) do + if plugin.callback and msg then + plugin:callback(callback, msg, self, config) + end + end +end + function bot:run(config) bot.init(self, config) -- Actually start the script. @@ -95,7 +113,7 @@ function bot:run(config) for _,v in ipairs(res.result) do -- Go through every new message. self.last_update = v.update_id if v.callback_query then - print('callback_query wird noch nicht unterstützt! Erhaltener Wert: '..v.callback_query.data) + bot.on_callback_receive(self, v.callback_query, v.callback_query.message, config) elseif v.message then bot.on_msg_receive(self, v.message, config) end diff --git a/otouto/plugins/gImages.lua b/otouto/plugins/gImages.lua index cd1f13d..5fd1687 100644 --- a/otouto/plugins/gImages.lua +++ b/otouto/plugins/gImages.lua @@ -29,24 +29,27 @@ end gImages.command = 'img ' -function gImages:action(msg, config) - local input = utilities.input(msg.text) - if not input then - if msg.reply_to_message and msg.reply_to_message.text then - input = msg.reply_to_message.text - else - utilities.send_message(self, msg.chat.id, gImages.doc, true, msg.message_id, true) - return - end - end +function gImages:callback(callback, msg, self, config) + local input = callback.data + utilities.answer_callback_query(self, callback, 'Suche nochmal nach "'..input..'"') + utilities.send_typing(self, msg.chat.id, 'upload_photo') + local img_url, mimetype = gImages:get_image(input) - print ('Checking if search contains blacklisted word: '..input) - if is_blacklisted(input) then - utilities.send_reply(self, msg, 'Vergiss es! ._.') - return + if mimetype == 'image/gif' then + local file = download_to_file(img_url, 'img.gif') + result = utilities.send_document(self, msg.chat.id, file, img_url, msg.message_id, '{"inline_keyboard":[[{"text":"Nochmal suchen","callback_data":"'..input..'"}]]}') + else + local file = download_to_file(img_url, 'img.png') + result = utilities.send_photo(self, msg.chat.id, file, img_url, msg.message_id, '{"inline_keyboard":[[{"text":"Nochmal suchen","callback_data":"'..input..'"}]]}') end - utilities.send_typing(self, msg.chat.id, 'upload_photo') + if not result then + utilities.send_reply(self, msg, config.errors.connection, true, '{"inline_keyboard":[[{"text":"Nochmal versuchen","callback_data":"'..input..'"}]]}') + return + end +end + +function gImages:get_image(input) local apikey = cred_data.google_apikey local cseid = cred_data.google_cse_id local BASE_URL = 'https://www.googleapis.com/customsearch/v1' @@ -71,14 +74,35 @@ function gImages:action(msg, config) end local i = math.random(jdat.queries.request[1].count) - local img_url = jdat.items[i].link + return jdat.items[i].link, jdat.items[i].mime +end + +function gImages:action(msg, config, matches) + local input = utilities.input(msg.text) + if not input then + if msg.reply_to_message and msg.reply_to_message.text then + input = msg.reply_to_message.text + else + utilities.send_message(self, msg.chat.id, gImages.doc, true, msg.message_id, true) + return + end + end - if jdat.items[i].mime == 'image/gif' then + print ('Checking if search contains blacklisted word: '..input) + if is_blacklisted(input) then + utilities.send_reply(self, msg, 'Vergiss es! ._.') + return + end + + utilities.send_typing(self, msg.chat.id, 'upload_photo') + local img_url, mimetype = gImages:get_image(input) + + if mimetype == 'image/gif' then local file = download_to_file(img_url, 'img.gif') - result = utilities.send_document(self, msg.chat.id, file, img_url, msg.message_id) + result = utilities.send_document(self, msg.chat.id, file, img_url, msg.message_id, '{"inline_keyboard":[[{"text":"Nochmal suchen","callback_data":"'..input..'"}]]}') else local file = download_to_file(img_url, 'img.png') - result = utilities.send_photo(self, msg.chat.id, file, img_url, msg.message_id) + result = utilities.send_photo(self, msg.chat.id, file, img_url, msg.message_id, '{"inline_keyboard":[[{"text":"Nochmal suchen","callback_data":"'..input..'"}]]}') end if not result then diff --git a/otouto/utilities.lua b/otouto/utilities.lua index 13847fe..837bba7 100644 --- a/otouto/utilities.lua +++ b/otouto/utilities.lua @@ -52,11 +52,12 @@ end -- NOTE: Telegram currently only allows file uploads up to 50 MB -- https://core.telegram.org/bots/api#sendphoto -function utilities:send_photo(chat_id, file, text, reply_to_message_id) +function utilities:send_photo(chat_id, file, text, reply_to_message_id, reply_markup ) local output = bindings.request(self, 'sendPhoto', { chat_id = chat_id, caption = text or nil, - reply_to_message_id = reply_to_message_id + reply_to_message_id = reply_to_message_id, + reply_markup = reply_markup }, {photo = file} ) os.remove(file) print("Deleted: "..file) @@ -149,6 +150,15 @@ function utilities:send_typing(chat_id, action) } ) end +-- https://core.telegram.org/bots/api#answercallbackquery +function utilities:answer_callback_query(callback, text, show_alert) + return bindings.request(self, 'answerCallbackQuery', { + callback_query_id = callback.id, + text = text, + show_alert = show_alert + } ) +end + -- get the indexed word in a string function utilities.get_word(s, i) s = s or '' From 52e0ea8125336f48646dbfd7642b7169b1b62ba5 Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Sat, 2 Jul 2016 12:30:07 +0200 Subject: [PATCH 2/2] This reverts commit c36c6ef12523866da3a79e27bf7d1bd15df24a9e. Wir erstellen einen neuen Branch... --- otouto/bot.lua | 20 +------------ otouto/plugins/gImages.lua | 60 ++++++++++++-------------------------- otouto/utilities.lua | 14 ++------- 3 files changed, 21 insertions(+), 73 deletions(-) diff --git a/otouto/bot.lua b/otouto/bot.lua index 402c7b5..9378400 100644 --- a/otouto/bot.lua +++ b/otouto/bot.lua @@ -85,24 +85,6 @@ function bot:on_msg_receive(msg, config) -- The fn run whenever a message is rec end end -function bot:on_callback_receive(callback, msg, config) -- whenever a new callback is received - -- remove comment to enable debugging - -- vardump(msg) - -- vardump(callback) - - if msg.date < os.time() - 3600 then -- Do not process old messages. - utilities.answer_callback_query(self, callback, 'Nachricht älter als eine Stunde, bitte sende den Befehl selbst noch einmal.', true) - return - end - - msg = utilities.enrich_message(msg) - for _,plugin in ipairs(self.plugins) do - if plugin.callback and msg then - plugin:callback(callback, msg, self, config) - end - end -end - function bot:run(config) bot.init(self, config) -- Actually start the script. @@ -113,7 +95,7 @@ function bot:run(config) for _,v in ipairs(res.result) do -- Go through every new message. self.last_update = v.update_id if v.callback_query then - bot.on_callback_receive(self, v.callback_query, v.callback_query.message, config) + print('callback_query wird noch nicht unterstützt! Erhaltener Wert: '..v.callback_query.data) elseif v.message then bot.on_msg_receive(self, v.message, config) end diff --git a/otouto/plugins/gImages.lua b/otouto/plugins/gImages.lua index 5fd1687..cd1f13d 100644 --- a/otouto/plugins/gImages.lua +++ b/otouto/plugins/gImages.lua @@ -29,27 +29,24 @@ end gImages.command = 'img ' -function gImages:callback(callback, msg, self, config) - local input = callback.data - utilities.answer_callback_query(self, callback, 'Suche nochmal nach "'..input..'"') - utilities.send_typing(self, msg.chat.id, 'upload_photo') - local img_url, mimetype = gImages:get_image(input) - - if mimetype == 'image/gif' then - local file = download_to_file(img_url, 'img.gif') - result = utilities.send_document(self, msg.chat.id, file, img_url, msg.message_id, '{"inline_keyboard":[[{"text":"Nochmal suchen","callback_data":"'..input..'"}]]}') - else - local file = download_to_file(img_url, 'img.png') - result = utilities.send_photo(self, msg.chat.id, file, img_url, msg.message_id, '{"inline_keyboard":[[{"text":"Nochmal suchen","callback_data":"'..input..'"}]]}') +function gImages:action(msg, config) + local input = utilities.input(msg.text) + if not input then + if msg.reply_to_message and msg.reply_to_message.text then + input = msg.reply_to_message.text + else + utilities.send_message(self, msg.chat.id, gImages.doc, true, msg.message_id, true) + return + end end - - if not result then - utilities.send_reply(self, msg, config.errors.connection, true, '{"inline_keyboard":[[{"text":"Nochmal versuchen","callback_data":"'..input..'"}]]}') + + print ('Checking if search contains blacklisted word: '..input) + if is_blacklisted(input) then + utilities.send_reply(self, msg, 'Vergiss es! ._.') return end -end -function gImages:get_image(input) + utilities.send_typing(self, msg.chat.id, 'upload_photo') local apikey = cred_data.google_apikey local cseid = cred_data.google_cse_id local BASE_URL = 'https://www.googleapis.com/customsearch/v1' @@ -74,35 +71,14 @@ function gImages:get_image(input) end local i = math.random(jdat.queries.request[1].count) - return jdat.items[i].link, jdat.items[i].mime -end - -function gImages:action(msg, config, matches) - local input = utilities.input(msg.text) - if not input then - if msg.reply_to_message and msg.reply_to_message.text then - input = msg.reply_to_message.text - else - utilities.send_message(self, msg.chat.id, gImages.doc, true, msg.message_id, true) - return - end - end + local img_url = jdat.items[i].link - print ('Checking if search contains blacklisted word: '..input) - if is_blacklisted(input) then - utilities.send_reply(self, msg, 'Vergiss es! ._.') - return - end - - utilities.send_typing(self, msg.chat.id, 'upload_photo') - local img_url, mimetype = gImages:get_image(input) - - if mimetype == 'image/gif' then + if jdat.items[i].mime == 'image/gif' then local file = download_to_file(img_url, 'img.gif') - result = utilities.send_document(self, msg.chat.id, file, img_url, msg.message_id, '{"inline_keyboard":[[{"text":"Nochmal suchen","callback_data":"'..input..'"}]]}') + result = utilities.send_document(self, msg.chat.id, file, img_url, msg.message_id) else local file = download_to_file(img_url, 'img.png') - result = utilities.send_photo(self, msg.chat.id, file, img_url, msg.message_id, '{"inline_keyboard":[[{"text":"Nochmal suchen","callback_data":"'..input..'"}]]}') + result = utilities.send_photo(self, msg.chat.id, file, img_url, msg.message_id) end if not result then diff --git a/otouto/utilities.lua b/otouto/utilities.lua index 837bba7..13847fe 100644 --- a/otouto/utilities.lua +++ b/otouto/utilities.lua @@ -52,12 +52,11 @@ end -- NOTE: Telegram currently only allows file uploads up to 50 MB -- https://core.telegram.org/bots/api#sendphoto -function utilities:send_photo(chat_id, file, text, reply_to_message_id, reply_markup ) +function utilities:send_photo(chat_id, file, text, reply_to_message_id) local output = bindings.request(self, 'sendPhoto', { chat_id = chat_id, caption = text or nil, - reply_to_message_id = reply_to_message_id, - reply_markup = reply_markup + reply_to_message_id = reply_to_message_id }, {photo = file} ) os.remove(file) print("Deleted: "..file) @@ -150,15 +149,6 @@ function utilities:send_typing(chat_id, action) } ) end --- https://core.telegram.org/bots/api#answercallbackquery -function utilities:answer_callback_query(callback, text, show_alert) - return bindings.request(self, 'answerCallbackQuery', { - callback_query_id = callback.id, - text = text, - show_alert = show_alert - } ) -end - -- get the indexed word in a string function utilities.get_word(s, i) s = s or ''