From fb9104417e18a1d5e6df1b77b71fe370df1b7ce4 Mon Sep 17 00:00:00 2001
From: Lonami Exo <totufals@hotmail.com>
Date: Sat, 20 May 2017 15:25:07 +0200
Subject: [PATCH] Add more errors, change the way InvalidDC is created

---
 telethon/errors.py                 | 27 ++++++++++++++++++++-------
 telethon/network/mtproto_sender.py |  2 +-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/telethon/errors.py b/telethon/errors.py
index c23a2061..04fd403d 100644
--- a/telethon/errors.py
+++ b/telethon/errors.py
@@ -28,13 +28,9 @@ class TypeNotFoundError(Exception):
 
 
 class InvalidDCError(Exception):
-    def __init__(self, new_dc):
-        super().__init__(
-            self, 'Your phone number is registered to #{} DC. '
-            'This should have been handled automatically; '
-            'if it has not, please restart the app.'.format(new_dc))
-
-        self.new_dc = new_dc
+    def __init__(self, rpc_error):
+        self.new_dc = rpc_error.__dict__.pop('additional_data')
+        self.__dict__.update(rpc_error.__dict__)
 
 
 class InvalidChecksumError(Exception):
@@ -129,6 +125,23 @@ class RPCError(Exception):
         'BOT_METHOD_INVALID':
         'The API access for bot users is restricted. The method you tried '
         'to invoke cannot be executed as a bot.',
+        'PEER_ID_INVALID':
+        'An invalid Peer was used. Make sure to pass the right peer type.',
+        'MESSAGE_EMPTY': 'Empty or invalid UTF-8 message was sent.',
+        'MESSAGE_TOO_LONG':
+        'Message was too long. Current maximum length is 4096 UTF-8 characters.',
+        'USERNAME_INVALID':
+        'Unacceptable username. Must match r"[a-zA-Z][\w\d]{4,32}"',
+        'USERNAME_OCCUPIED': 'The username is already taken.',
+        'USERNAME_NOT_MODIFIED':
+        'The username is not different from the current username',
+        'USER_ID_INVALID':
+        'Invalid object ID for an user. Make sure to pass the right types.',
+        'CHAT_ID_INVALID':
+        'Invalid object ID for a chat. Make sure to pass the right types.',
+        'CHANNEL_INVALID':
+        'Invalid channel object. Make sure to pass the right types.',
+        'MESSAGE_ID_INVALID': 'The specified message ID is invalid.',
 
         # 401 UNAUTHORIZED
         'AUTH_KEY_UNREGISTERED': 'The key is not registered in the system.',
diff --git a/telethon/network/mtproto_sender.py b/telethon/network/mtproto_sender.py
index 5710d1ef..b112ecbb 100644
--- a/telethon/network/mtproto_sender.py
+++ b/telethon/network/mtproto_sender.py
@@ -363,7 +363,7 @@ class MtProtoSender:
                 sleep(error.additional_data)
 
             elif '_MIGRATE_' in error.message:
-                raise InvalidDCError(error.additional_data)
+                raise InvalidDCError(error)
 
             else:
                 raise error