matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

hmm

Browse Source
This commit is contained in:
iDutchy 2020-10-01 22:22:53 +00:00
parent 7afaa6dfce
commit 768f409a84
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
discord/client.py
View File

@ -235,7 +235,19 @@ class Client:
self._listeners = {} self._listeners = {}
self.shard_id = options.get('shard_id') self.shard_id = options.get('shard_id')
self.shard_count = options.get('shard_count') self.shard_count = options.get('shard_count')
self._embed_color = options.get('embed_color') colour = options.get('embed_color')
if isinstance(colour, (Color, Colour)):
self.embed_color = str(hex(colour))
os.environ['DEFAULT_EMBED_COLOR'] = str(hex(colour))
else:
try:
HEX = re.compile(r'^(#)[A-Fa-f0-9]{6}$')
col = Color(colour)
if HEX.match(str(col)):
self.embed_color = str(hex(col))
os.environ['DEFAULT_EMBED_COLOR'] = str(hex(col))
except:
raise TypeError('embed_color must be an instance of discord.Colour or a valid 0x****** hex value.')
connector = options.pop('connector', None) connector = options.pop('connector', None)
proxy = options.pop('proxy', None) proxy = options.pop('proxy', None)
@ -285,18 +297,7 @@ class Client:
@embed_color.setter @embed_color.setter
def embed_color(self, value): def embed_color(self, value):
if isinstance(value, (Color, Colour)):
self._embed_color = str(hex(value))
os.environ['DEFAULT_EMBED_COLOR'] = str(int(value))
else:
try:
HEX = re.compile(r'^(#)[A-Fa-f0-9]{6}$')
col = Color(value)
if HEX.match(str(col)):
self._embed_color = str(int(col))
os.environ['DEFAULT_EMBED_COLOR'] = str(hex(col))
except:
raise TypeError('embed_color must be an instance of discord.Colour or a valid 0x****** hex value.')
@property @property
def latency(self): def latency(self):