Skip to content

Commit 7f821d6

Browse files
committed
add lexicographic sort to room displayname calculation
Also some style improvements.
1 parent 3e79193 commit 7f821d6

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

matrix_client/room.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,14 @@ def display_name(self):
8585
# Member display names without me
8686
members = [u.get_display_name() for u in self.get_joined_members() if
8787
self.client.user_id != u.user_id]
88-
first_two = members[:2]
89-
if len(first_two) == 1:
90-
return first_two[0]
88+
members.sort()
89+
90+
if len(members) == 1:
91+
return members[0]
9192
elif len(members) == 2:
92-
return "{0} and {1}".format(
93-
first_two[0],
94-
first_two[1])
93+
return "{0} and {1}".format(members[0], members[1])
9594
elif len(members) > 2:
96-
return "{0} and {1} others".format(
97-
first_two[0],
98-
len(members) - 1)
95+
return "{0} and {1} others".format(members[0], len(members) - 1)
9996
else: # len(members) <= 0 or not an integer
10097
# TODO i18n
10198
return "Empty room"

0 commit comments

Comments
 (0)