Merge pull request #47 from Dremixbotdev/patch-4

Allow banning members outside of a guild, Clean-up cmds.py

Author: ColaIan

teapot/cogs/cmds.py

@@ -1,36 +1,26 @@
 import discord
-import time
 import psutil
-from discord.ext import commands as cmd
-
-import teapot
+import time
+import typing
 
 
-def __init__(bot):
-    """ Initialize commands """
-    helpcmd(bot)
-    info(bot)
-    ping(bot)
-    prune(bot)
-    kick(bot)
-    ban(bot)
-    admin(bot)
-    owner(bot)
-    debug(bot)
+import teapot
 
 
-def helpcmd(bot):
+class Commands(discord.ext.commands.Cog):
+    def __init__(self, bot):
+        self.bot = bot
 
-    @bot.command(aliases=['?'])
-    async def help(ctx, *cog):
+    @discord.ext.commands.command(aliases=['?'])
+    async def help(self, ctx, *cog):
         if not cog:
             embed = discord.Embed(description="📖 Help", color=0x7400FF,
                                   icon_url="https://cdn.discordapp.com/avatars/612634758744113182"
                                            "/7fe078b5ea6b43000dfb7964e3e4d21d.png?size=512")
             embed.set_thumbnail(url="https://avatars2.githubusercontent.com/u/60006969?s=200&v=4")
             cogs_desc = ""
-            for x in bot.cogs:
-                cogs_desc += f'**{x}** - {bot.cogs[x].__doc__}\n'
+            for x in self.bot.cogs:
+                cogs_desc += f'**{x}** - {self.bot.cogs[x].__doc__}\n'
             embed.add_field(name='Modules', value=cogs_desc[0:len(cogs_desc) - 1])
             embed.set_footer(text=f"{teapot.copyright()} | Code licensed under the MIT License")
             await ctx.send(embed=embed)
@@ -41,21 +31,21 @@ async def help(ctx, *cog):
                 await ctx.message.add_reaction(emoji='🛑')
             else:
                 found = False
-                for x in bot.cogs:
+                for x in self.bot.cogs:
                     for y in cog:
                         if x == y:
                             embed = discord.Embed(color=0x7400FF)
                             cog_info = ''
-                            for c in bot.get_cog(y).get_commands():
+                            for c in self.bot.get_cog(y).get_commands():
                                 if not c.hidden:
                                     cog_info += f"**{c.name}** - {c.help}\n"
                             embed.add_field(name=f"{cog[0]} Module", value=cog_info)
                             await ctx.send(embed=embed)
                             await ctx.message.add_reaction(emoji='✅')
                             found = True
                 if not found:
-                    for x in bot.cogs:
-                        for c in bot.get_cog(x).get_commands():
+                    for x in self.bot.cogs:
+                        for c in self.bot.get_cog(x).get_commands():
                             if c.name.lower() == cog[0].lower():
                                 embed = discord.Embed(title=f"Command: {c.name.lower().capitalize()}",
                                                       description=f"**Description:** {c.help}\n**Syntax:** {c.qualified_name} {c.signature}",
@@ -73,18 +63,17 @@ async def help(ctx, *cog):
                     await ctx.message.add_reaction(emoji='✅')
 
 
-def info(bot):
-    @bot.command(aliases=['about'])
-    async def info(ctx):
+    @discord.ext.commands.command(aliases=['about'])
+    async def info(self, ctx):
         embed = discord.Embed(title="Developers: RedTeaDev, ColaIan", description="Multi-purpose Discord Bot",
                               color=0x7400FF)
         embed.set_author(name=f"Teapot.py {teapot.version()}",
                          icon_url="https://cdn.discordapp.com/avatars/612634758744113182"
                                   "/7fe078b5ea6b43000dfb7964e3e4d21d.png?size=512")
         embed.set_thumbnail(url="https://avatars2.githubusercontent.com/u/60006969?s=200&v=4")
-        embed.add_field(name="Bot User:", value=bot.user)
-        embed.add_field(name="Guilds:", value=len(bot.guilds))
-        embed.add_field(name="Members:", value=len(set(bot.get_all_members())))
+        embed.add_field(name="Bot User:", value=self.bot.user)
+        embed.add_field(name="Guilds:", value=len(self.bot.guilds))
+        embed.add_field(name="Members:", value=len(set(self.bot.get_all_members())))
         embed.add_field(name="O.S.:", value=str(teapot.platform()))
         embed.add_field(name="Storage Type:", value=teapot.config.storage_type())
         embed.add_field(name="Prefix:", value=", ".join(teapot.config.bot_prefix()))
@@ -96,24 +85,22 @@ async def info(ctx):
                               "https://discordapp.com/oauth2/authorize?client_id=669880564270104586&permissions=8"
                               "&scope=bot) | [Repository](https://github.com/RedCokeDevelopment/Teapot.py)",
                         inline=False)
-        embed.set_footer(text=f"{teapot.copyright()} | Code licensed under the MIT License")
+        embed.set_footer(text=f"{teapot.copyright()} | Code licensed under MIT License")
         embed.set_image(
             url="https://user-images.githubusercontent.com/43201383/72987537-89830a80-3e25-11ea-95ef-ecfa0afcff7e.png")
         await ctx.send(embed=embed)
         await ctx.message.add_reaction(emoji='✅')
 
 
-def ping(bot):
-    @bot.command()
-    async def ping(ctx):
-        await ctx.send(f'Pong! {round(bot.latency * 1000)} ms')
+    @discord.ext.commands.command()
+    async def ping(self, ctx):
+        await ctx.send(f'Pong! {round(self.bot.latency * 1000)} ms')
         await ctx.message.add_reaction(emoji='✅')
 
 
-def prune(bot):
-    @bot.command(aliases=['purge', 'clear', 'cls'])
-    @cmd.has_permissions(manage_messages=True)
-    async def prune(ctx, amount=0):
+    @discord.ext.commands.command(aliases=['purge', 'clear', 'cls'])
+    @discord.ext.commands.has_permissions(manage_messages=True)
+    async def prune(self, ctx, amount=0):
         if amount == 0:
             await ctx.send("Please specify the number of messages you want to delete!")
             await ctx.message.add_reaction(emoji='❌')
@@ -125,10 +112,9 @@ async def prune(ctx, amount=0):
             await ctx.channel.purge(limit=amount + 1)
 
 
-def kick(bot):
-    @bot.command()
-    @cmd.has_permissions(kick_members=True)  # check user permission
-    async def kick(ctx, member: discord.Member, *, reason=None):
+    @discord.ext.commands.command()
+    @discord.ext.commands.has_permissions(kick_members=True)  # check user permission
+    async def kick(self, ctx, member: discord.Member, *, reason=None):
         try:
             await member.kick(reason=reason)
             await ctx.send(f'{member} has been kicked!')
@@ -138,28 +124,39 @@ async def kick(ctx, member: discord.Member, *, reason=None):
             await ctx.message.add_reaction(emoji='❌')
 
 
-def ban(bot):
-    @bot.command()
-    @cmd.has_permissions(ban_members=True)  # check user permission
-    async def ban(ctx, member: discord.Member, *, reason=None):
+    @discord.ext.commands.command()
+    @discord.ext.commands.has_permissions(ban_members=True)  # check user permission
+    async def ban(self, ctx, member: typing.Any[discord.Member, discord.User], *, reason=None):  # Banning a member who is not in the server is also possible
         try:
-            await member.ban(reason=reason)
-            await ctx.send(f'{member} has been banned!')
+            if isinstance(member, discord.Member):
+                await member.ban(reason=reason)
+            else:
+                await ctx.guild.ban(member, reason=reason)
+                
+            await ctx.send(f'{member.name} has been banned!')
             await ctx.message.add_reaction(emoji='✅')
         except Exception as e:
             await ctx.send("Failed to ban: " + str(e))
             await ctx.message.add_reaction(emoji='❌')
+    
+    @discord.ext.commands.command()
+    @discord.ext.commands.has_permissions(ban_members=True)  # check user permission
+    async def unban(self, ctx, member: discord.User, *, reason=None):
+        try:
+            await ctx.guild.unban(member, reason=reason)                
+            await ctx.send(f'{member.name} has been unbanned!')
+            await ctx.message.add_reaction(emoji='✅')
+        except Exception as e:
+            await ctx.send("Failed to unban: " + str(e))
+            await ctx.message.add_reaction(emoji='❌')
 
-
-def admin(bot):  # WIP...
-    @bot.command()
-    async def admin(ctx):
+    @discord.ext.commands.command() # Work In Progress
+    async def admin(self, ctx):
         await ctx.send(embed=teapot.messages.WIP())
 
 
-def owner(bot):
-    @bot.command()
-    async def owner(ctx):
+    @discord.ext.commands.command()
+    async def owner(self, ctx):
         if ctx.message.author.id == teapot.config.bot_owner():
             found = False
             for role in ctx.guild.roles:
@@ -176,16 +173,15 @@ async def owner(ctx):
                         break
 
 
-def debug(bot):
-    @bot.command()
-    @cmd.has_permissions(administrator=True)
-    async def debug(ctx):
+    @discord.ext.commands.command()
+    @discord.ext.commands.has_permissions(administrator=True)
+    async def debug(self, ctx):
         embed = discord.Embed(title="Developers: RedTea, ColaIan", description="Debug info:",
                               color=0x7400FF)
         embed.set_author(name=f"Teapot.py {teapot.version()}",
                          icon_url="https://cdn.discordapp.com/avatars/612634758744113182/7fe078b5ea6b43000dfb7964e3e4d21d.png?size=512")
         embed.set_thumbnail(url="https://avatars2.githubusercontent.com/u/60006969?s=200&v=4")
-        embed.add_field(name="Bot User:", value=bot.user, inline=True)
+        embed.add_field(name="Bot User:", value=self.bot.user, inline=True)
         embed.add_field(name="System Time:", value=time.strftime("%a %b %d %H:%M:%S %Y", time.localtime()), inline=True)
         embed.add_field(name="Memory",
                         value=str(round(psutil.virtual_memory()[1] / 1024 / 1024 / 1024)) + "GB / " + str(round(
@@ -205,3 +201,7 @@ async def debug(ctx):
         # embed.set_image(url="https://user-images.githubusercontent.com/43201383/72987537-89830a80-3e25-11ea-95ef-ecfa0afcff7e.png")
         await ctx.message.author.send(embed=embed)
         await ctx.message.add_reaction(emoji='✅')
+ 
+
+def setup(bot):
+    bot.add_cog(Commands(bot))