From a1453c6795eec7238880fe40960208ef60ea243c Mon Sep 17 00:00:00 2001
From: Andreas Bielawski <brawl98@outlook.com>
Date: Sat, 9 Jul 2016 15:10:31 +0200
Subject: [PATCH] CallbackQuery: Verhindere Konflikt mit anderen Bots

---
 otouto/bot.lua             |  3 ++-
 otouto/plugins/gImages.lua | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/otouto/bot.lua b/otouto/bot.lua
index 095b730..a28f1c3 100644
--- a/otouto/bot.lua
+++ b/otouto/bot.lua
@@ -124,9 +124,10 @@ function bot:on_callback_receive(callback, msg, config) -- whenever a new callba
     return
   end
 
-  if not callback.data:find(':') then
+  if not callback.data:find(':') or not callback.data:find(self.info.username) then
 	return
   end
+  callback.data = string.gsub(callback.data, '@'..self.info.username..' ', "")
   local called_plugin = callback.data:match('(.*):.*')
   local param = callback.data:sub(callback.data:find(':')+1)
 
diff --git a/otouto/plugins/gImages.lua b/otouto/plugins/gImages.lua
index 358e3b4..5259383 100644
--- a/otouto/plugins/gImages.lua
+++ b/otouto/plugins/gImages.lua
@@ -94,14 +94,14 @@ function gImages:callback(callback, msg, self, config, input)
   end
   
   if failed then
-    utilities.send_reply(self, msg, 'Fehler beim Herunterladen eines Bildes.', true, '{"inline_keyboard":[[{"text":"Nochmal versuchen","callback_data":"gImages:'..input..'"}]]}')
+    utilities.send_reply(self, msg, 'Fehler beim Herunterladen eines Bildes.', true, '{"inline_keyboard":[[{"text":"Nochmal versuchen","callback_data":"@'..self.info.username..' gImages:'..input..'"}]]}')
 	return
   end
   
   if mimetype == 'image/gif' then
-    result = utilities.send_document(self, msg.chat.id, file, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"gImages:'..input..'"}]]}')
+    result = utilities.send_document(self, msg.chat.id, file, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"@'..self.info.username..' gImages:'..input..'"}]]}')
   else
-    result = utilities.send_photo(self, msg.chat.id, file, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"gImages:'..input..'"}]]}')
+    result = utilities.send_photo(self, msg.chat.id, file, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"@'..self.info.username..' gImages:'..input..'"}]]}')
   end
 
   if not result then
@@ -228,9 +228,9 @@ function gImages:action(msg, config, matches)
   end
   
   if mimetype == 'image/gif' then
-    result = utilities.send_document(self, msg.chat.id, file, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"gImages:'..URL.escape(input)..'"}]]}')
+    result = utilities.send_document(self, msg.chat.id, file, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"@'..self.info.username..' gImages:'..URL.escape(input)..'"}]]}')
   else
-    result = utilities.send_photo(self, msg.chat.id, file, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"gImages:'..URL.escape(input)..'"}]]}')
+    result = utilities.send_photo(self, msg.chat.id, file, nil, msg.message_id, '{"inline_keyboard":[[{"text":"Seite aufrufen","url":"'..context..'"},{"text":"Bild aufrufen","url":"'..img_url..'"},{"text":"Nochmal suchen","callback_data":"@'..self.info.username..' gImages:'..URL.escape(input)..'"}]]}')
   end
 
   if not result then