This reverts commit c36c6ef125.

Wir erstellen einen neuen Branch...

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

otouto/plugins/gImages.lua

@@ -29,27 +29,24 @@ end
 
 gImages.command = 'img <Suchbegriff>'
 
-function gImages:callback(callback, msg, self, config)
+function gImages:action(msg, config)
-  local input = callback.data
+  local input = utilities.input(msg.text)
-  utilities.answer_callback_query(self, callback, 'Suche nochmal nach "'..input..'"')
+  if not input then
-  utilities.send_typing(self, msg.chat.id, 'upload_photo')
+    if msg.reply_to_message and msg.reply_to_message.text then
-  local img_url, mimetype = gImages:get_image(input)
+      input = msg.reply_to_message.text
-  
-  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')
+	  utilities.send_message(self, msg.chat.id, gImages.doc, true, msg.message_id, true)
-    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
-    utilities.send_reply(self, msg, config.errors.connection, true, '{"inline_keyboard":[[{"text":"Nochmal versuchen","callback_data":"'..input..'"}]]}')
 	  return
 	end
-end
+  end
   
-function 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
+  end
+
+  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
+  local img_url = jdat.items[i].link
-end
   
-function gImages:action(msg, config, matches)
+  if jdat.items[i].mime == 'image/gif' then
-  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
-  
-  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, '{"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

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_to_message_id = reply_to_message_id
-		reply_markup = reply_markup
 	}, {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 ''