jarvis/jarvis-bot
jarvis/jarvis-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix avatars and component callback checks

Browse source
This commit is contained in:
Zeva Rose 2022-02-04 10:18:43 -07:00
parent 2d7b78f956
commit 82b906cdb1
12 changed files with 33 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
jarvis/cogs/admin/kick.py
View file

@ -42,7 +42,7 @@ class KickCog(Scale):
embed.set_author( embed.set_author(
name=ctx.author.username + "#" + ctx.author.discriminator, name=ctx.author.username + "#" + ctx.author.discriminator,
icon_url=ctx.author.display_avatar, icon_url=ctx.author.display_avatar.url,
) )
embed.set_thumbnail(url=ctx.guild.icon.url) embed.set_thumbnail(url=ctx.guild.icon.url)
@ -60,12 +60,9 @@ class KickCog(Scale):
fields=fields, fields=fields,
) )
embed.set_author( embed.set_author(name=user.display_name, icon_url=user.display_avatar.url)
name=user.nick if user.nick else user.name, embed.set_thumbnail(url=user.display_avatar.url)
icon_url=user.display_avatar, embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}")
)
embed.set_thumbnail(url=user.display_avatar)
embed.set_footer(text=f"{user.name}#{user.discriminator} | {user.id}")
await ctx.send(embed=embed) await ctx.send(embed=embed)
_ = Kick( _ = Kick(

21
jarvis/cogs/admin/mute.py
View file

@ -88,11 +88,8 @@ class MuteCog(Scale):
description=f"{user.mention} has been muted", description=f"{user.mention} has been muted",
fields=[EmbedField(name="Reason", value=reason)], fields=[EmbedField(name="Reason", value=reason)],
) )
embed.set_author( embed.set_author(name=user.display_name, icon_url=user.display_avatar.url)
name=user.display_name, embed.set_thumbnail(url=user.display_avatar.url)
icon_url=user.display_avatar,
)
embed.set_thumbnail(url=user.display_avatar)
embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}") embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}")
await ctx.send(embed=embed) await ctx.send(embed=embed)
@ -118,17 +115,11 @@ class MuteCog(Scale):
description=f"{user.mention} has been unmuted", description=f"{user.mention} has been unmuted",
fields=[], fields=[],
) )
embed.set_author( embed.set_author(name=user.display_name, icon_url=user.display_avatar.url)
name=user.display_name, embed.set_thumbnail(url=user.display_avatar.url)
icon_url=user.display_avatar,
)
embed.set_thumbnail(url=user.display_avatar)
embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}") embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}")
await ctx.send(embed=embed) await ctx.send(embed=embed)
embed.set_author( embed.set_author(name=user.display_name, icon_url=user.display_avatar.url)
name=user.display_name, embed.set_thumbnail(url=user.display_avatar.url)
icon_url=user.display_avatar,
)
embed.set_thumbnail(url=user.display_avatar)
embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}") embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}")
await ctx.send(embed=embed) await ctx.send(embed=embed)

2
jarvis/cogs/admin/roleping.py
View file

@ -111,7 +111,7 @@ class RolepingCog(CacheCog):
if not admin: if not admin:
admin = self.bot.user admin = self.bot.user
embed.set_author(name=admin.display_name, icon_url=admin.display_avatar) embed.set_author(name=admin.display_name, icon_url=admin.display_avatar.url)
embed.set_footer(text=f"{admin.name}#{admin.discriminator} | {admin.id}") embed.set_footer(text=f"{admin.name}#{admin.discriminator} | {admin.id}")
embeds.append(embed) embeds.append(embed)

12
jarvis/cogs/admin/warning.py
View file

@ -67,10 +67,7 @@ class WarningCog(CacheCog):
description=f"{user.mention} has been warned", description=f"{user.mention} has been warned",
fields=fields, fields=fields,
) )
embed.set_author( embed.set_author(name=user.display_name, icon_url=user.display_avatar.url)
name=user.display_name,
icon_url=user.display_avatar,
)
embed.set_footer(text=f"{user.name}#{user.discriminator} | {user.id}") embed.set_footer(text=f"{user.name}#{user.discriminator} | {user.id}")
await ctx.send(embed=embed) await ctx.send(embed=embed)
@ -114,7 +111,7 @@ class WarningCog(CacheCog):
description=f"{warnings.count()} total | 0 currently active", description=f"{warnings.count()} total | 0 currently active",
fields=[], fields=[],
) )
embed.set_author(name=user.username, icon_url=user.display_avatar) embed.set_author(name=user.username, icon_url=user.display_avatar.url)
embed.set_thumbnail(url=ctx.guild.icon.url) embed.set_thumbnail(url=ctx.guild.icon.url)
pages.append(embed) pages.append(embed)
else: else:
@ -141,7 +138,7 @@ class WarningCog(CacheCog):
) )
embed.set_author( embed.set_author(
name=user.username + "#" + user.discriminator, name=user.username + "#" + user.discriminator,
icon_url=user.display_avatar, icon_url=user.display_avatar.url,
) )
embed.set_thumbnail(url=ctx.guild.icon.url) embed.set_thumbnail(url=ctx.guild.icon.url)
embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}") embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}")
@ -167,8 +164,7 @@ class WarningCog(CacheCog):
fields=fields[i : i + 5], fields=fields[i : i + 5],
) )
embed.set_author( embed.set_author(
name=user.username + "#" + user.discriminator, name=user.username + "#" + user.discriminator, icon_url=user.display_avatar.url
icon_url=user.display_avatar,
) )
embed.set_thumbnail(url=ctx.guild.icon.url) embed.set_thumbnail(url=ctx.guild.icon.url)
pages.append(embed) pages.append(embed)

5
jarvis/cogs/modlog/command.py
View file

@ -41,10 +41,7 @@ class ModlogCommandCog(commands.Cog):
fields=fields, fields=fields,
color="#fc9e3f", color="#fc9e3f",
) )
embed.set_author( embed.set_author(name=ctx.author.username, icon_url=ctx.author.display_avatar.url)
name=ctx.author.username,
icon_url=ctx.author.display_avatar,
)
embed.set_footer( embed.set_footer(
text=f"{ctx.author.username}#{ctx.author.discriminator} | {ctx.author.id}" text=f"{ctx.author.username}#{ctx.author.discriminator} | {ctx.author.id}"
) )

5
jarvis/cogs/modlog/member.py
View file

@ -322,10 +322,7 @@ class ModlogMemberCog(commands.Cog):
fields=fields, fields=fields,
timestamp=log.created_at, timestamp=log.created_at,
) )
embed.set_author( embed.set_author(name=f"{after.name}", icon_url=after.display_avatar.url)
name=f"{after.name}",
icon_url=after.display_avatar,
)
embed.set_footer(text=f"{after.name}#{after.discriminator} | {after.id}") embed.set_footer(text=f"{after.name}#{after.discriminator} | {after.id}")
elif len(before.roles) != len(after.roles): elif len(before.roles) != len(after.roles):
# TODO: User got a new role # TODO: User got a new role

4
jarvis/cogs/modlog/message.py
View file

@ -44,7 +44,7 @@ class ModlogMessageCog(commands.Cog):
) )
embed.set_author( embed.set_author(
name=before.author.name, name=before.author.name,
icon_url=before.author.display_avatar, icon_url=before.author.display_avatar.url,
url=after.jump_url, url=after.jump_url,
) )
embed.set_footer( embed.set_footer(
@ -99,7 +99,7 @@ class ModlogMessageCog(commands.Cog):
embed.set_author( embed.set_author(
name=message.author.name, name=message.author.name,
icon_url=message.author.display_avatar, icon_url=message.author.display_avatar.url,
url=message.jump_url, url=message.jump_url,
) )
embed.set_footer( embed.set_footer(

5
jarvis/cogs/modlog/utils.py
View file

@ -33,10 +33,7 @@ def modlog_embed(
fields=fields, fields=fields,
timestamp=log.created_at, timestamp=log.created_at,
) )
embed.set_author( embed.set_author(name=f"{member.name}", icon_url=member.display_avatar.url)
name=f"{member.name}",
icon_url=member.display_avatar,
)
embed.set_footer(text=f"{member.name}#{member.discriminator} | {member.id}") embed.set_footer(text=f"{member.name}#{member.discriminator} | {member.id}")
return embed return embed

14
jarvis/cogs/remindme.py
View file

@ -146,9 +146,9 @@ class RemindmeCog(CacheCog):
embed.set_author( embed.set_author(
name=ctx.author.username + "#" + ctx.author.discriminator, name=ctx.author.username + "#" + ctx.author.discriminator,
icon_url=ctx.author.display_avatar, icon_url=ctx.author.display_avatar.url,
) )
embed.set_thumbnail(url=ctx.author.display_avatar) embed.set_thumbnail(url=ctx.author.display_avatar.url)
await ctx.send(embed=embed) await ctx.send(embed=embed)
@ -174,9 +174,9 @@ class RemindmeCog(CacheCog):
embed.set_author( embed.set_author(
name=ctx.author.username + "#" + ctx.author.discriminator, name=ctx.author.username + "#" + ctx.author.discriminator,
icon_url=ctx.author.display_avatar, icon_url=ctx.author.display_avatar.url,
) )
embed.set_thumbnail(url=ctx.author.display_avatar) embed.set_thumbnail(url=ctx.author.display_avatar.url)
return embed return embed
@ -233,7 +233,7 @@ class RemindmeCog(CacheCog):
try: try:
context = await self.bot.wait_for_component( context = await self.bot.wait_for_component(
check=lambda x: ctx.author.id == x.author_id, check=lambda x: ctx.author.id == x.context.author.id,
messages=message, messages=message,
timeout=60 * 5, timeout=60 * 5,
) )
@ -261,9 +261,9 @@ class RemindmeCog(CacheCog):
embed.set_author( embed.set_author(
name=ctx.author.username + "#" + ctx.author.discriminator, name=ctx.author.username + "#" + ctx.author.discriminator,
icon_url=ctx.author.display_avatar, icon_url=ctx.author.display_avatar.url,
) )
embed.set_thumbnail(url=ctx.author.display_avatar) embed.set_thumbnail(url=ctx.author.display_avatar.url)
await context.context.edit_origin( await context.context.edit_origin(
content=f"Deleted {len(context.context.values)} reminder(s)", content=f"Deleted {len(context.context.values)} reminder(s)",

2
jarvis/cogs/starboard.py
View file

@ -201,7 +201,7 @@ class StarboardCog(Scale):
embed.set_author( embed.set_author(
name=message.author.display_name, name=message.author.display_name,
url=message.jump_url, url=message.jump_url,
icon_url=message.author.display_avatar, icon_url=message.author.display_avatar.url,
) )
embed.set_footer(text=message.guild.name + " | " + message.channel.name) embed.set_footer(text=message.guild.name + " | " + message.channel.name)
if image_url: if image_url:

6
jarvis/events/message.py
View file

@ -85,7 +85,7 @@ class MessageEventHandler(object):
) )
embed.set_author( embed.set_author(
name=message.author.nick if message.author.nick else message.author.name, name=message.author.nick if message.author.nick else message.author.name,
icon_url=message.author.display_avatar, icon_url=message.author.display_avatar.url,
) )
embed.set_footer( embed.set_footer(
text=f"{message.author.name}#{message.author.discriminator} | {message.author.id}" # noqa: E501 text=f"{message.author.name}#{message.author.discriminator} | {message.author.id}" # noqa: E501
@ -121,7 +121,7 @@ class MessageEventHandler(object):
) )
embed.set_author( embed.set_author(
name=message.author.nick if message.author.nick else message.author.name, name=message.author.nick if message.author.nick else message.author.name,
icon_url=message.author.display_avatar, icon_url=message.author.display_avatar.url,
) )
embed.set_footer( embed.set_footer(
text=f"{message.author.name}#{message.author.discriminator} | {message.author.id}" text=f"{message.author.name}#{message.author.discriminator} | {message.author.id}"
@ -191,7 +191,7 @@ class MessageEventHandler(object):
) )
embed.set_author( embed.set_author(
name=message.author.nick if message.author.nick else message.author.name, name=message.author.nick if message.author.nick else message.author.name,
icon_url=message.author.display_avatar, icon_url=message.author.display_avatar.url,
) )
embed.set_footer( embed.set_footer(
text=f"{message.author.name}#{message.author.discriminator} | {message.author.id}" text=f"{message.author.name}#{message.author.discriminator} | {message.author.id}"

5
jarvis/tasks/reminder.py
View file

@ -25,10 +25,9 @@ async def _remind() -> None:
fields=[], fields=[],
) )
embed.set_author( embed.set_author(
name=user.name + "#" + user.discriminator, name=user.name + "#" + user.discriminator, icon_url=user.display_avatar.url
icon_url=user.display_avatar,
) )
embed.set_thumbnail(url=user.display_avatar) embed.set_thumbnail(url=user.display_avatar.url)
try: try:
await user.send(embed=embed) await user.send(embed=embed)
except Exception: except Exception: