From 7c2e68981325f033d549d2843319338b965763c3 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 24 Jun 2018 13:41:58 +0300 Subject: [PATCH] Update mautrix-appservice dependency --- mautrix_telegram/portal.py | 10 +++++----- mautrix_telegram/util/file_transfer.py | 8 ++++---- setup.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py index 1f99581b..35872438 100644 --- a/mautrix_telegram/portal.py +++ b/mautrix_telegram/portal.py @@ -292,13 +292,13 @@ class Portal: "content": power_levels, }] - room = await self.main_intent.create_room(alias=alias, is_public=public, is_direct=direct, - invitees=invites or [], name=self.title, - initial_state=initial_state) - if not room: + room_id = await self.main_intent.create_room(alias=alias, is_public=public, + is_direct=direct, invitees=invites or [], + name=self.title, initial_state=initial_state) + if not room_id: raise Exception(f"Failed to create room for {self.tgid_log}") - self.mxid = room["room_id"] + self.mxid = room_id self.by_mxid[self.mxid] = self self.save() self.az.state_store.set_power_levels(self.mxid, power_levels) diff --git a/mautrix_telegram/util/file_transfer.py b/mautrix_telegram/util/file_transfer.py index a75b7063..e927cd77 100644 --- a/mautrix_telegram/util/file_transfer.py +++ b/mautrix_telegram/util/file_transfer.py @@ -119,9 +119,9 @@ async def transfer_thumbnail_to_matrix(client, intent, thumbnail_loc, video, mim width, height = None, None mime_type = magic.from_buffer(file, mime=True) - uploaded = await intent.upload_file(file, mime_type) + content_uri = await intent.upload_file(file, mime_type) - return DBTelegramFile(id=id, mxc=uploaded["content_uri"], mime_type=mime_type, + return DBTelegramFile(id=id, mxc=content_uri, mime_type=mime_type, was_converted=False, timestamp=int(time.time()), size=len(file), width=width, height=height) @@ -173,9 +173,9 @@ async def _unlocked_transfer_file_to_matrix(db, client, intent, id, location, th mime_type = new_mime_type thumbnail = None - uploaded = await intent.upload_file(file, mime_type) + content_uri = await intent.upload_file(file, mime_type) - db_file = DBTelegramFile(id=id, mxc=uploaded["content_uri"], + db_file = DBTelegramFile(id=id, mxc=content_uri, mime_type=mime_type, was_converted=image_converted, timestamp=int(time.time()), size=len(file), width=width, height=height) diff --git a/setup.py b/setup.py index 2bc76b71..51ba9393 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ setuptools.setup( install_requires=[ "aiohttp>=3.0.1,<4", - "mautrix-appservice>=0.2.0,<0.3.0", + "mautrix-appservice>=0.3.0,<0.4.0", "SQLAlchemy>=1.2.3,<2", "alembic>=0.9.8,<0.10", "Markdown>=2.6.11,<3",