1
0
Fork 0

Switch help to slash commands

This commit is contained in:
Ethanell 2021-02-04 10:53:26 +01:00
parent ebaf45e84a
commit a036397b80
3 changed files with 14 additions and 57 deletions

View file

@ -21,20 +21,6 @@ class Greetings(commands.Cog):
def description(self): def description(self):
return "Setup join and leave message" return "Setup join and leave message"
@cog_ext.cog_subcommand(base="greetings", name="help",
description="Help about greetings")
@is_enabled()
@guild_only()
@has_permissions(manage_guild=True)
async def greetings_help(self, ctx: SlashContext):
embed = Embed(title="Greetings help")
embed.add_field(name="set <join/leave> <message>", value="Set the greetings message\n"
"`{}` will be replace by the username",
inline=False)
embed.add_field(name="show <join/leave>", value="Show the greetings message", inline=False)
embed.add_field(name="toggle <join/leave>", value="Enable or disable the greetings message", inline=False)
await ctx.send(embeds=[embed])
@cog_ext.cog_subcommand(base="greetings", name="set", @cog_ext.cog_subcommand(base="greetings", name="set",
description="Set the greetings message\n`{}` will be replace by the username", description="Set the greetings message\n`{}` will be replace by the username",
options=[ options=[

View file

@ -1,10 +1,8 @@
from discord import Embed
from discord.ext import commands from discord.ext import commands
from discord.ext.commands import CommandNotFound, MissingRequiredArgument, BadArgument, MissingPermissions, \ from discord.ext.commands import CommandNotFound, MissingRequiredArgument, BadArgument, MissingPermissions, \
NoPrivateMessage, CommandError, NotOwner NoPrivateMessage, NotOwner
from discord_slash import SlashContext from discord_slash import SlashContext
from administrator import config
from administrator.check import ExtensionDisabled from administrator.check import ExtensionDisabled
from administrator.logger import logger from administrator.logger import logger
@ -20,23 +18,6 @@ class Help(commands.Cog):
def description(self): def description(self):
return "Give help and command list" return "Give help and command list"
@commands.command("help", pass_context=True)
async def help(self, ctx: commands.Context):
embed = Embed(title="Help")
for c in filter(lambda x: x != "Help", self.bot.cogs):
cog = self.bot.cogs[c]
try:
if await getattr(cog, c.lower()).can_run(ctx):
embed.add_field(name=c,
value=cog.description() + "\n" +
f"`{config.get('prefix')}{c.lower()} help` for more information",
inline=False)
except CommandError:
pass
await ctx.send(embed=embed)
@commands.Cog.listener() @commands.Cog.listener()
async def on_command_error(self, ctx: commands.Context, error): async def on_command_error(self, ctx: commands.Context, error):
await self.error_handler(ctx, error) await self.error_handler(ctx, error)
@ -45,21 +26,28 @@ class Help(commands.Cog):
async def on_slash_command_error(self, ctx: SlashContext, error: Exception): async def on_slash_command_error(self, ctx: SlashContext, error: Exception):
await self.error_handler(ctx, error) await self.error_handler(ctx, error)
@staticmethod async def error_handler(self, ctx, error: Exception):
async def error_handler(ctx, error: Exception):
if isinstance(error, CommandNotFound): if isinstance(error, CommandNotFound):
await ctx.send(content="\u2753") await self.reaction(ctx, "\u2753")
elif isinstance(error, MissingRequiredArgument) or isinstance(error, BadArgument): elif isinstance(error, MissingRequiredArgument) or isinstance(error, BadArgument):
await ctx.send(content="\u274C") await self.reaction(ctx, "\u274C")
elif isinstance(error, NotOwner) or isinstance(error, MissingPermissions) \ elif isinstance(error, NotOwner) or isinstance(error, MissingPermissions) \
or isinstance(error, NoPrivateMessage): or isinstance(error, NoPrivateMessage):
await ctx.send(content="\U000026D4") await self.reaction(ctx, "\U000026D4")
elif isinstance(error, ExtensionDisabled): elif isinstance(error, ExtensionDisabled):
await ctx.send(content="\U0001F6AB") await self.reaction(ctx, "\U0001F6AB")
else: else:
await ctx.send(content="An error occurred !") await ctx.send(content="An error occurred !")
raise error raise error
@staticmethod
async def reaction(ctx, react: str):
m = getattr(ctx, "message", None)
if m:
await m.add_reaction(react)
else:
await ctx.send(content=react)
def setup(bot): def setup(bot):
logger.info(f"Loading...") logger.info(f"Loading...")

View file

@ -30,23 +30,6 @@ class Invite(commands.Cog):
def description(self): def description(self):
return "Get role from a special invite link" return "Get role from a special invite link"
@cog_ext.cog_subcommand(base="invite", name="help", description="Help about invite")
@is_enabled()
@guild_only()
@has_permissions(administrator=True)
async def invite_help(self, ctx: SlashContext):
embed = Embed(title="Invite help")
embed.add_field(name="invite create <#channel> <@role>", value="Create a invite link to a role", inline=False)
embed.add_field(name="invite delete <code>", value="Remove a invite", inline=False)
await ctx.send(embeds=[embed])
@cog_ext.cog_subcommand(base="invite", name="create", description="Create a invite link to a role",
options=[
manage_commands.create_option("channel", "The channel to join",
SlashCommandOptionType.CHANNEL, True),
manage_commands.create_option("role", "The role to give",
SlashCommandOptionType.ROLE, True)
])
@is_enabled() @is_enabled()
@guild_only() @guild_only()
@has_permissions(administrator=True) @has_permissions(administrator=True)