From 9077b4e319807fd2791a28c55d41cf4fcd149365 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Thu, 12 May 2016 21:35:17 -0400
Subject: [PATCH] Fix Member.colour to use the new algorithm for determining
 colour.

---
 discord/member.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/discord/member.py b/discord/member.py
index af8d82102..237637280 100644
--- a/discord/member.py
+++ b/discord/member.py
@@ -117,12 +117,19 @@ class Member(User):
         There is an alias for this under ``color``.
         """
 
+        default_colour = Colour.default()
         # 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:
-            role = max(self.roles, key=lambda r: r.position)
-            return role.colour
-        else:
-            return Colour.default()
+            roles = sorted(self.roles, key=lambda r: r.position, reverse=True)
+            for role in roles:
+                if role.colour == default_colour:
+                    continue
+                else:
+                    return role.colour
+
+        return default_colour
 
     color = colour