Update features

- Add kick command
- Add ddos, swat commands

Author: Puyodead1

TODO

@@ -1,16 +1,17 @@
 -=-=-= Commands =-=-=-=-
-Mute <mention or id> - GuildAdminCommands
-Unmute <mention or id> - GuildAdminCommands
+~~Mute <mention or id> - GuildAdminCommands~~
+~~Unmute <mention or id> - GuildAdminCommands~~
 AddBotAdmin <mention or id> - BotAdminCommands
 RemoveBotAdmin <mention or id> - BotAdminCommands
-Kick <mention or id> - GuildAdminCommands
+~~Kick <mention or id> - GuildAdminCommands~~
 CreateRole <role name> - GuildAdminCommands
 DeleteRole <role mention, id or name?> - GuildAdminCommands
 BanServer <server id> - BotAdminCommands
 UnbanServer <server id> - BotAdminCommands
 BanUser <mention or id> - BotAdminCommands
 UnbanUser <mention or id> - BotAdminCommands
-
+Strike <mention or id> [reason] - GuildAdminCommands
+Strikes <mention or id> - GuildAdminCommands
 
 -=-=-= Other Ideas =-=-=-=-
 Add optional argument to ban command for soft or hard ban mode (soft doesnt delete message history from user, hard does)

cogs/GuildAdminCommands.py

@@ -14,7 +14,7 @@ def __init__(self, bot):
     @commands.command(name="ban")
     @commands.guild_only()
     @commands.has_permissions(ban_members=True)
-    async def ban(self, ctx, member: discord.Member = None, reason: str = "No reason specified!", dmd=0):
+    async def ban(self, ctx, member: discord.Member = None, reason: str = "No reason specified", dmd=0):
         if member is None or member == ctx.message.author:
             await ctx.send(f"You cannot ban yourself!")
             return
@@ -24,7 +24,8 @@ async def ban(self, ctx, member: discord.Member = None, reason: str = "No reason
             return
 
         # TODO: log channel embed with reason (see: https://github.com/Puyodead1/Extron/blob/master/Discord/Commands/ban.js)
-        embed = discord.Embed(title=f"Bye Bye **{member.name}** 🔨",
+        embed = discord.Embed(title=None,
+                              description=f"Bye Bye **{member.name}** 🔨",
                               color=discord.Color.green(),
                               timestamp=datetime.utcnow())
         embed.set_image(url="https://thumbs.gfycat.com/ElderlyViciousFeline-size_restricted.gif")
@@ -34,7 +35,7 @@ async def ban(self, ctx, member: discord.Member = None, reason: str = "No reason
             await member.ban(reason=reason, delete_message_days=dmd)
             await ctx.send(content=None, embed=embed)
         except Forbidden as e:
-            embed = discord.Embed(title=f"Missing `ban_members` permission!", description=f"Error: {e.text}",
+            embed = discord.Embed(title=f"Missing permission!", description=f"Error: {e.text}",
                                   color=discord.Color.red(),
                                   timestamp=datetime.utcnow())
             embed.set_footer(text=ctx.author.name, icon_url=ctx.author.avatar_url)
@@ -53,15 +54,16 @@ async def ban(self, ctx, member: discord.Member = None, reason: str = "No reason
     @commands.command(name="unban")
     @commands.guild_only()
     @commands.has_permissions(ban_members=True)
-    async def ban(self, ctx, user_id: str, reason="No reason specified!"):
+    async def ban(self, ctx, user_id: str, reason="No reason specified"):
         try:
             member = await self.bot.fetch_user(user_id=user_id)
             try:
                 await ctx.guild.unban(user=member, reason=reason)
-                embed = discord.Embed(title=f"{member.name} has been unbanned!",
-                                      description=f"Unban Reason: {reason}",
+                embed = discord.Embed(title=None,
+                                      description=f"{member.name} has been unbanned!",
                                       color=discord.Color.green(),
                                       timestamp=datetime.utcnow())
+                embed.add_field(name=f"Unban Reason", value=reason)
                 embed.set_thumbnail(
                     url="https://icon-library.net/images/green-checkmark-icon/green-checkmark-icon-11.jpg")
                 embed.set_footer(text=f"Unbanned by {ctx.author.name}", icon_url=ctx.author.avatar_url)
@@ -95,7 +97,7 @@ async def ban(self, ctx, user_id: str, reason="No reason specified!"):
     @commands.command(name="mute")
     @commands.guild_only()
     @commands.has_permissions(kick_members=True)
-    async def mute(self, ctx, member: discord.Member, reason: str = "No reason specified!"):
+    async def mute(self, ctx, member: discord.Member, reason: str = "No reason specified"):
         if member.bot:
             await ctx.send(f"{member.name} is a bot.")
             return
@@ -107,7 +109,11 @@ async def mute(self, ctx, member: discord.Member, reason: str = "No reason speci
             if muted_role:
                 try:
                     await member.add_roles(muted_role, reason=reason, atomic=False)
-                    await ctx.send(f"{member.name} was muted!")
+                    embed = discord.Embed(title=None, description=f"**{member.name}** was muted 🔇",
+                                          color=discord.Color.green(), timestamp=datetime.utcnow())
+                    embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
+                    embed.set_footer(text=f"Muted by {ctx.author.name}", icon_url=ctx.author.avatar_url)
+                    await ctx.send(content=None, embed=embed)
                     await member.send(
                         f"You were muted by {ctx.message.author.name} in {ctx.guild.name} for {reason}")
                     log_channel = [x for x in member.guild.channels if x.name == "logs"]
@@ -118,12 +124,13 @@ async def mute(self, ctx, member: discord.Member, reason: str = "No reason speci
                         embed = discord.Embed(title=f"{member.name}#{member.discriminator} was muted!",
                                               description=None, color=discord.Color.red(),
                                               timestamp=datetime.utcnow())
+                        embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
                         embed.add_field(name=f"Mute Reason", value=reason)
                         embed.set_thumbnail(url=member.avatar_url)
                         embed.set_footer(text=f"Muted by {ctx.author.name}", icon_url=ctx.author.avatar_url)
                         await log_channel.send(content=None, embed=embed)
                 except Forbidden as e:
-                    await ctx.send(f"[GuildAdminCommands] Missing `manage_roles` permission! Error: {e.text}")
+                    await ctx.send(f"[GuildAdminCommands] Missing permission! Error: {e.text}")
                 except HTTPException as e:
                     await ctx.send(f"[GuildAdminCommands] Failed to add role! Error: {e.text}")
             else:
@@ -141,7 +148,7 @@ async def mute(self, ctx, member: discord.Member, reason: str = "No reason speci
                             print(f"Set permissions on channel {channel.name}")
                         except Forbidden as e:
                             # no permission to edit channel specific permissions
-                            await ctx.send(f"[GuildAdminCommands] Missing `administrator` permission! Error: {e.text}")
+                            await ctx.send(f"[GuildAdminCommands] Missing permission! Error: {e.text}")
                         except NotFound as e:
                             await ctx.send(
                                 f"[GuildAdminCommands] The role or member being edited is not part of the guild! Error: {e.text}")
@@ -154,7 +161,11 @@ async def mute(self, ctx, member: discord.Member, reason: str = "No reason speci
 
                     try:
                         await member.add_roles(muted_role, reason=reason, atomic=False)
-                        await ctx.send(f"{member.name} was muted!")
+                        embed = discord.Embed(title=None, description=f"**{member.name}** was muted 🔇",
+                                              color=discord.Color.green(), timestamp=datetime.utcnow())
+                        embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
+                        embed.set_footer(text=f"Muted by {ctx.author.name}", icon_url=ctx.author.avatar_url)
+                        await ctx.send(content=None, embed=embed)
                         await member.send(
                             f"You were muted by {ctx.message.author.name} in {ctx.guild.name} for {reason}")
                         log_channel = [x for x in member.guild.channels if x.name == "logs"]
@@ -166,16 +177,17 @@ async def mute(self, ctx, member: discord.Member, reason: str = "No reason speci
                                                   description=None, color=discord.Color.red(),
                                                   timestamp=datetime.utcnow())
                             embed.add_field(name=f"Mute Reason", value=reason)
+                            embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
                             embed.set_thumbnail(url=member.avatar_url)
                             embed.set_footer(text=f"Muted by {ctx.author.name}", icon_url=ctx.author.avatar_url)
                             await log_channel.send(content=None, embed=embed)
                     except Forbidden as e:
-                        await ctx.send(f"[GuildAdminCommands] Missing `manage_roles` permission! Error: {e.text}")
+                        await ctx.send(f"[GuildAdminCommands] Missing permission! Error: {e.text}")
                     except HTTPException as e:
                         await ctx.send(f"[GuildAdminCommands] Failed to add role! Error: {e.text}")
                 except Forbidden as e:
                     # no permission to create the role
-                    await ctx.send(f"[GuildAdminCommands] Cannot create muted role, Missing `manage_roles` "
+                    await ctx.send(f"[GuildAdminCommands] Cannot create muted role, Missing "
                                    f"permission! Error: {e.text}")
                 except HTTPException as e:
                     # Creating role failed
@@ -190,7 +202,7 @@ async def mute(self, ctx, member: discord.Member, reason: str = "No reason speci
     @commands.command(name="unmute")
     @commands.guild_only()
     @commands.has_permissions(administrator=True)
-    async def unmute(self, ctx, member: discord.Member, reason: str = "No reason specified!"):
+    async def unmute(self, ctx, member: discord.Member, reason: str = "No reason specified"):
         if member.bot:
             await ctx.send(f"{member.name} is a bot.")
             return
@@ -201,7 +213,11 @@ async def unmute(self, ctx, member: discord.Member, reason: str = "No reason spe
             # check length of the list, if 0 no muted role, if == 0 there is one
             try:
                 await member.remove_roles(muted_role, reason=reason)
-                await ctx.send(f"{member.name} was unmuted!")
+                embed = discord.Embed(title=None, description=f"**{member.name}** was unmuted 🔊",
+                                      color=discord.Color.green(), timestamp=datetime.utcnow())
+                embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
+                embed.set_footer(text=f"Unmuted by {ctx.author.name}", icon_url=ctx.author.avatar_url)
+                await ctx.send(content=None, embed=embed)
                 await member.send(f"You were unmuted by {ctx.message.author.name} in {ctx.guild.name}")
                 log_channel = [x for x in member.guild.channels if x.name == "logs"]
                 log_channel = log_channel[0] if len(
@@ -212,18 +228,35 @@ async def unmute(self, ctx, member: discord.Member, reason: str = "No reason spe
                                           description=None, color=discord.Color.green(),
                                           timestamp=datetime.utcnow())
                     embed.add_field(name=f"Unmute Reason", value=reason)
+                    embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
                     embed.set_thumbnail(url=member.avatar_url)
                     embed.set_footer(text=f"Unmuted by {ctx.author.name}", icon_url=ctx.author.avatar_url)
                     await log_channel.send(content=None, embed=embed)
             except Forbidden as e:
                 # missing permission to remove roles
-                await ctx.send(f"[GuildAdminCommands] Missing `manage_roles` permission! Error: {e.text}")
+                await ctx.send(f"[GuildAdminCommands] Missing permission! Error: {e.text}")
             except HTTPException as e:
                 await ctx.send(f"[GuildAdminCommands] Failed to remove roles! Error: {e.text}")
         except HTTPException as e:
             # Retrieving roles failed
             await ctx.send(f"[GuildAdminCommands] Retrieving roles failed! Error: {e.text}")
 
 
+    @commands.command(name="kick")
+    @commands.guild_only()
+    # TODO: reason?
+    async def kick(self, ctx, member: discord.Member):
+        try:
+            await member.kick()
+            embed = discord.Embed(title=None, description=f"**{member.name}** was kicked 👋", color=discord.Color.green(), timestamp=datetime.utcnow())
+            embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
+            embed.set_footer(text=f"Kicked by {ctx.author.name}", icon_url=ctx.author.avatar_url)
+            await ctx.send(content=None, embed=embed)
+        except Forbidden as e:
+            await ctx.send(f"[GuildAdminCommands] Missing permission! Error: {e.text}")
+        except HTTPException as e:
+            await ctx.send(f"[GuildAdminCommands] Failed to kick user {member.name}! Error: {e.text}")
+
+
 def setup(bot):
     bot.add_cog(GuildAdminCommandsCog(bot))

cogs/GuildEvents.py

@@ -22,6 +22,7 @@ async def on_member_join(self, member):
             embed = discord.Embed(title="User joined the server!", description=None, color=discord.Color.green(), timestamp=datetime.utcnow())
             embed.add_field(name=f"Username", value=f"{member.name}#{member.discriminator}", inline=False)
             embed.add_field(name=f"User ID", value=member.id, inline=False)
+            embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
             embed.add_field(name="Account created", value=f"{created_date}", inline=False)
             embed.set_thumbnail(url=member.avatar_url)
             embed.set_footer(text=self.bot.user.name, icon_url=self.bot.user.avatar_url)
@@ -53,6 +54,7 @@ async def on_member_remove(self, member):
             embed.add_field(name=f"Username", value=f"{member.name}#{member.discriminator}", inline=False)
             embed.add_field(name=f"User ID", value=member.id, inline=False)
             embed.add_field(name="Account created", value=f"{created_date}", inline=False)
+            embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
             embed.add_field(name="Joined", value=f"{joined_date}", inline=False)
             embed.set_thumbnail(url=member.avatar_url)
             embed.set_footer(text=self.bot.user.name, icon_url=self.bot.user.avatar_url)
@@ -72,6 +74,7 @@ async def on_member_ban(self, guild, member):
             embed.add_field(name=f"Username", value=f"{member.name}#{member.discriminator}", inline=False)
             embed.add_field(name="User ID", value=member.id, inline=False)
             embed.add_field(name=f"Ban Reason", value=ban_reason.reason)
+            embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
             embed.set_thumbnail(url=member.avatar_url)
             embed.set_footer(text=member.name, icon_url=member.avatar_url)
             await log_channel.send(content=None, embed=embed)
@@ -87,6 +90,7 @@ async def on_member_unban(self, guild, member):
                                   timestamp=datetime.utcnow())
             embed.add_field(name=f"Username", value=f"{member.name}#{member.discriminator}", inline=False)
             embed.add_field(name="User ID", value=member.id, inline=False)
+            embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
             embed.set_thumbnail(url=member.avatar_url)
             embed.set_footer(text=member.name, icon_url=member.avatar_url)
             await log_channel.send(content=None, embed=embed)

cogs/MiscCommands.py

@@ -24,6 +24,7 @@ async def ping(self, ctx):
         embed.add_field(name="🤖 Bot Latency:", value=f"{int(ping)}ms", inline=False)
         # adds a footer to the embed with the bot name and avatar
         embed.set_footer(text=ctx.author.name, icon_url=ctx.author.avatar_url)
+        embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
         # edits the previous message sent with the new embed
         await message.edit(content=None, embed=embed)
 
@@ -53,7 +54,7 @@ async def status(self, ctx):
         embed.add_field(name="Python Version:", value=f"{sys.version.split(' ')[0]}", inline=False)
         embed.add_field(name="Discord.py Version:", value=f"{discord.__version__}", inline=False)
         embed.add_field(name="Created by:", value="Riley and Skyler", inline=False)
-
+        embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
         embed.set_footer(text=ctx.author.name, icon_url=ctx.author.avatar_url)
         await ctx.send(content=None, embed=embed)
 
@@ -68,6 +69,20 @@ async def avatar(self, ctx, member: discord.Member = None):
         embed.set_image(url=member.avatar_url)
         await ctx.send(content=None, embed=embed)
 
+    @commands.command(name="ddos")
+    @commands.guild_only()
+    async def ddos(self, ctx, member: discord.Member):
+        await ctx.send(f"Initiating DDoS attack on {member.name}, please wait...")
+        time.sleep(1000)
+        await ctx.send("Malicious UDP packets were sent to their IP address, they should be offline now. :)")
+
+    @commands.command(name="swat")
+    @commands.guild_only()
+    async def swat(self, ctx, member: discord.Member):
+        await ctx.send(f"Initiating SWAT procedures on {member.name}, please wait...")
+        time.sleep(1000)
+        await ctx.send("Your local police department has been notified that you have shot your Dad & now have your mother hostage in your home, along with a can of gas with you to burn your house down. Enjoy the shitshow, motherfucker.")
+
 
 def setup(bot):
     bot.add_cog(MiscCommandsCog(bot))

cogs/XCommands.py

@@ -15,19 +15,17 @@ async def xban(self, ctx, member: discord.Member, reason: str = None):
                               color=discord.Color.green(),
                               timestamp=datetime.utcnow())
         embed.set_image(url="https://thumbs.gfycat.com/ElderlyViciousFeline-size_restricted.gif")
+        embed.set_author(name=self.bot.user.name, icon_url=self.bot.user.avatar_url)
         embed.set_footer(text=f"Banned by {ctx.author.name}", icon_url=ctx.author.avatar_url)
         await ctx.send(content=None, embed=embed)
 
     @commands.command(name="xmute")
     @commands.guild_only()
     async def xmute(self, ctx, member: discord.Member, reason: str = None):
-        embed = discord.Embed(title=f"{member.name} has been muted!",
-                              description=f"Muted for: {reason}" if reason else None,
-                              color=discord.Color.green(),
-                              timestamp=datetime.utcnow())
-        embed.set_image(url="https://thumbs.gfycat.com/ElderlyViciousFeline-size_restricted.gif")
-        embed.set_footer(text=f"Muted by {ctx.author.name}", icon_url=ctx.author.avatar_url)
-        await ctx.send(content=None, embed=embed)
+        if reason:
+            await ctx.send(content=f"{member.name} was muted by {ctx.author.name} for {reason}")
+        else:
+            await ctx.send(content=f"{member.name} was muted by {ctx.author.name}")
 
 
 def setup(bot):