Browse Source

Update data sent in bridge status updates

Tulir Asokan 4 years ago
parent
commit
7bbe16665e
3 changed files with 10 additions and 6 deletions
  1. 8 4
      mautrix_instagram/user.py
  2. 1 1
      optional-requirements.txt
  3. 1 1
      requirements.txt

+ 8 - 4
mautrix_instagram/user.py

@@ -46,11 +46,10 @@ METRIC_CONNECTED = Gauge("bridge_connected", "Bridged users connected to Instagr
 
 BridgeState.human_readable_errors.update({
     "ig-connection-error": "Instagram disconnected unexpectedly",
-    "ig-logged-out": "You logged out from Instagram",
     "ig-auth-error": "Authentication error from Instagram: {message}",
     "ig-disconnected": None,
     "ig-no-mqtt": "You're not connected to Instagram",
-    "ig-not-logged-in": "You're not logged into Instagram",
+    "logged-out": "You're not logged into Instagram",
 })
 
 
@@ -180,9 +179,14 @@ class User(DBUser, BaseUser):
                 await self.update()
         return self.notice_room
 
+    async def fill_bridge_state(self, state: BridgeState) -> None:
+        await super().fill_bridge_state(state)
+        state.remote_id = str(self.igpk)
+        state.remote_name = f"@{self.username}"
+
     async def get_bridge_state(self) -> BridgeState:
         if not self.client:
-            return BridgeState(ok=False, error="ig-not-logged-in")
+            return BridgeState(ok=False, error="logged-out")
         elif not self._listen_task or self._listen_task.done() or not self.is_connected:
             return BridgeState(ok=False, error="ig-no-mqtt")
         return BridgeState(ok=True)
@@ -357,7 +361,7 @@ class User(DBUser, BaseUser):
                 pass
             self.igpk = None
         else:
-            await self.push_bridge_state(ok=False, error="ig-logged-out")
+            await self.push_bridge_state(ok=False, error="logged-out")
         self.client = None
         self.mqtt = None
         self.state = None

+ 1 - 1
optional-requirements.txt

@@ -6,7 +6,7 @@ python-olm>=3,<4
 unpaddedbase64>=1,<2
 
 #/metrics
-prometheus_client>=0.6,<0.11
+prometheus_client>=0.6,<0.12
 
 #/imageconvert
 pillow>=4,<9

+ 1 - 1
requirements.txt

@@ -4,7 +4,7 @@ commonmark>=0.8,<0.10
 aiohttp>=3,<4
 yarl>=1,<2
 attrs>=20.1
-mautrix>=0.9.3,<0.10
+mautrix>=0.9.4,<0.10
 asyncpg>=0.20,<0.24
 pycryptodome>=3,<4
 paho-mqtt>=1.5,<2