Fix Bug python-telegram-bot#571 (second try) (python-telegram-bot#574)

manorom · jh0ker · commit c5598b96bc8b · 2017-04-29T15:51:48.000+02:00
* Fix Bug python-telegram-bot#571 ConversationHandler will not process CallbackQuery if per_chat=True and the CallbackQuery has no message attached to it (as is the case with buttons on inline results) * Adds test case for CallbackQuery without Chat
diff --git a/telegram/ext/conversationhandler.py b/telegram/ext/conversationhandler.py
@@ -174,7 +174,8 @@ def check_update(self, update):
         # Ignore messages in channels
         if (not isinstance(update, Update) or update.channel_post or self.per_chat
                 and (update.inline_query or update.chosen_inline_result) or self.per_message
-                and not update.callback_query):
+                and not update.callback_query or update.callback_query and self.per_chat
+                and not update.callback_query.message):
             return False
 
         key = self._get_key(update)
diff --git a/tests/test_conversationhandler.py b/tests/test_conversationhandler.py
@@ -322,6 +322,14 @@ def test_endOnFirstMessageAsync(self):
         # Assert that the Promise has been resolved and the conversation ended.
         self.assertEquals(len(handler.conversations), 0)
 
+    def test_perChatMessageWithoutChat(self):
+        handler = ConversationHandler(
+            entry_points=[CommandHandler('start', self.start_end)], states={}, fallbacks=[])
+        user = User(first_name="Misses Test", id=123)
+        cbq = CallbackQuery(0, user, None, None)
+        update = Update(0, callback_query=cbq)
+        handler.check_update(update)
+
 
 if __name__ == '__main__':
     unittest.main()
