iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Handle AuthKeyError when terminating sessions

Browse Source
This commit is contained in:
Tulir Asokan
2019-02-16 23:21:47 +02:00
parent 531d118ed0
commit d842fc73cb
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/commands/telegram/account.py
+6 -1
View File
@@ -17,7 +17,7 @@
from typing import Dict, Optional from typing import Dict, Optional
from telethon.errors import (UsernameInvalidError, UsernameNotModifiedError, UsernameOccupiedError, from telethon.errors import (UsernameInvalidError, UsernameNotModifiedError, UsernameOccupiedError,
HashInvalidError) HashInvalidError, AuthKeyError)
from telethon.tl.types import Authorization from telethon.tl.types import Authorization
from telethon.tl.functions.account import (UpdateUsernameRequest, GetAuthorizationsRequest, from telethon.tl.functions.account import (UpdateUsernameRequest, GetAuthorizationsRequest,
ResetAuthorizationRequest) ResetAuthorizationRequest)
@@ -94,6 +94,11 @@ async def session(evt: CommandEvent) -> Optional[Dict]:
ok = await evt.sender.client(ResetAuthorizationRequest(hash=session_hash)) ok = await evt.sender.client(ResetAuthorizationRequest(hash=session_hash))
except HashInvalidError: except HashInvalidError:
return await evt.reply("Invalid session hash.") return await evt.reply("Invalid session hash.")
except AuthKeyError as e:
if e.message == "FRESH_RESET_AUTHORISATION_FORBIDDEN":
return await evt.reply("New sessions can't terminate other sessions. "
"Please wait a while.")
raise
if ok: if ok:
return await evt.reply("Session terminated successfully.") return await evt.reply("Session terminated successfully.")
else: else: