Fix invalid callbacks sent to chats different than the current one

Author: pietroalbini

botogram/callbacks.py

@@ -41,11 +41,11 @@ def url(self, label, url):
 
     def callback(self, label, callback, data=None):
         """Trigger a callback when the button is pressed"""
-        def generate_callback_data():
+        def generate_callback_data(chat):
             c = ctx()
 
             name = "%s:%s" % (c.component_name(), callback)
-            return get_callback_data(c.bot, c.chat(), name, data)
+            return get_callback_data(c.bot, chat, name, data)
 
         self._content.append({
             "text": label,
@@ -65,7 +65,7 @@ def switch_inline_query(self, label, query="", current_chat=False):
                 "switch_inline_query": query,
             })
 
-    def _get_content(self):
+    def _get_content(self, chat):
         """Get the content of this row"""
         for item in self._content:
             new = item.copy()
@@ -74,7 +74,7 @@ def _get_content(self):
             # This allows to dynamically generate field values
             for key, value in new.items():
                 if callable(value):
-                    new[key] = value()
+                    new[key] = value(chat)
 
             yield new
 
@@ -90,9 +90,9 @@ def __getitem__(self, index):
             self._rows[index] = ButtonsRow()
         return self._rows[index]
 
-    def _serialize_attachment(self):
+    def _serialize_attachment(self, chat):
         rows = [
-            list(row._get_content()) for i, row in sorted(
+            list(row._get_content(chat)) for i, row in sorted(
                 tuple(self._rows.items()), key=lambda i: i[0]
             )
         ]

botogram/objects/mixins.py

@@ -69,7 +69,9 @@ def _get_call_args(self, reply_to, extra, attach, notify):
         if attach is not None:
             if not hasattr(attach, "_serialize_attachment"):
                 raise ValueError("%s is not an attachment" % attach)
-            args["reply_markup"] = json.dumps(attach._serialize_attachment())
+            args["reply_markup"] = json.dumps(attach._serialize_attachment(
+                self
+            ))
         if not notify:
             args["disable_notification"] = True
 
@@ -327,7 +329,9 @@ def edit(self, text, syntax=None, preview=True, extra=None, attach=None):
         if attach is not None:
             if not hasattr(attach, "_serialize_attachment"):
                 raise ValueError("%s is not an attachment" % attach)
-            args["reply_markup"] = json.dumps(attach._serialize_attachment())
+            args["reply_markup"] = json.dumps(attach._serialize_attachment(
+                self.chat
+            ))
 
         self._api.call("editMessageText", args)
         self.text = text
@@ -346,7 +350,9 @@ def edit_caption(self, caption, extra=None, attach=None):
         if attach is not None:
             if not hasattr(attach, "_serialize_attachment"):
                 raise ValueError("%s is not an attachment" % attach)
-            args["reply_markup"] = json.dumps(attach._serialize_attachment())
+            args["reply_markup"] = json.dumps(attach._serialize_attachment(
+                self.chat
+            ))
 
         self._api.call("editMessageCaption", args)
         self.caption = caption

docs/changelog/0.5.rst

@@ -47,3 +47,8 @@ New features
   * New arguments ``file_id`` and ``url`` in :py:meth:`botogram.User.send_file`
   * New arguments ``file_id`` and ``url`` in :py:meth:`botogram.Chat.send_photo`
   * New arguments ``file_id`` and ``url`` in :py:meth:`botogram.User.send_photo`
+
+Bug fixes
+---------
+
+* Fixed invalid callbacks sent to chats different than the current one

tests/test_callbacks.py

@@ -42,7 +42,7 @@ def test_buttons(bot, sample_update):
     buttons[2].switch_inline_query("test 5", "wow", current_chat=True)
 
     with Context(bot, hook, sample_update):
-        assert buttons._serialize_attachment() == {
+        assert buttons._serialize_attachment(sample_update.chat()) == {
             "inline_keyboard": [
                 [
                     {"text": "test 1", "url": "http://example.com"},