소스 검색

Only sync if subscribe succeeds

Tulir Asokan 4 년 전
부모
커밋
522ba35c49
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      mautrix_signal/puppet.py
  2. 3 3
      mautrix_signal/signal.py

+ 1 - 1
mautrix_signal/puppet.py

@@ -159,7 +159,7 @@ class Puppet(DBPuppet, BasePuppet):
             "first_name": names[0] if len(names) > 0 else "",
             "last_name": names[-1] if len(names) > 1 else "",
             "full_name": " ".join(names),
-            "phone": cls.fmt_phone(address.number) if address.number != None else None,
+            "phone": cls.fmt_phone(address.number) if address.number else None,
             "uuid": str(address.uuid) if address.uuid else None,
         }
         for pref in cls.config["bridge.displayname_preference"]:

+ 3 - 3
mautrix_signal/signal.py

@@ -129,9 +129,9 @@ class SignalHandler(SignaldClient):
     async def start(self) -> None:
         await self.connect()
         async for user in u.User.all_logged_in():
-            # TODO handle errors
-            await self.subscribe(user.username)
-            self.loop.create_task(user.sync())
+            # TODO report errors to user?
+            if await self.subscribe(user.username):
+                self.loop.create_task(user.sync())
 
     async def stop(self) -> None:
         await self.disconnect()