mirror
/
Rapptz.discord.py
mirror of https://github.com/Rapptz/discord.py
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Return invites as https, various URL normalization

pull/2459/head
Devon R 5 years ago
committed by Rapptz
parent
46246a2844
commit
f5ebf42e1f
8 changed files with 23 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      discord/abc.py
  2. 5
      discord/activity.py
  3. 18
      discord/asset.py
  4. 4
      discord/emoji.py
  5. 4
      discord/invite.py
  6. 2
      discord/user.py
  7. 4
      discord/webhook.py
  8. 2
      docs/locale/ja/LC_MESSAGES/api.po

2
discord/abc.py
View File

@ -350,7 +350,7 @@ class GuildChannel:
"""Returns all of the channel's overwrites. """Returns all of the channel's overwrites.
This is returned as a dictionary where the key contains the target which This is returned as a dictionary where the key contains the target which
can be either a :class:`~discord.Role` or a :class:`~discord.Member` and the key is the can be either a :class:`~discord.Role` or a :class:`~discord.Member` and the value is the
overwrite as a :class:`~discord.PermissionOverwrite`. overwrite as a :class:`~discord.PermissionOverwrite`.
Returns Returns

5
discord/activity.py
View File

@ -26,6 +26,7 @@ DEALINGS IN THE SOFTWARE.
import datetime import datetime
from .asset import Asset
from .enums import ActivityType, try_enum from .enums import ActivityType, try_enum
from .colour import Colour from .colour import Colour
from .utils import _get_as_snowflake from .utils import _get_as_snowflake
@ -205,7 +206,7 @@ class Activity(_ActivityTag):
except KeyError: except KeyError:
return None return None
else: else:
return 'https://cdn.discordapp.com/app-assets/{0}/{1}.png'.format(self.application_id, large_image) return Asset.BASE + 'app-assets/{0}/{1}.png'.format(self.application_id, large_image)
@property @property
def small_image_url(self): def small_image_url(self):
@ -218,7 +219,7 @@ class Activity(_ActivityTag):
except KeyError: except KeyError:
return None return None
else: else:
return 'https://cdn.discordapp.com/app-assets/{0}/{1}.png'.format(self.application_id, small_image) return Asset.BASE + 'app-assets/{0}/{1}.png'.format(self.application_id, small_image)
@property @property
def large_image_text(self): def large_image_text(self):
"""Optional[:class:`str`]: Returns the large image asset hover text of this activity if applicable.""" """Optional[:class:`str`]: Returns the large image asset hover text of this activity if applicable."""

18
discord/asset.py
View File

@ -63,6 +63,8 @@ class Asset:
""" """
__slots__ = ('_state', '_url') __slots__ = ('_state', '_url')
BASE = 'https://cdn.discordapp.com/'
def __init__(self, state, url=None): def __init__(self, state, url=None):
self._state = state self._state = state
self._url = url self._url = url
@ -84,14 +86,14 @@ class Asset:
if format is None: if format is None:
format = 'gif' if user.is_avatar_animated() else static_format 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 @classmethod
def _from_icon(cls, state, object, path): def _from_icon(cls, state, object, path):
if object.icon is None: if object.icon is None:
return cls(state) 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) return cls(state, url)
@classmethod @classmethod
@ -99,7 +101,7 @@ class Asset:
if obj.cover_image is None: if obj.cover_image is None:
return cls(state) 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) return cls(state, url)
@classmethod @classmethod
@ -112,7 +114,7 @@ class Asset:
if hash is None: if hash is None:
return cls(state) 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)) return cls(state, url.format(id, hash, format, size, key=key))
@classmethod @classmethod
@ -132,15 +134,15 @@ class Asset:
if format is None: if format is None:
format = 'gif' if guild.is_icon_animated() else static_format 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): 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): def __len__(self):
if self._url: if self._url:
return len(self._url) return len(self.BASE + self._url)
return 0 return 0
def __bool__(self): def __bool__(self):
@ -198,7 +200,7 @@ class Asset:
if self._state is None: if self._state is None:
raise DiscordException('Invalid state (no ConnectionState provided)') 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): async def save(self, fp, *, seek_begin=True):
"""|coro| """|coro|

4
discord/emoji.py
View File

@ -122,7 +122,7 @@ class PartialEmoji:
return Asset(self._state) return Asset(self._state)
_format = 'gif' if self.animated else 'png' _format = 'gif' if self.animated else 'png'
url = "https://cdn.discordapp.com/emojis/{0.id}.{1}".format(self, _format) url = "emojis/{0.id}.{1}".format(self, _format)
return Asset(self._state, url) return Asset(self._state, url)
class Emoji: class Emoji:
@ -229,7 +229,7 @@ class Emoji:
def url(self): def url(self):
""":class:`Asset`: Returns the asset of the emoji.""" """:class:`Asset`: Returns the asset of the emoji."""
_format = 'gif' if self.animated else 'png' _format = 'gif' if self.animated else 'png'
url = "https://cdn.discordapp.com/emojis/{0.id}.{1}".format(self, _format) url = "emojis/{0.id}.{1}".format(self, _format)
return Asset(self._state, url) return Asset(self._state, url)
@property @property

4
discord/invite.py
View File

@ -256,6 +256,8 @@ class Invite(Hashable):
'temporary', 'max_uses', 'inviter', 'channel', '_state', 'temporary', 'max_uses', 'inviter', 'channel', '_state',
'approximate_member_count', 'approximate_presence_count' ) 'approximate_member_count', 'approximate_presence_count' )
BASE = 'https://discord.gg/'
def __init__(self, *, state, data): def __init__(self, *, state, data):
self._state = state self._state = state
self.max_age = data.get('max_age') self.max_age = data.get('max_age')
@ -309,7 +311,7 @@ class Invite(Hashable):
@property @property
def url(self): def url(self):
""":class:`str`: A property that retrieves the invite URL.""" """:class:`str`: A property that retrieves the invite URL."""
return 'http://discord.gg/' + self.code return self.BASE + self.code
async def delete(self, *, reason=None): async def delete(self, *, reason=None):
"""|coro| """|coro|

2
discord/user.py
View File

@ -181,7 +181,7 @@ class BaseUser(_BaseUser):
@property @property
def default_avatar_url(self): def default_avatar_url(self):
""":class:`Asset`: Returns a URL for a user's default avatar.""" """:class:`Asset`: Returns a URL for a user's default avatar."""
return Asset(self._state, 'https://cdn.discordapp.com/embed/avatars/{}.png'.format(self.default_avatar.value)) return Asset(self._state, 'embed/avatars/{}.png'.format(self.default_avatar.value))
@property @property
def colour(self): def colour(self):

4
discord/webhook.py
View File

@ -586,7 +586,7 @@ class Webhook:
""" """
if self.avatar is None: if self.avatar is None:
# Default is always blurple apparently # Default is always blurple apparently
return Asset(self._state, 'https://cdn.discordapp.com/embed/avatars/0.png') return Asset(self._state, 'embed/avatars/0.png')
if not utils.valid_icon_size(size): if not utils.valid_icon_size(size):
raise InvalidArgument("size must be a power of 2 between 16 and 1024") raise InvalidArgument("size must be a power of 2 between 16 and 1024")
@ -596,7 +596,7 @@ class Webhook:
if format not in ('png', 'jpg', 'jpeg'): if format not in ('png', 'jpg', 'jpeg'):
raise InvalidArgument("format must be one of 'png', 'jpg', or 'jpeg'.") raise InvalidArgument("format must be one of 'png', 'jpg', or 'jpeg'.")
url = 'https://cdn.discordapp.com/avatars/{0.id}/{0.avatar}.{1}?size={2}'.format(self, format, size) url = 'avatars/{0.id}/{0.avatar}.{1}?size={2}'.format(self, format, size)
return Asset(self._state, url) return Asset(self._state, url)
def delete(self): def delete(self):

2
docs/locale/ja/LC_MESSAGES/api.po
View File

@ -5696,7 +5696,7 @@ msgstr ""
msgid "" msgid ""
"This is returned as a dictionary where the key contains the target which " "This is returned as a dictionary where the key contains the target which "
"can be either a :class:`~discord.Role` or a :class:`~discord.Member` and " "can be either a :class:`~discord.Role` or a :class:`~discord.Member` and "
"the key is the overwrite as a :class:`~discord.PermissionOverwrite`." "the value is the overwrite as a :class:`~discord.PermissionOverwrite`."
msgstr "" msgstr ""
#: discord.CategoryChannel.overwrites:7 discord.TextChannel.overwrites:7 #: discord.CategoryChannel.overwrites:7 discord.TextChannel.overwrites:7

Write Preview
Loading…
Cancel
Save