From 0860df8fa523f3a4072d5bbde56ce1f9513ebc0e Mon Sep 17 00:00:00 2001 From: iDutchy Date: Thu, 1 Oct 2020 21:53:49 +0000 Subject: [PATCH] hmm --- discord/client.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/discord/client.py b/discord/client.py index 999263f9..ecdbca8f 100644 --- a/discord/client.py +++ b/discord/client.py @@ -285,15 +285,19 @@ class Client: @embed_color.setter def embed_color(self, value): - HEX = re.compile(r'^(0x)[A-Fa-f0-9]{6}$') + if isinstance(value, (Color, Colour)): - self._embed_color = hex(value) - os.environ['DEFAULT_EMBED_COLOR'] = str(hex(value)) - elif HEX.match(str(value)): - self._embed_color = value + self._embed_color = str(value) os.environ['DEFAULT_EMBED_COLOR'] = str(value) else: - raise TypeError('embed_color must be an instance of discord.Colour or a valid 0x****** hex value.') + try: + HEX = re.compile(r'^(#)[A-Fa-f0-9]{6}$') + col = str(Color(value)) + if HEX.match(col): + self._embed_color = col + os.environ['DEFAULT_EMBED_COLOR'] = str(col) + except: + raise TypeError('embed_color must be an instance of discord.Colour or a valid 0x****** hex value.') @property def latency(self):