From e6e6af0689e0fe0bac01fd86bf1d61aa23868161 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 23 Jun 2018 21:51:22 +0300 Subject: [PATCH] Make potential datacenter switch related file transfer auth errors non-fatal --- mautrix_telegram/util/file_transfer.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mautrix_telegram/util/file_transfer.py b/mautrix_telegram/util/file_transfer.py index 67bf94ff..14c69791 100644 --- a/mautrix_telegram/util/file_transfer.py +++ b/mautrix_telegram/util/file_transfer.py @@ -38,7 +38,7 @@ except ImportError: from telethon.tl.types import (Document, FileLocation, InputFileLocation, InputDocumentFileLocation, PhotoSize, PhotoCachedSize) -from telethon.errors import LocationInvalidError +from telethon.errors import * from ..db import TelegramFile as DBTelegramFile @@ -158,6 +158,10 @@ async def _unlocked_transfer_file_to_matrix(db, client, intent, id, location, th file = await client.download_file_bytes(location) except LocationInvalidError: return None + except (AuthBytesInvalidError, AuthKeyInvalidError, SecurityError) as e: + log.exception(f"{e.__class__.__name__} while downloading a file.") + return None + width, height = None, None mime_type = magic.from_buffer(file, mime=True)