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

Make potential datacenter switch related file transfer auth errors non-fatal

Browse Source
This commit is contained in:
Tulir Asokan
2018-06-23 21:51:22 +03:00
parent 7a7c0b780f
commit e6e6af0689
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/util/file_transfer.py
+5 -1
View File
@@ -38,7 +38,7 @@ except ImportError:
from telethon.tl.types import (Document, FileLocation, InputFileLocation, from telethon.tl.types import (Document, FileLocation, InputFileLocation,
InputDocumentFileLocation, PhotoSize, PhotoCachedSize) InputDocumentFileLocation, PhotoSize, PhotoCachedSize)
from telethon.errors import LocationInvalidError from telethon.errors import *
from ..db import TelegramFile as DBTelegramFile 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) file = await client.download_file_bytes(location)
except LocationInvalidError: except LocationInvalidError:
return None return None
except (AuthBytesInvalidError, AuthKeyInvalidError, SecurityError) as e:
log.exception(f"{e.__class__.__name__} while downloading a file.")
return None
width, height = None, None width, height = None, None
mime_type = magic.from_buffer(file, mime=True) mime_type = magic.from_buffer(file, mime=True)