mirror of
https://github.com/Matthww/TuneBot.git
synced 2026-09-21 22:57:48 +00:00
WIP Cleaning up the code base + impl slash commands
This commit is contained in:
+10
-16
@@ -7,26 +7,21 @@ from discord.ext.commands import Context
|
||||
|
||||
class EmbedGenerator:
|
||||
@staticmethod
|
||||
async def Error(ctx: Context, message: str, **kwargs):
|
||||
async def Error(ctx: Context, message: str, **kwargs) -> Embed:
|
||||
color = ctx.bot.colors["embed"]
|
||||
em = Embed(title='Error:', description=message, color=color)
|
||||
em = Embed(title="Error:", description=message, color=color)
|
||||
return await EmbedGenerator.SendWithFooter(ctx, em, **kwargs)
|
||||
|
||||
@staticmethod
|
||||
async def Message(ctx: Context,
|
||||
title: str,
|
||||
message: Optional[str] = '',
|
||||
**kwargs):
|
||||
async def Message(ctx: Context, title: str, message: Optional[str] = "", **kwargs):
|
||||
color = ctx.bot.colors["embed"]
|
||||
em = Embed(title=title, description=message, color=color)
|
||||
return await EmbedGenerator.SendWithFooter(ctx, em, **kwargs)
|
||||
|
||||
@staticmethod
|
||||
async def Image(ctx: Context,
|
||||
title: str,
|
||||
url: str,
|
||||
message: Optional[str] = '',
|
||||
**kwargs):
|
||||
async def Image(
|
||||
ctx: Context, title: str, url: str, message: Optional[str] = "", **kwargs
|
||||
):
|
||||
color = ctx.bot.colors["embed"]
|
||||
em = Embed(title=title, description=message, url=url, color=color)
|
||||
em.set_image(url=url)
|
||||
@@ -39,10 +34,9 @@ class EmbedGenerator:
|
||||
return await EmbedGenerator.SendWithFooter(ctx, em, **kwargs)
|
||||
|
||||
@staticmethod
|
||||
async def SendWithFooter(ctx: Context, em: Embed,
|
||||
**kwargs) -> discord.Message:
|
||||
avatar = ctx.author.avatar_url_as()
|
||||
em.set_footer(text=f'Requested by: {ctx.author}', icon_url=avatar)
|
||||
if kwargs.get('no_send', False):
|
||||
async def SendWithFooter(ctx: Context, em: Embed, **kwargs) -> discord.Message:
|
||||
avatar = ctx.author.avatar.with_static_format("jpeg")
|
||||
em.set_footer(text=f"Requested by: {ctx.author}", icon_url=avatar)
|
||||
if kwargs.get("no_send", False):
|
||||
return em
|
||||
return await ctx.send(embed=em, **kwargs)
|
||||
|
||||
Reference in New Issue
Block a user