Merge pull request #18 from r-liner/develop

v0.8-rc.1

Author: liner-exe

cogs/admin.py

@@ -1,69 +1,82 @@
 import nextcord
-from nextcord.ext import commands
+from nextcord.ext import commands, application_checks
+import configparser
+
+config = configparser.ConfigParser()
+config.read("config.ini")
+admin_guilds = config["settings"]["admin_guild"]
 
 
 class Admin(commands.Cog):
     def __init__(self, client):
         self.client = client
 
-    @commands.command(aliases=["cn"])
-    @commands.is_owner()
-    async def change_nickname(self, ctx, *, name: str = None):
-        try:
-            await ctx.guild.me.edit(nick=name)
-
-            if name:
-                return await ctx.send(f"Display name of bot has changed on **{name}**")
-
-            elif name is None:
-                return await ctx.send(f"Nickname has cleared")
-
-        except Exception as error:
-            await ctx.send(error)
-
-    @commands.command(aliases=["cu"])
-    @commands.is_owner()
-    async def change_username(self, ctx, *, name: str):
-        try:
-            await self.client.user.edit(username=name)
-            await ctx.send(f"Username of bot has changed on **{name}**")
-            
-        except Exception as error:
-            await ctx.send(error)
-
-    @commands.command(aliases=["dm"])
-    @commands.is_owner()
-    async def direct_message(self, ctx, user: nextcord.User, *, message: str):
+    @application_checks.is_owner()
+    @nextcord.slash_command()
+    async def change_nickname(self, interaction, name: str = nextcord.SlashOption(default=None)):
+        """
+        [ADMIN] Change bot nickname.
+        """
+        await interaction.guild.me.edit(nick=name)
+
+        if name:
+            return await interaction.send(f"Display name of bot has changed on **{name}**")
+
+        elif name is None:
+            return await interaction.send(f"Nickname has cleared")
+
+    @application_checks.is_owner()
+    @nextcord.slash_command(guild_ids=(admin_guilds,))
+    async def change_username(self, interaction, name: str = nextcord.SlashOption(default=None)):
+        """
+        [ADMIN] Change bot username.
+        """
+        await self.client.user.edit(username=name)
+        await interaction.send(f"Username of bot has changed on **{name}**")
+
+    @application_checks.is_owner()
+    @nextcord.slash_command()
+    async def direct_message(self, interaction, user: nextcord.User, message: str):
+        """
+        [ADMIN] Send direct message to selected user.
+        """
         try:
             await user.send(message)
-            await ctx.send("Message has sent")
+            await interaction.send("Message has sent")
 
         except nextcord.Forbidden:
-            await ctx.send("User`s dm unreacheable.")
-
-    @commands.command(aliases=["shut"], pass_context=True)
-    @commands.is_owner()
-    async def shutdown(self, ctx):
+            await interaction.send("User`s dm unreacheable.")
+
+    @application_checks.is_owner()
+    @nextcord.slash_command(guild_ids=(admin_guilds,))
+    async def shutdown(self, interaction):
+        """
+        [ADMIN] Turns off the bot.
+        """
         print("Bot is shutting down")
-        await ctx.send("Bot is shutting down")
+        await interaction.send("Bot is shutting down")
         await self.client.close()
 
-    @commands.is_owner()
-    @commands.command()
-    async def eval(self, ctx, *, content):
+    @application_checks.is_owner()
+    @nextcord.slash_command(guild_ids=(admin_guilds,))
+    async def eval(self, interaction, content):
+        """
+        [ADMIN] Evaluates a Python expression.
+        """
         try:
             embed = nextcord.Embed(description=content)
             embed.add_field(name="Result", value=eval(content))
-            await ctx.send(embed=embed)
+            await interaction.send(embed=embed)
 
         except SyntaxError:
-            await ctx.send("Incorrect expression")
+            await interaction.send("Incorrect expression")
 
         except ZeroDivisionError:
-            await ctx.send("Cannot be divided by zero!")
+            await interaction.send("Cannot be divided by zero!")
 
         except Exception as error:
             print(error)
+            await interaction.send(f"Error message:\n```{error}```")
 
 
 def setup(client):

cogs/discord.py

@@ -1,28 +1,24 @@
 import nextcord
-from nextcord.ext import commands
+from nextcord.ext import commands, application_checks
 
 
 class Discord(commands.Cog):
     def __init__(self, client):
         self.client = client
 
-    # Avatar
-    @commands.command()
-    @commands.guild_only()
-    async def avatar(self, ctx, *, user: nextcord.Member = None):
-        user = user or ctx.author
-        try:
-            if user.avatar or user.guild_avatar:
-                user_avatar = user.avatar.url
-                embed = nextcord.Embed(title=f"Avatar of user **{user.name}**")
-                embed.set_image(url=user_avatar)
-                await ctx.send(embed=embed)
+    @application_checks.guild_only()
+    @nextcord.slash_command()
+    async def avatar(self, interaction, user: nextcord.Member = nextcord.SlashOption(default=None)):
+        user = user or interaction.user
 
-            elif not user.avatar and not user.guild_avatar:
-                return await ctx.send("User has no avatar.")
+        if user.avatar or user.guild_avatar:
+            user_avatar = user.avatar.url
+            embed = nextcord.Embed(title=f"Avatar of user **{user.name}**")
+            embed.set_image(url=user_avatar)
+            await interaction.send(embed=embed)
 
-        except Exception as err:
-            print(err)
+        elif not user.avatar and not user.guild_avatar:
+            return await interaction.send("User has no avatar.")
 
 
 def setup(client):

cogs/events.py

@@ -1,5 +1,5 @@
 import nextcord
-from nextcord.ext import commands
+from nextcord.ext import commands, application_checks
 from nextcord.ext.commands import errors
 
 
@@ -20,6 +20,23 @@ async def on_command_error(self, ctx, err: Exception):
         elif isinstance(err, errors.MissingPermissions):
             await ctx.send("You haven`t permissions.")
 
+    @commands.Cog.listener()
+    async def on_application_command_error(self, interaction, error: Exception):
+        embed = nextcord.Embed(title="Error", colour=nextcord.Colors.light_red)
+
+        if isinstance(error, application_checks.errors.ApplicationMissingPermissions):
+            embed.description = "You do not have permissions to perform this action."
+            embed.add_field(name="Hint", value="Permissions needed, for example: \"BAN MEMBERS\".")
+
+        if isinstance(error, nextcord.errors.ApplicationInvokeError):
+            embed.description = "Bot does not have sufficient permissions."
+            embed.add_field(name="Hint", value="Give the bot administrator permissions and make its role higher than others (except admins).")
+            embed.add_field(name="Hint 2", value="The error could be on the developer's side. Please report this to the developer.")
+
+        if isinstance(error, application_checks.errors.ApplicationNSFWChannelRequired):
+            embed.description = "Channel is not NSFW."
+            embed.add_field(name="Hint", value="Send the command in an NSFW channel.")
+
     @commands.Cog.listener()
     async def on_message(self, message):
         print("{0.guild} - {0.author}: {0.content}".format(message))