Skip to content

Commit 12be393

Browse files
committed
Fixes for iNVALID issues with KeyError
Ref: https://t.me/c/1341570295/1960207
1 parent 513f64e commit 12be393

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

pyrogram/methods/advanced/resolve_peer.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,23 @@ async def resolve_peer(
7373
try:
7474
return await self.storage.get_peer_by_username(peer_id)
7575
except KeyError:
76-
await self.invoke(
76+
r = await self.invoke(
7777
raw.functions.contacts.ResolveUsername(
7878
username=peer_id
7979
)
8080
)
8181

82-
return await self.storage.get_peer_by_username(peer_id)
82+
return await self.storage.get_peer_by_id(
83+
getattr(
84+
r.peer,
85+
"user_id",
86+
getattr(
87+
r.peer,
88+
"channel_id",
89+
peer_id
90+
)
91+
)
92+
)
8393
else:
8494
try:
8595
return await self.storage.get_peer_by_phone_number(peer_id)

pyrogram/methods/users/get_users.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ async def get_users(
6464
)
6565

6666
users = types.List()
67+
if not r:
68+
return users
6769

6870
for i in r:
6971
users.append(types.User._parse(self, i))

0 commit comments

Comments
 (0)