Skip to content

Fix Bug #571 (second try) #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jh0ker merged 2 commits into from
Apr 29, 2017
Merged

Fix Bug #571 (second try) #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15b9c6e
Fix Bug #571
manorom Apr 23, 2017
8182dea
Adds test case for CallbackQuery without Chat
manorom Apr 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion telegram/ext/conversationhandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,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)
Expand Down
8 changes: 8 additions & 0 deletions tests/test_conversationhandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,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()