cherry picking pmoitroae commit from other forks

deus-developer/pyrogram@544084c

deus-developer/pyrogram@13b8f97

Co-authored-by: Artem Ukolov <[email protected]>

Author: SpEcHiDe

pyrogram/methods/advanced/resolve_peer.py

@@ -57,13 +57,13 @@ async def resolve_peer(
         if not self.is_connected:
             raise ConnectionError("Client has not been started yet")
 
+        if peer_id in ("self", "me"):
+            return raw.types.InputPeerSelf()
+
         try:
             return await self.storage.get_peer_by_id(peer_id)
         except KeyError:
             if isinstance(peer_id, str):
-                if peer_id in ("self", "me"):
-                    return raw.types.InputPeerSelf()
-
                 peer_id = re.sub(r"[@+\s]", "", peer_id.lower())
 
                 try:

pyrogram/methods/utilities/start.py

@@ -61,7 +61,7 @@ async def main():
             if not is_authorized:
                 await self.authorize()
 
-            if not await self.storage.is_bot() and self.takeout:
+            if self.takeout and not await self.storage.is_bot():
                 self.takeout_id = (await self.invoke(raw.functions.account.InitTakeoutSession())).id
                 log.info("Takeout session %s initiated", self.takeout_id)