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

Use f-strings in more places that were missed.

Browse Source
This commit is contained in:
Rapptz
2021-04-08 06:02:47 -04:00
parent c3e0b6e123
commit 99fc950510
34 changed files with 220 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
discord/asset.py
View File

@ -88,7 +88,7 @@ class Asset:
if format is None:
format = 'gif' if user.is_avatar_animated() else static_format
return cls(state, '/avatars/{0.id}/{0.avatar}.{1}?size={2}'.format(user, format, size))
return cls(state, f'/avatars/{user.id}/{user.avatar}.{format}?size={size}')
@classmethod
def _from_icon(cls, state, object, path, *, format='webp', size=1024):
@ -100,7 +100,7 @@ class Asset:
if format not in VALID_STATIC_FORMATS:
raise InvalidArgument(f"format must be None or one of {VALID_STATIC_FORMATS}")
url = '/{0}-icons/{1.id}/{1.icon}.{2}?size={3}'.format(path, object, format, size)
url = f'/{path}-icons/{object.id}/{object.icon}.{format}?size={size}'
return cls(state, url)
@classmethod
@ -113,7 +113,7 @@ class Asset:
if format not in VALID_STATIC_FORMATS:
raise InvalidArgument(f"format must be None or one of {VALID_STATIC_FORMATS}")
url = '/app-assets/{0.id}/store/{0.cover_image}.{1}?size={2}'.format(obj, format, size)
url = f'/app-assets/{obj.id}/store/{obj.cover_image}.{format}?size={size}'
return cls(state, url)
@classmethod
@ -126,8 +126,7 @@ class Asset:
if hash is None:
return cls(state)
url = '/{key}/{0}/{1}.{2}?size={3}'
return cls(state, url.format(id, hash, format, size, key=key))
return cls(state, f'/{key}/{id}/{hash}.{format}?size={size}')
@classmethod
def _from_guild_icon(cls, state, guild, *, format=None, static_format='webp', size=1024):
@ -146,14 +145,14 @@ class Asset:
if format is None:
format = 'gif' if guild.is_icon_animated() else static_format
return cls(state, '/icons/{0.id}/{0.icon}.{1}?size={2}'.format(guild, format, size))
return cls(state, f'/icons/{guild.id}/{guild.icon}.{format}?size={size}')
@classmethod
def _from_sticker_url(cls, state, sticker, *, size=1024):
if not utils.valid_icon_size(size):
raise InvalidArgument("size must be a power of 2 between 16 and 4096")
return cls(state, '/stickers/{0.id}/{0.image}.png?size={2}'.format(sticker, format, size))
return cls(state, f'/stickers/{sticker.id}/{sticker.image}.png?size={size}')
@classmethod
def _from_emoji(cls, state, emoji, *, format=None, static_format='png'):