From f923552f86af2e6311ce01a27c52fb294ac7d694 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 22 Jun 2021 19:25:08 +0300
Subject: [PATCH] Update mautrix-python (ref #623)

---
 mautrix_telegram/user.py | 19 ++++++++++++++-----
 requirements.txt         |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/mautrix_telegram/user.py b/mautrix_telegram/user.py
index 272089ec..6d3d64d0 100644
--- a/mautrix_telegram/user.py
+++ b/mautrix_telegram/user.py
@@ -211,12 +211,16 @@ class User(AbstractUser, BaseUser):
             self.client.session.delete()
         return self
 
+    @property
+    def _is_connected(self) -> bool:
+        return bool(self.client and self.client._sender
+                    and self.client._sender._transport_connected)
+
     async def _track_connection(self) -> None:
         self.log.debug("Starting loop to track connection state")
         while True:
             await asyncio.sleep(3)
-            connected = bool(self.client._sender._transport_connected
-                             if self.client and self.client._sender else False)
+            connected = self._is_connected
             self._track_metric(METRIC_CONNECTED, connected)
             await self.push_bridge_state(ok=connected, ttl=3600 if connected else 240,
                                          error="tg-not-connected" if not connected else None)
@@ -227,13 +231,18 @@ class User(AbstractUser, BaseUser):
         state.remote_name = self.human_tg_id
 
     async def get_bridge_state(self) -> BridgeState:
-        if not self.client:
+        if not self.tgid:
             return BridgeState(ok=False, error="logged-out")
-        elif not self.client._sender or not self.client._sender._transport_connected:
+        elif not self._is_connected:
             return BridgeState(ok=False, error="tg-not-connected")
         else:
             return BridgeState(ok=True)
 
+    async def get_puppet(self) -> Optional['pu.Puppet']:
+        if not self.tgid:
+            return None
+        return pu.Puppet.get(self.tgid)
+
     async def stop(self) -> None:
         await super().stop()
         if self._track_connection_task:
@@ -332,6 +341,7 @@ class User(AbstractUser, BaseUser):
         self.portals = {}
         self.contacts = []
         await self.save(portals=True, contacts=True)
+        await self.push_bridge_state(ok=False, error="logged-out")
         if self.tgid:
             try:
                 del self.by_tgid[self.tgid]
@@ -345,7 +355,6 @@ class User(AbstractUser, BaseUser):
         self.delete()
         await self.stop()
         self._track_metric(METRIC_LOGGED_IN, False)
-        await self.push_bridge_state(ok=False, error="logged-out")
         return True
 
     def _search_local(self, query: str, max_results: int = 5, min_similarity: int = 45
diff --git a/requirements.txt b/requirements.txt
index 0b49879a..446589d8 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.9.3,<0.10
+mautrix>=0.9.7,<0.10
 telethon>=1.20,<1.22
 telethon-session-sqlalchemy>=0.2.14,<0.3