Use guild.emoji_limit and implicit string concatenation

This commit is contained in:
StarrFox 2020-04-26 23:27:21 -05:00
parent c857ce1d20
commit add1b041a5
1 changed files with 9 additions and 23 deletions

View File

@ -410,19 +410,7 @@ class Emotes(commands.Cog):
async def status(self, context):
"""See Current status of emotes on this server.
"""
premium_tier = context.guild.premium_tier
if premium_tier == 1:
max_emotes = 200
elif premium_tier == 2:
max_emotes = 300
elif premium_tier == 3:
max_emotes = 500
else:
max_emotes = 100
# number of emotes per category
per_cat = max_emotes // 2
emote_limit = context.guild.emoji_limit
static_emotes = animated_emotes = total_emotes = 0
for emote in context.guild.emojis:
@ -433,18 +421,16 @@ class Emotes(commands.Cog):
total_emotes += 1
percent_static = round((static_emotes / per_cat) * 100, 2)
percent_animated = round((animated_emotes / per_cat) * 100, 2)
static_left = per_cat - static_emotes
animated_left = per_cat - animated_emotes
percent_static = round((static_emotes / emote_limit) * 100, 2)
percent_animated = round((animated_emotes / emote_limit) * 100, 2)
message = [
f'Static emotes: **{static_emotes} / {per_cat}** ({static_left} left, {percent_static}% full)',
f'Animated emotes: **{animated_emotes} / {per_cat}** ({animated_left} left, {percent_animated}% full)',
f'Total: **{total_emotes} / {max_emotes}**'
]
static_left = emote_limit - static_emotes
animated_left = emote_limit - animated_emotes
await context.send('\n'.join(message))
await context.send(
f'Static emotes: **{static_emotes} / {emote_limit}** ({static_left} left, {percent_static}% full)\n'
f'Animated emotes: **{animated_emotes} / {emote_limit}** ({animated_left} left, {percent_animated}% full)\n'
f'Total: **{total_emotes} / {emote_limit * 2}**')
async def parse_emote(self, context, name_or_emote):
match = utils.emote.RE_CUSTOM_EMOTE.match(name_or_emote)