Merge branch 'bugfix/72'

Author: Pietro Albini

botogram/api.py

@@ -104,18 +104,47 @@ def call(self, method, params=None, files=None, expect=None):
             # Special handling for unavailable chats
             if method in SEND_TO_CHAT_METHODS:
                 reason = None
+
+                # This happens when the bot tries to send messages to an user
+                # who blocked the bot
                 if status == 403 and "blocked" in message:
+                    # Error code # 403
+                    # Bot was blocked by the user
                     reason = "blocked"
-                elif status == 403 and "deleted user" in message:
+
+                # This happens when the user deleted its account
+                elif status == 403 and "deleted" in message:
+                    # Error code # 403
+                    # Forbidden: user is deleted
                     reason = "account_deleted"
+
+                # This happens, as @BotSupport says, when the Telegram API
+                # isn't able to determine why your bot can't contact an user
                 elif status == 400 and "PEER_ID_INVALID" in message:
-                    # What, this error is an identifier and not a sentence :/
+                    # Error code # 400
+                    # PEER_ID_INVALID
                     reason = "not_contacted"
+
+                # This happens when the bot can't contact the user or the user
+                # doesn't exist
                 elif status == 400 and "not found" in message:
+                    # Error code # 400
+                    # Bad Request: chat not found
                     reason = "not_found"
+
+                # This happens when the bot is kicked from the group chat it's
+                # trying to send messages to
                 elif status == 403 and "kicked" in message:
+                    # Error code # 403
+                    # Forbidden: bot was kicked from the group chat
+                    # Forbidden: bot was kicked from the supergroup chat
                     reason = "kicked"
-                elif status == 400 and "deactivated" in message:
+
+                # This happens when the ID points to a group chat, which was
+                # migrated to a supergroup chat, thus changing its ID
+                elif status == 400 and "migrated" in message:
+                    # Error code # 400
+                    # Bad Request: group chat is migrated to a supergroup chat
                     reason = "chat_moved"
 
                 if reason is not None:

docs/changelog/0.3.rst

@@ -7,6 +7,18 @@ Changelog of botogram 0.3.x
 
 Here you can find all the changes in the botogram 0.3.x releases.
 
+.. _changelog-0.3.3:
+
+botogram 0.3.3
+==============
+
+*Bugfix release, not yet released*
+
+* Fix broken detection of unavailable chats, due to changes in the Bot API
+  (`issue 72`_)
+
+.. _issue 72: https://github.com/pietroalbini/botogram/issues/72
+
 .. _changelog-0.3.2:
 
 botogram 0.3.2

tests/test_api.py

@@ -38,31 +38,45 @@ def test_unavailable_chats(api, mock_req):
     mock_req({
         "sendMessage": {"ok": True, "result": {}},
         "forwardMessage": {
-            "ok": False, "error_code": 123, "description": "test",
+            "ok": False, "error_code": 123,
+            "description": "This is a message!",
         },
         "sendPhoto": {
-            "ok": False, "error_code": 403, "description": "test",
+            "ok": False, "error_code": 403,
+            "description": "This is not the message you want!",
         },
         "sendAudio": {
-            "ok": False, "error_code": 123, "description": "blocked test",
+            "ok": False, "error_code": 123,
+            "description": "Bot was blocked by the user",
         },
         "sendDocument": {
-            "ok": False, "error_code": 403, "description": "blocked test",
+            "ok": False, "error_code": 403,
+            "description": "Bot was blocked by the user",
         },
         "sendSticker": {
-            "ok": False, "error_code": 400, "description": "chat not found",
+            "ok": False, "error_code": 400,
+            "description": "Bad request: chat not found",
         },
         "sendVideo": {
-            "ok": False, "error_code": 403, "description": "I was kicked!",
+            "ok": False, "error_code": 403,
+            "description": "Forbidden: bot was kicked from the group chat",
         },
         "sendLocation": {
-            "ok": False, "error_code": 400, "description": "PEER_ID_INVALID",
+            "ok": False, "error_code": 400,
+            "description": "PEER_ID_INVALID",
         },
         "sendVoice": {
-            "ok": False, "error_code": 403, "description": "a deleted user",
+            "ok": False, "error_code": 403,
+            "description": "Forbidden: user is deleted",
+        },
+        "sendChatAction": {
+            "ok": False, "error_code": 400,
+            "description":
+                "Bad Request: group chat is migrated to a supergroup chat",
         },
         "getMe": {
-            "ok": False, "error_code": 403, "description": "blocked test",
+            "ok": False, "error_code": 403,
+            "description": "Bot was blocked by the user",
         },
     })
 
@@ -132,7 +146,9 @@ def test_unavailable_chats_take2(api, mock_req):
     mock_req({
         "sendMessage": {"ok": True, "result": {}},
         "forwardMessage": {
-            "ok": False, "error_code": 400, "description": "chat deactivated",
+            "ok": False, "error_code": 400,
+            "description":
+                "Bad Request: group chat is migrated to a supergroup chat",
         },
     })