mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-09-06 09:56:09 +00:00
Code Issues Projects Releases Wiki Activity

Return invites as https, various URL normalization

Browse Source
This commit is contained in:
Devon R
2019-11-14 21:37:23 +00:00
committed by Rapptz
parent 46246a2844
commit f5ebf42e1f
8 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
discord/asset.py
View File

@ -63,6 +63,8 @@ class Asset:
"""
__slots__ = ('_state', '_url')
BASE = 'https://cdn.discordapp.com/'
def __init__(self, state, url=None):
self._state = state
self._url = url
@ -84,14 +86,14 @@ class Asset:
if format is None:
format = 'gif' if user.is_avatar_animated() else static_format
return cls(state, 'https://cdn.discordapp.com/avatars/{0.id}/{0.avatar}.{1}?size={2}'.format(user, format, size))
return cls(state, 'avatars/{0.id}/{0.avatar}.{1}?size={2}'.format(user, format, size))
@classmethod
def _from_icon(cls, state, object, path):
if object.icon is None:
return cls(state)
url = 'https://cdn.discordapp.com/{0}-icons/{1.id}/{1.icon}.jpg'.format(path, object)
url = '{0}-icons/{1.id}/{1.icon}.jpg'.format(path, object)
return cls(state, url)
@classmethod
@ -99,7 +101,7 @@ class Asset:
if obj.cover_image is None:
return cls(state)
url = 'https://cdn.discordapp.com/app-assets/{0.id}/store/{0.cover_image}.jpg'.format(obj)
url = 'app-assets/{0.id}/store/{0.cover_image}.jpg'.format(obj)
return cls(state, url)
@classmethod
@ -112,7 +114,7 @@ class Asset:
if hash is None:
return cls(state)
url = 'https://cdn.discordapp.com/{key}/{0}/{1}.{2}?size={3}'
url = '{key}/{0}/{1}.{2}?size={3}'
return cls(state, url.format(id, hash, format, size, key=key))
@classmethod
@ -132,15 +134,15 @@ class Asset:
if format is None:
format = 'gif' if guild.is_icon_animated() else static_format
return cls(state, 'https://cdn.discordapp.com/icons/{0.id}/{0.icon}.{1}?size={2}'.format(guild, format, size))
return cls(state, 'icons/{0.id}/{0.icon}.{1}?size={2}'.format(guild, format, size))
def __str__(self):
return self._url if self._url is not None else ''
return self.BASE + self._url if self._url is not None else ''
def __len__(self):
if self._url:
return len(self._url)
return len(self.BASE + self._url)
return 0
def __bool__(self):
@ -198,7 +200,7 @@ class Asset:
if self._state is None:
raise DiscordException('Invalid state (no ConnectionState provided)')
return await self._state.http.get_from_cdn(self._url)
return await self._state.http.get_from_cdn(self.BASE + self._url)
async def save(self, fp, *, seek_begin=True):
"""|coro|