From 03734a6745a5333405c070aaf6eb37586b2971ce Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 21 Feb 2018 17:11:47 +0200 Subject: [PATCH] Fix Telegram -> Matrix image bridging --- mautrix_telegram/db.py | 2 +- mautrix_telegram/util/file_transfer.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mautrix_telegram/db.py b/mautrix_telegram/db.py index 81829c7a..4f48412c 100644 --- a/mautrix_telegram/db.py +++ b/mautrix_telegram/db.py @@ -112,7 +112,7 @@ class TelegramFile(Base): mxc = Column(String) mime_type = Column(String) was_converted = Column(Boolean) - timestamp = Column(BigInteger, primary_key=True) + timestamp = Column(BigInteger) def init(db_session): diff --git a/mautrix_telegram/util/file_transfer.py b/mautrix_telegram/util/file_transfer.py index 698cb874..76e113b3 100644 --- a/mautrix_telegram/util/file_transfer.py +++ b/mautrix_telegram/util/file_transfer.py @@ -44,7 +44,7 @@ def _convert_webp(file, to="png"): async def transfer_file_to_matrix(db, client, intent, location): if isinstance(location, (Document, InputDocumentFileLocation)): id = f"{location.id}-{location.version}" - elif not isinstance(location, (FileLocation, InputFileLocation)): + elif isinstance(location, (FileLocation, InputFileLocation)): id = f"{location.volume_id}-{location.local_id}" else: return None