From f0fb91c35d79e8cf70bd32c061e49ed34d268f19 Mon Sep 17 00:00:00 2001 From: Rapptz Date: Mon, 9 Jan 2017 19:36:48 -0500 Subject: [PATCH] Use CDN URL for assets. --- discord/enums.py | 18 ++++++------------ discord/server.py | 2 +- discord/user.py | 4 ++-- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/discord/enums.py b/discord/enums.py index 37195cbb5..e8dc62d5f 100644 --- a/discord/enums.py +++ b/discord/enums.py @@ -86,18 +86,12 @@ class Status(Enum): return self.value class DefaultAvatar(Enum): - blurple = "6debd47ed13483642cf09e832ed0bc1b" - grey = "322c936a8c8be1b803cd94861bdfa868" - green = "dd4dbc0016779df1378e7812eabaa04d" - orange = "0e291f67c9274a1abdddeb3fd919cbaa" - red = "1cbd08c76f8af6dddce02c5138971129" - - def __new__(cls, url): - value = len(cls.__members__) - obj = object.__new__(cls) - obj._value_ = value - obj.url = url - return obj + blurple = 0 + grey = 1 + gray = 1 + green = 2 + orange = 3 + red = 4 def __str__(self): return self.name diff --git a/discord/server.py b/discord/server.py index 18e9647ee..df6bc7dc7 100644 --- a/discord/server.py +++ b/discord/server.py @@ -266,7 +266,7 @@ class Server(Hashable): """Returns the URL version of the server's icon. Returns an empty string if it has no icon.""" if self.icon is None: return '' - return 'https://discordapp.com/api/guilds/{0.id}/icons/{0.icon}.jpg'.format(self) + return 'https://cdn.discordapp.com/icons/{0.id}/{0.icon}.jpg'.format(self) @property def splash_url(self): diff --git a/discord/user.py b/discord/user.py index 37f0cc518..c51955bb3 100644 --- a/discord/user.py +++ b/discord/user.py @@ -86,7 +86,7 @@ class User: if self.avatar is None: return '' - url = 'https://images.discordapp.net/avatars/{0.id}/{0.avatar}.{1}?size=1024' + url = 'https://cdn.discordapp.com/avatars/{0.id}/{0.avatar}.{1}?size=1024' if self.avatar.startswith('a_'): return url.format(self, 'gif') else: @@ -100,7 +100,7 @@ class User: @property def default_avatar_url(self): """Returns a URL for a user's default avatar.""" - return 'https://discordapp.com/assets/{0.url}.png'.format(self.default_avatar) + return 'https://cdn.discordapp.com/embed/avatars/{}.png'.format(self.default_avatar.value) @property def mention(self):