diff --git a/tux/cogs/moderation/__init__.py b/tux/cogs/moderation/__init__.py index 0f2f278..7dd0470 100644 --- a/tux/cogs/moderation/__init__.py +++ b/tux/cogs/moderation/__init__.py @@ -8,7 +8,7 @@ from prisma.enums import CaseType from tux.bot import Tux from tux.database.controllers import DatabaseController from tux.utils.constants import Constants as CONST -from tux.utils.embeds import EmbedCreator, create_embed_footer +from tux.utils.embeds import EmbedCreator class ModerationCogBase(commands.Cog): @@ -55,7 +55,11 @@ class ModerationCogBase(commands.Cog): embed.set_author(name=title, icon_url=icon_url) embed.set_thumbnail(url=thumbnail_url) - footer_text, footer_icon_url = create_embed_footer(ctx) + footer_text, footer_icon_url = EmbedCreator.get_footer( + bot=self.bot, + user_name=ctx.author.name, + user_display_avatar=ctx.author.display_avatar.url, + ) embed.set_footer(text=footer_text, icon_url=footer_icon_url) for name, value, inline in fields: diff --git a/tux/cogs/moderation/cases.py b/tux/cogs/moderation/cases.py index 07c068d..f2ed9f0 100644 --- a/tux/cogs/moderation/cases.py +++ b/tux/cogs/moderation/cases.py @@ -8,7 +8,7 @@ from prisma.types import CaseWhereInput from tux.bot import Tux from tux.utils import checks from tux.utils.constants import Constants as CONST -from tux.utils.embeds import create_embed_footer +from tux.utils.embeds import EmbedCreator from tux.utils.flags import CaseModifyFlags, CasesViewFlags, generate_usage from . import ModerationCogBase @@ -346,7 +346,11 @@ class Cases(ModerationCogBase): if ctx.guild: embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon) - footer_text, footer_icon_url = create_embed_footer(ctx) + footer_text, footer_icon_url = EmbedCreator.get_footer( + bot=self.bot, + user_name=ctx.author.name, + user_display_avatar=ctx.author.display_avatar.url, + ) embed.set_footer(text=footer_text, icon_url=footer_icon_url) for case in cases: diff --git a/tux/cogs/utility/snippets.py b/tux/cogs/utility/snippets.py index 1cb01bf..f304713 100644 --- a/tux/cogs/utility/snippets.py +++ b/tux/cogs/utility/snippets.py @@ -99,7 +99,11 @@ class Snippets(commands.Cog): if ctx.guild: embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon) - footer_text, footer_icon_url = EmbedCreator.create_embed_footer(ctx) + footer_text, footer_icon_url = EmbedCreator.get_footer( + bot=ctx.bot, + user_name=ctx.author.name, + user_display_avatar=ctx.author.display_avatar.url, + ) embed.set_footer(text=footer_text, icon_url=footer_icon_url) embed.timestamp = ctx.message.created_at @@ -372,15 +376,12 @@ class Snippets(commands.Cog): author = self.bot.get_user(snippet.snippet_user_id) - latency = round(int(ctx.bot.latency * 1000)) - - embed: discord.Embed = EmbedCreator.custom_footer_embed( + embed: discord.Embed = EmbedCreator.create_embed( + bot=self.bot, + embed_type=EmbedCreator.DEFAULT, + user_name=ctx.author.name, + user_display_avatar=ctx.author.display_avatar.url, title="Snippet Information", - ctx=ctx, - latency=f"{latency}ms", - interaction=None, - state="DEFAULT", - user=author or ctx.author, ) embed.add_field(name="Name", value=snippet.snippet_name, inline=False) diff --git a/tux/handlers/error.py b/tux/handlers/error.py index 69ae68d..7368e76 100644 --- a/tux/handlers/error.py +++ b/tux/handlers/error.py @@ -173,7 +173,6 @@ class ErrorHandler(commands.Cog): embed = EmbedCreator.create_embed( bot=self.bot, embed_type=EmbedCreator.ERROR, - title="Error", description=error_message, ) @@ -220,7 +219,6 @@ class ErrorHandler(commands.Cog): embed = EmbedCreator.create_embed( bot=self.bot, embed_type=EmbedCreator.ERROR, - title="Error", description=message, ) await ctx.send(embed=embed, ephemeral=True, delete_after=30) @@ -245,7 +243,6 @@ class ErrorHandler(commands.Cog): embed = EmbedCreator.create_embed( bot=self.bot, embed_type=EmbedCreator.ERROR, - title="Error", description=message, ) await ctx.send(embed=embed, ephemeral=True, delete_after=30)