ConvesationHandler - check if a user exist before using it (python-telegram-bot#699)

pingiun · tsnoam · commit 8320227b2a14 · 2017-07-23T22:29:52.000+03:00
Fixes python-telegram-bot#695
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -32,6 +32,7 @@ The following wonderful people contributed directly or indirectly to this projec
 - `Jacob Bom <https://github.com/bomjacob>`_
 - `JASON0916 <https://github.com/JASON0916>`_
 - `jeffffc <https://github.com/jeffffc>`_
+- `Jelle Besseling <https://github.com/pingiun>`_
 - `jh0ker <https://github.com/jh0ker>`_
 - `John Yong <https://github.com/whipermr5>`_
 - `jossalgon <https://github.com/jossalgon>`_
diff --git a/telegram/ext/conversationhandler.py b/telegram/ext/conversationhandler.py
@@ -160,7 +160,7 @@ def _get_key(self, update):
         if self.per_chat:
             key.append(chat.id)
 
-        if self.per_user:
+        if self.per_user and user is not None:
             key.append(user.id)
 
         if self.per_message:
diff --git a/tests/test_conversationhandler.py b/tests/test_conversationhandler.py
@@ -330,6 +330,12 @@ def test_perChatMessageWithoutChat(self):
         update = Update(0, callback_query=cbq)
         handler.check_update(update)
 
+    def test_channelMessageWithoutChat(self):
+        handler = ConversationHandler(entry_points=[CommandHandler('start', self.start_end)], states={}, fallbacks=[])
+        message = Message(0, None, None, Chat(0, Chat.CHANNEL, "Misses Test"))
+        update = Update(0, message=message)
+        handler.check_update(update)
+
 
 if __name__ == '__main__':
     unittest.main()
