From 468412100c990126f9e89863778c8f770d6ba2ea Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 10 Aug 2019 19:48:33 +0300 Subject: [PATCH] Remove broken catch_up option --- example-config.yaml | 4 ---- mautrix_telegram/bot.py | 6 ------ mautrix_telegram/config.py | 1 - mautrix_telegram/user.py | 2 -- 4 files changed, 13 deletions(-) diff --git a/example-config.yaml b/example-config.yaml index 56e891c4..4a19329f 100644 --- a/example-config.yaml +++ b/example-config.yaml @@ -140,10 +140,6 @@ bridge: plaintext_highlights: false # Whether or not to make portals of publicly joinable channels/supergroups publicly joinable on Matrix. public_portals: true - # Whether or not to fetch and handle Telegram updates at startup from the time the bridge was down. - # Currently only works for private chats and normal groups. - # WARNING: This feature seems to be broken in the telegram library. - catch_up: false # Whether or not to use /sync to get presence, read receipts and typing notifications when using # your own Matrix account as the Matrix puppet for your Telegram account. sync_with_custom_puppets: true diff --git a/mautrix_telegram/bot.py b/mautrix_telegram/bot.py index cf87543e..9002a13d 100644 --- a/mautrix_telegram/bot.py +++ b/mautrix_telegram/bot.py @@ -117,12 +117,6 @@ class Bot(AbstractUser): except (ChannelPrivateError, ChannelInvalidError): self.remove_chat(TelegramID(channel_id.channel_id)) - if config["bridge.catch_up"]: - try: - await self.client.catch_up() - except Exception: - self.log.exception("Failed to run catch_up() for bot") - def register_portal(self, portal: po.Portal) -> None: self.add_chat(portal.tgid, portal.peer_type) diff --git a/mautrix_telegram/config.py b/mautrix_telegram/config.py index eb42b33f..65240713 100644 --- a/mautrix_telegram/config.py +++ b/mautrix_telegram/config.py @@ -92,7 +92,6 @@ class Config(BaseBridgeConfig): copy("bridge.allow_matrix_login") copy("bridge.plaintext_highlights") copy("bridge.public_portals") - copy("bridge.catch_up") copy("bridge.sync_with_custom_puppets") copy("bridge.telegram_link_preview") copy("bridge.inline_images") diff --git a/mautrix_telegram/user.py b/mautrix_telegram/user.py index 008ad57d..c181d9bf 100644 --- a/mautrix_telegram/user.py +++ b/mautrix_telegram/user.py @@ -197,8 +197,6 @@ class User(AbstractUser): if not self.is_bot and config["bridge.startup_sync"]: await self.sync_dialogs() await self.sync_contacts() - if config["bridge.catch_up"]: - await self.client.catch_up() except Exception: self.log.exception("Failed to run post-login functions for %s", self.mxid)