Fix Puppet#get_displayname()

This commit is contained in:
Tulir Asokan
2018-01-28 21:58:34 +02:00
parent d8ccbd30b9
commit ec5a75c0c6
+4 -2
View File
@@ -61,12 +61,12 @@ class Puppet:
@staticmethod @staticmethod
def get_displayname(info, format=True): def get_displayname(info, format=True):
data = { data = {
"phone_number": info.phone, "phone number": info.phone,
"username": info.username, "username": info.username,
"full name": " ".join([info.first_name or "", info.last_name or ""]).strip(), "full name": " ".join([info.first_name or "", info.last_name or ""]).strip(),
"full name reversed": " ".join([info.first_name or "", info.last_name or ""]).strip(), "full name reversed": " ".join([info.first_name or "", info.last_name or ""]).strip(),
"first name": info.first_name, "first name": info.first_name,
"last_name": info.last_name, "last name": info.last_name,
} }
preferences = config.get("bridge", {}).get("displayname_preference", preferences = config.get("bridge", {}).get("displayname_preference",
["full name", "username", "phone"]) ["full name", "username", "phone"])
@@ -74,6 +74,8 @@ class Puppet:
name = data[preference] name = data[preference]
if name: if name:
break break
if not name:
name = info.id
if not format: if not format:
return name return name