Fix random bugs

mautrix_signal/db/puppet.py

@@ -49,7 +49,7 @@ class Puppet:
              "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)")
         await self.db.execute(q, self.uuid, self.number, self.name, self.uuid_registered,
                               self.number_registered, self.custom_mxid, self.access_token,
-                              self.next_batch, str(self.base_url))
+                              self.next_batch, str(self.base_url) if self.base_url else None)
 
     async def _set_uuid(self, uuid: UUID) -> None:
         if self.uuid:
@@ -68,7 +68,7 @@ class Puppet:
                  "WHERE uuid=$1")
         await self.db.execute(q, self.uuid, self.number, self.name, self.uuid_registered,
                               self.number_registered, self.custom_mxid, self.access_token,
-                              self.next_batch, str(self.base_url))
+                              self.next_batch, str(self.base_url) if self.base_url else None)
 
     @classmethod
     def _from_row(cls, row: asyncpg.Record) -> 'Puppet':

mautrix_signal/example-config.yaml

@@ -92,7 +92,6 @@ bridge:
     displayname_preference:
     - full_name
     - phone
-    - uuid
 
     # Whether or not to create portals for all groups on login/connect.
     autocreate_group_portal: true
@@ -117,7 +116,8 @@ bridge:
     # manually.
     # If using this for other servers than the bridge's server,
     # you must also set the URL in the double_puppet_server_map.
-    login_shared_secret_map: {}
+    login_shared_secret_map:
+        example.com: foo
     # Whether or not created rooms should have federation enabled.
     # If false, created portal rooms will never be federated.
     federate_rooms: true

mautrix_signal/user.py

@@ -51,6 +51,7 @@ class User(DBUser, BaseUser):
         self.is_whitelisted, self.is_admin, self.permission_level = perms
         self.log = self.log.getChild(self.mxid)
         self.dm_update_lock = asyncio.Lock()
+        self.command_status = None
 
     @classmethod
     def init_cls(cls, bridge: 'SignalBridge') -> None: