iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Don't send connected state when sync is in progress

Browse Source
This commit is contained in:
Tulir Asokan
2021-08-10 18:14:32 +03:00
parent 5a76b5bcdc
commit ecdaaea3b9
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/user.py
+6 -1
View File
@@ -94,6 +94,7 @@ class User(AbstractUser, BaseUser):
self._db_instance = db_instance self._db_instance = db_instance
self._ensure_started_lock = asyncio.Lock() self._ensure_started_lock = asyncio.Lock()
self._track_connection_task = None self._track_connection_task = None
self._is_backfilling = False
(self.relaybot_whitelisted, (self.relaybot_whitelisted,
self.whitelisted, self.whitelisted,
@@ -224,7 +225,8 @@ class User(AbstractUser, BaseUser):
connected = self._is_connected connected = self._is_connected
self._track_metric(METRIC_CONNECTED, connected) self._track_metric(METRIC_CONNECTED, connected)
if connected: if connected:
await self.push_bridge_state(BridgeStateEvent.CONNECTED, ttl=3600) await self.push_bridge_state(BridgeStateEvent.BACKFILLING if self._is_backfilling
else BridgeStateEvent.CONNECTED, ttl=3600)
else: else:
await self.push_bridge_state(BridgeStateEvent.UNKNOWN_ERROR, ttl=240, await self.push_bridge_state(BridgeStateEvent.UNKNOWN_ERROR, ttl=240,
error="tg-not-connected") error="tg-not-connected")
@@ -270,10 +272,13 @@ class User(AbstractUser, BaseUser):
if not self.is_bot and config["bridge.startup_sync"]: if not self.is_bot and config["bridge.startup_sync"]:
try: try:
self._is_backfilling = True
await self.sync_dialogs() await self.sync_dialogs()
await self.sync_contacts() await self.sync_contacts()
except Exception: except Exception:
self.log.exception("Failed to run post-login sync") self.log.exception("Failed to run post-login sync")
finally:
self._is_backfilling = False
async def update(self, update: TypeUpdate) -> bool: async def update(self, update: TypeUpdate) -> bool:
if not self.is_bot: if not self.is_bot: