From 7e9dd8b895c59b17d040315a3be8bd3ba1cd0d34 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 16 Apr 2021 15:27:56 +0300 Subject: [PATCH] Update mautrix-python --- mautrix_telegram/example-config.yaml | 2 ++ mautrix_telegram/util/file_transfer.py | 7 ++----- requirements.txt | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/mautrix_telegram/example-config.yaml b/mautrix_telegram/example-config.yaml index 101e22a9..5fb1540f 100644 --- a/mautrix_telegram/example-config.yaml +++ b/mautrix_telegram/example-config.yaml @@ -8,6 +8,8 @@ homeserver: # Only applies if address starts with https:// verify_ssl: true asmux: false + # Number of retries for all HTTP requests if the homeserver isn't reachable. + http_retry_count: 4 # Application service host/registration related details # Changing these values requires regeneration of the registration. diff --git a/mautrix_telegram/util/file_transfer.py b/mautrix_telegram/util/file_transfer.py index c343ab25..572ea559 100644 --- a/mautrix_telegram/util/file_transfer.py +++ b/mautrix_telegram/util/file_transfer.py @@ -30,7 +30,6 @@ from telethon.errors import (AuthBytesInvalidError, AuthKeyInvalidError, Locatio SecurityError, FileIdInvalidError) from mautrix.appservice import IntentAPI -from mautrix.util.network_retry import call_with_net_retry from ..tgclient import MautrixTelegramClient from ..db import TelegramFile as DBTelegramFile @@ -145,8 +144,7 @@ async def transfer_thumbnail_to_matrix(client: MautrixTelegramClient, intent: In if encrypt: file, decryption_info = encrypt_attachment(file) upload_mime_type = "application/octet-stream" - content_uri = await call_with_net_retry(intent.upload_media, file, upload_mime_type, - _action="upload media") + content_uri = await intent.upload_media(file, upload_mime_type) if decryption_info: decryption_info.url = content_uri @@ -239,8 +237,7 @@ async def _unlocked_transfer_file_to_matrix(client: MautrixTelegramClient, inten if encrypt and encrypt_attachment: file, decryption_info = encrypt_attachment(file) upload_mime_type = "application/octet-stream" - content_uri = await call_with_net_retry(intent.upload_media, file, upload_mime_type, - _action="upload media") + content_uri = await intent.upload_media(file, upload_mime_type) if decryption_info: decryption_info.url = content_uri diff --git a/requirements.txt b/requirements.txt index e2189041..b75e2231 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,6 @@ python-magic>=0.4,<0.5 commonmark>=0.8,<0.10 aiohttp>=3,<4 yarl>=1,<2 -mautrix>=0.8.11,<0.9 +mautrix>=0.9,<0.10 telethon>=1.20,<1.22 telethon-session-sqlalchemy>=0.2.14,<0.3