Browse Source

Fix Member.colour to use the new algorithm for determining colour.

pull/210/head
Rapptz 9 years ago
parent
commit
9077b4e319
  1. 13
      discord/member.py

13
discord/member.py

@ -117,12 +117,19 @@ class Member(User):
There is an alias for this under ``color``. There is an alias for this under ``color``.
""" """
default_colour = Colour.default()
# highest order of the colour is the one that gets rendered. # highest order of the colour is the one that gets rendered.
# if the highest is the default colour then the next one with a colour
# is chosen instead
if self.roles: if self.roles:
role = max(self.roles, key=lambda r: r.position) roles = sorted(self.roles, key=lambda r: r.position, reverse=True)
return role.colour for role in roles:
if role.colour == default_colour:
continue
else: else:
return Colour.default() return role.colour
return default_colour
color = colour color = colour

Loading…
Cancel
Save