Browse Source

Use CDN URL for assets.

pull/460/head
Rapptz 8 years ago
parent
commit
f0fb91c35d
  1. 18
      discord/enums.py
  2. 2
      discord/server.py
  3. 4
      discord/user.py

18
discord/enums.py

@ -86,18 +86,12 @@ class Status(Enum):
return self.value return self.value
class DefaultAvatar(Enum): class DefaultAvatar(Enum):
blurple = "6debd47ed13483642cf09e832ed0bc1b" blurple = 0
grey = "322c936a8c8be1b803cd94861bdfa868" grey = 1
green = "dd4dbc0016779df1378e7812eabaa04d" gray = 1
orange = "0e291f67c9274a1abdddeb3fd919cbaa" green = 2
red = "1cbd08c76f8af6dddce02c5138971129" orange = 3
red = 4
def __new__(cls, url):
value = len(cls.__members__)
obj = object.__new__(cls)
obj._value_ = value
obj.url = url
return obj
def __str__(self): def __str__(self):
return self.name return self.name

2
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.""" """Returns the URL version of the server's icon. Returns an empty string if it has no icon."""
if self.icon is None: if self.icon is None:
return '' 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 @property
def splash_url(self): def splash_url(self):

4
discord/user.py

@ -86,7 +86,7 @@ class User:
if self.avatar is None: if self.avatar is None:
return '' 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_'): if self.avatar.startswith('a_'):
return url.format(self, 'gif') return url.format(self, 'gif')
else: else:
@ -100,7 +100,7 @@ class User:
@property @property
def default_avatar_url(self): def default_avatar_url(self):
"""Returns a URL for a user's default avatar.""" """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 @property
def mention(self): def mention(self):

Loading…
Cancel
Save