diff --git a/mautrix_telegram/config.py b/mautrix_telegram/config.py index 3b172f5c..2fdf9c7c 100644 --- a/mautrix_telegram/config.py +++ b/mautrix_telegram/config.py @@ -137,7 +137,6 @@ class Config(BaseBridgeConfig): copy("bridge.inline_images") copy("bridge.image_as_file_size") copy("bridge.image_as_file_pixels") - copy("bridge.max_document_size") copy("bridge.parallel_file_transfer") copy("bridge.federate_rooms") copy("bridge.animated_sticker.target") diff --git a/mautrix_telegram/example-config.yaml b/mautrix_telegram/example-config.yaml index c3a316d4..29552262 100644 --- a/mautrix_telegram/example-config.yaml +++ b/mautrix_telegram/example-config.yaml @@ -210,8 +210,6 @@ bridge: image_as_file_size: 10 # Maximum number of pixels in an image before sending to Telegram as a document. Defaults to 1280x1280 = 1638400. image_as_file_pixels: 1638400 - # Maximum size of Telegram documents in megabytes to bridge. - max_document_size: 100 # Enable experimental parallel file transfer, which makes uploads/downloads much faster by # streaming from/to Matrix and using many connections for Telegram. # Note that generating HQ thumbnails for videos is not possible with streamed transfers. diff --git a/mautrix_telegram/portal.py b/mautrix_telegram/portal.py index 8ef512cf..6a146fb2 100644 --- a/mautrix_telegram/portal.py +++ b/mautrix_telegram/portal.py @@ -2354,7 +2354,7 @@ class Portal(DBPortal, BasePortal): attrs = self._parse_telegram_document_attributes(document.attributes) - if document.size > self.config["bridge.max_document_size"] * 1000**2: + if document.size > self.matrix.media_config.upload_size: name = attrs.name or "" caption = f"\n{evt.message}" if evt.message else "" # TODO encrypt @@ -2758,7 +2758,7 @@ class Portal(DBPortal, BasePortal): "chats": self.peer_type == "chat", "users": self.peer_type == "user", "channels": (self.peer_type == "channel" and not self.megagroup), - "max_file_size": min(self.config["bridge.max_document_size"], 2000) * 1024 * 1024, + "max_file_size": min(self.matrix.media_config.upload_size, 2000 * 1024 * 1024), } async def backfill(