Explorar o código

contact names: use new contact_name field instead of name

Requires https://gitlab.com/signald/signald/-/merge_requests/148

Signed-off-by: Sumner Evans <sumner@beeper.com>
Sumner Evans %!s(int64=3) %!d(string=hai) anos
pai
achega
c17654d6f0
Modificáronse 3 ficheiros con 6 adicións e 3 borrados
  1. 1 0
      mausignald/types.py
  2. 3 3
      mautrix_signal/puppet.py
  3. 2 0
      mautrix_signal/web/provisioning_api.py

+ 1 - 0
mausignald/types.py

@@ -147,6 +147,7 @@ class Capabilities(SerializableAttrs):
 class Profile(SerializableAttrs):
     address: Optional[Address] = None
     name: str = ""
+    contact_name: str = ""
     profile_name: str = ""
     about: str = ""
     avatar: str = ""

+ 3 - 3
mautrix_signal/puppet.py

@@ -269,13 +269,13 @@ class Puppet(DBPuppet, BasePuppet):
             if info.profile_name:
                 name = info.profile_name
                 quality = 90 if contact_names == "prefer" else 100
-            if info.name:
+            if info.contact_name:
                 if contact_names == "prefer":
                     quality = 100
-                    name = info.name
+                    name = info.contact_name
                 elif contact_names == "allow" and not name:
                     quality = 50
-                    name = info.name
+                    name = info.contact_name
             names = name.split("\x00") if name else []
         else:
             address = info

+ 2 - 0
mautrix_signal/web/provisioning_api.py

@@ -378,6 +378,8 @@ class ProvisioningAPI:
             avatar_url = puppet.avatar_url if puppet else None
             return {
                 "name": profile.name,
+                "contact_name": profile.contact_name,
+                "profile_name": profile.profile_name,
                 "avatar_url": avatar_url,
                 "address": profile.address.serialize(),
             }