From 88cc3f5e6b511ab47bd74c991f5944a06f8cf76e Mon Sep 17 00:00:00 2001 From: Andreas Bielawski Date: Sat, 2 Jul 2016 14:58:04 +0200 Subject: [PATCH] Callback_Querys sollten nun wie ewartet funktionieren --- otouto/bot.lua | 26 +++++++++++++++++++++----- otouto/plugins/gImages.lua | 23 ++++++++++------------- otouto/utilities.lua | 2 +- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/otouto/bot.lua b/otouto/bot.lua index 4516b00..d0d4bf6 100644 --- a/otouto/bot.lua +++ b/otouto/bot.lua @@ -94,15 +94,31 @@ function bot:on_callback_receive(callback, msg, config) -- whenever a new callba utilities.answer_callback_query(self, callback, 'Nachricht älter als eine Stunde, bitte sende den Befehl selbst noch einmal.', true) return end - - print('Callback Query, ausgelöst von '..callback.from.first_name..' ('..callback.from.id..')') + + if not callback.data:find(':') then + return + end + local called_plugin = callback.data:match('(.*):.*') + local param = callback.data:sub(callback.data:find(':')+1) + + print('Callback Query "'..param..'" für Plugin "'..called_plugin..'" ausgelöst von '..callback.from.first_name..' ('..callback.from.id..')') msg = utilities.enrich_message(msg) - for _,plugin in ipairs(self.plugins) do + -- called_plugin:callback(callback, msg, self, config, param) + -- if is_plugin_disabled_on_chat(plugin.name, msg) then return end + for _, plugin in ipairs(self.plugins) do + if plugin.name == called_plugin then + if is_plugin_disabled_on_chat(plugin.name, msg) then return end + plugin:callback(callback, msg, self, config, param) + end + --plugin.callback(callback, msg, self, config, para) + end + -- called_plugin:callback(callback, msg, self, config, param) + --[[ for _,plugin in ipairs(self.plugins) do if plugin.callback and msg then plugin:callback(callback, msg, self, config) end - end + end]]-- end function bot:run(config) @@ -340,4 +356,4 @@ function create_cred() print ('saved credentials into reds hash telegram:credentials') end -return bot \ No newline at end of file +return bot diff --git a/otouto/plugins/gImages.lua b/otouto/plugins/gImages.lua index 9bb770f..ecc8eef 100644 --- a/otouto/plugins/gImages.lua +++ b/otouto/plugins/gImages.lua @@ -29,22 +29,20 @@ end gImages.command = 'img ' -function gImages:callback(callback, msg, self, config) - local input = utilities.input(callback.data) +function gImages:callback(callback, msg, self, config, input) 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..'"}]]}') + result = utilities.send_document(self, msg.chat.id, file, img_url, msg.message_id, '{"inline_keyboard":[[{"text":"Nochmal suchen","callback_data":"gImages:'..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..'"}]]}') + result = utilities.send_photo(self, msg.chat.id, file, img_url, msg.message_id, '{"inline_keyboard":[[{"text":"Nochmal suchen","callback_data":"gImages:'..input..'"}]]}') end - if not result then - utilities.send_reply(self, msg, config.errors.connection, true, '{"inline_keyboard":[[{"text":"Nochmal versuchen","callback_data":"'..input..'"}]]}') + utilities.send_reply(self, msg, config.errors.connection, true, '{"inline_keyboard":[[{"text":"Nochmal versuchen","callback_data":"gImages:'..input..'"}]]}') return end end @@ -53,7 +51,7 @@ 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' - local url = BASE_URL..'/?searchType=image&alt=json&num=10&key='..apikey..'&cx='..cseid..'&safe=high'..'&q=' .. URL.escape(input) .. '&fields=searchInformation(totalResults),queries(request(count)),items(link,mime,image(contextLink))' + local url = BASE_URL..'/?searchType=image&alt=json&num=10&key='..apikey..'&cx='..cseid..'&safe=high'..'&q=' .. input .. '&fields=searchInformation(totalResults),queries(request(count)),items(link,mime,image(contextLink))' local jstr, res = HTTPS.request(url) if res == 403 then @@ -95,20 +93,19 @@ function gImages:action(msg, config, matches) end utilities.send_typing(self, msg.chat.id, 'upload_photo') - local img_url, mimetype = gImages:get_image(input) - + local img_url, mimetype = gImages:get_image(URL.escape(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":"/img '..input..'"}]]}') + result = utilities.send_document(self, msg.chat.id, file, img_url, msg.message_id, '{"inline_keyboard":[[{"text":"Nochmal suchen","callback_data":"gImages:'..URL.escape(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":"/img '..input..'"}]]}') + result = utilities.send_photo(self, msg.chat.id, file, img_url, msg.message_id, '{"inline_keyboard":[[{"text":"Nochmal suchen","callback_data":"gImages:'..URL.escape(input)..'"}]]}') end if not result then - utilities.send_reply(self, msg, config.errors.connection, true) + utilities.send_reply(self, msg, config.errors.connection, true, '{"inline_keyboard":[[{"text":"Nochmal versuchen","callback_data":"gImages:'..URL.escape(input)..'"}]]}') return end end -return gImages \ No newline at end of file +return gImages diff --git a/otouto/utilities.lua b/otouto/utilities.lua index 05fd49d..05d40ed 100644 --- a/otouto/utilities.lua +++ b/otouto/utilities.lua @@ -786,4 +786,4 @@ function url_encode(str) return str end -return utilities \ No newline at end of file +return utilities