From 6d632f7d9506d583ce78be8b25fed00265ab7619 Mon Sep 17 00:00:00 2001 From: sgoudham Date: Fri, 19 Jun 2020 20:36:54 +0100 Subject: [PATCH] Added more commentary to the code Added ~slap Added ~pat Added ~kill --- cogs/Embeds.py | 191 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 164 insertions(+), 27 deletions(-) diff --git a/cogs/Embeds.py b/cogs/Embeds.py index 6b5c4ef4..7ca67600 100644 --- a/cogs/Embeds.py +++ b/cogs/Embeds.py @@ -8,38 +8,140 @@ from discord.ext.commands import BucketType, cooldown import config -colour_list = [c for c in config.colors.values()] -channels = ["enso-chan-commands"] - +# Set up the Cog class Embeds(commands.Cog): def __init__(self, bot): self.bot = bot + # ~kiss command which allows users to kiss a person in the server @commands.command(aliases=["Kiss", "kiss"]) - @cooldown(1, 0.5, BucketType.channel) + # Added a cooldown, only 1 instance of the command can be sent every second per user + @cooldown(1, 1, BucketType.user) async def kissing(self, ctx, target: discord.Member): + # Surround with try/except to catch any exceptions that may occur try: - if str(ctx.channel) in channels: + # If the channel that the command has been sent is in the list of accepted channels + if str(ctx.channel) in config.channels: + + # Open the file containing the kissing gifs with open('images/FunCommands/kissing.txt') as file: + # Store content of the file in kissing_array kissing_array = file.readlines() - # set member as the author + # Set member as the author member = ctx.message.author + # Get the member avatar userAvatar = member.avatar_url + # Set up the embed to display a random kissing gif embed = discord.Embed( - title=f"<:blushlook1:677310734123663363> <:blushlook2:679524467248201769> | **{member.display_name}** kissed **{target.display_name}**", - colour=discord.Colour(int(random.choice(colour_list)))) + title=f" | **{member.display_name}** kissed **{target.display_name}**", + colour=discord.Colour(int(random.choice(config.colour_list)))) embed.set_image(url=random.choice(kissing_array)) embed.set_footer(text=f"Requested by {ctx.message.author}", icon_url='{}'.format(userAvatar)) embed.timestamp = datetime.datetime.utcnow() + # Send the embedded message to the user + await ctx.send(embed=embed) + + # else the command is sent in an invalid channel + else: + # Call error_function() and display it to the user + message = await ctx.send(error_function()) + + # Let the user read the message for 2.5 seconds + await asyncio.sleep(2.5) + # Delete the message + await message.delete() + + except FileNotFoundError as e: + print(e) + + # ~kill command which allows users to kill a person in the server + @commands.command(aliases=["Kill", "k"]) + # Added a cooldown, only 1 instance of the command can be sent every second per user + @cooldown(1, 1, BucketType.user) + async def kill(self, ctx, target: discord.Member): + + # Surround with try/except to catch any exceptions that may occur + try: + + # If the channel that the command has been sent is in the list of accepted channels + if str(ctx.channel) in config.channels: + + # Open the file containing the killing gifs + with open('images/FunCommands/killing.txt') as file: + # Store content of the file in killing_array + killing_array = file.readlines() + + # Set member as the author + member = ctx.message.author + # Get the member avatar + userAvatar = member.avatar_url + + # Set up the embed to display a random killing gif + embed = discord.Embed( + title=f"<:monkaW:718960264896184380> <:monkaW:718960264896184380> | **{member.display_name}** killed **{target.display_name}**", + colour=discord.Colour(int(random.choice(config.colour_list)))) + embed.set_image(url=random.choice(killing_array)) + embed.set_footer(text=f"Requested by {ctx.message.author}", icon_url='{}'.format(userAvatar)) + embed.timestamp = datetime.datetime.utcnow() + + # Send the embedded message to the user + await ctx.send(embed=embed) + + # else the command is sent in an invalid channel + else: + # Call error_function() and display it to the user + message = await ctx.send(error_function()) + + # Let the user read the message for 2.5 seconds + await asyncio.sleep(2.5) + # Delete the message + await message.delete() + + except FileNotFoundError as e: + print(e) + + # ~cuddle command which allows users to cuddle a person in the server + @commands.command(aliases=["Cuddle"]) + # Added a cooldown, only 1 instance of the command can be sent every second per user + @cooldown(1, 1, BucketType.user) + async def cuddle(self, ctx, target: discord.Member): + + # Surround with try/except to catch any exceptions that may occur + try: + + # If the channel that the command has been sent is in the list of accepted channels + if str(ctx.channel) in config.channels: + + # Open the file containing the cuddling gifs + with open('images/FunCommands/cuddling.txt') as file: + # Store content of the file in cuddling_array + cuddling_array = file.readlines() + + # Set member as the author + member = ctx.message.author + # Get the member avatar + userAvatar = member.avatar_url + + # Set up the embed to display a random cuddling gif + embed = discord.Embed( + title=f"<:blushlook1:677310734123663363> <:blushlook2:679524467248201769> | **{member.display_name}** cuddled **{target.display_name}**", + colour=discord.Colour(int(random.choice(config.colour_list)))) + embed.set_image(url=random.choice(cuddling_array)) + embed.set_footer(text=f"Requested by {ctx.message.author}", icon_url='{}'.format(userAvatar)) + embed.timestamp = datetime.datetime.utcnow() + + # Send the embedded message to the user await ctx.send(embed=embed) + # else the command is sent in an invalid channel else: + # Call error_function() and display it to the user message = await ctx.send(error_function()) # Let the user read the message for 2.5 seconds @@ -50,30 +152,42 @@ class Embeds(commands.Cog): except FileNotFoundError as e: print(e) + # ~slap command which allows users to cuddle a person in the server @commands.command(aliases=["Slap"]) - @cooldown(1, 0.5, BucketType.channel) + # Added a cooldown, only 1 instance of the command can be sent every second per user + @cooldown(1, 1, BucketType.user) async def slap(self, ctx, target: discord.Member): + # Surround with try/except to catch any exceptions that may occur try: - if str(ctx.channel) in channels: + # If the channel that the command has been sent is in the list of accepted channels + if str(ctx.channel) in config.channels: + + # Open the file containing the cuddling gifs with open('images/FunCommands/slapping.txt') as file: + # Store content of the file in cuddling_array slapping_array = file.readlines() - # set member as the author + # Set member as the author member = ctx.message.author + # Get the member avatar userAvatar = member.avatar_url + # Set up the embed to display a random slapping gif embed = discord.Embed( title=f"<:baka:718942872061083678> <:baka:718942872061083678> | **{member.display_name}** slapped **{target.display_name}**", - colour=discord.Colour(int(random.choice(colour_list)))) + colour=discord.Colour(int(random.choice(config.colour_list)))) embed.set_image(url=random.choice(slapping_array)) embed.set_footer(text=f"Requested by {ctx.message.author}", icon_url='{}'.format(userAvatar)) embed.timestamp = datetime.datetime.utcnow() + # Send the embedded message to the user await ctx.send(embed=embed) + # else the command is sent in an invalid channel else: + # Call error_function() and display it to the user message = await ctx.send(error_function()) # Let the user read the message for 2.5 seconds @@ -84,30 +198,42 @@ class Embeds(commands.Cog): except FileNotFoundError as e: print(e) - @commands.command(aliases=["Cuddle", "cdle", "cud"]) - @cooldown(1, 0.5, BucketType.channel) - async def cuddle(self, ctx, target: discord.Member): + # ~slap command which allows users to cuddle a person in the server + @commands.command(aliases=["Pat"]) + # Added a cooldown, only 1 instance of the command can be sent every second per user + @cooldown(1, 1, BucketType.user) + async def pat(self, ctx, target: discord.Member): + # Surround with try/except to catch any exceptions that may occur try: - if str(ctx.channel) in channels: - with open('images/FunCommands/cuddling.txt') as file: - cuddling_array = file.readlines() + # If the channel that the command has been sent is in the list of accepted channels + if str(ctx.channel) in config.channels: - # set member as the author + # Open the file containing the patting gifs + with open('images/FunCommands/patting.txt') as file: + # Store content of the file in patting_array + patting_array = file.readlines() + + # Set member as the author member = ctx.message.author + # Get the member avatar userAvatar = member.avatar_url + # Set up the embed to display a random patting gif embed = discord.Embed( - title=f" | **{member.display_name}** cuddles **{target.display_name}**", - colour=discord.Colour(int(random.choice(colour_list)))) - embed.set_image(url=random.choice(cuddling_array)) + title=f"<:baka:718942872061083678> <:baka:718942872061083678> | **{member.display_name}** patted **{target.display_name}**", + colour=discord.Colour(int(random.choice(config.colour_list)))) + embed.set_image(url=random.choice(patting_array)) embed.set_footer(text=f"Requested by {ctx.message.author}", icon_url='{}'.format(userAvatar)) embed.timestamp = datetime.datetime.utcnow() + # Send the embedded message to the user await ctx.send(embed=embed) + # else the command is sent in an invalid channel else: + # Call error_function() and display it to the user message = await ctx.send(error_function()) # Let the user read the message for 2.5 seconds @@ -118,30 +244,41 @@ class Embeds(commands.Cog): except FileNotFoundError as e: print(e) + # ~lemon command which allows users to hand people lemons to members in the user @commands.command(aliases=["lem", "Lemon", "Lem"]) - @cooldown(1, 2, BucketType.channel) + # Added a cooldown, only 1 instance of the command can be sent every second per user + @cooldown(1, 1, BucketType.user) async def lemon(self, ctx, target: discord.Member): lemon_array = ["https://media.discordapp.net/attachments/669812887564320769/720093589056520202/lemon.gif", "https://media.discordapp.net/attachments/669812887564320769/720093575492272208/lemon2.gif", "https://media.discordapp.net/attachments/718484280925224981/719629805263257630/lemon.gif"] + + # Surround with try/except to catch any exceptions that may occur try: - if str(ctx.channel) in channels: - # set member as the author + # If the channel that the command has been sent is in the list of accepted channels + if str(ctx.channel) in config.channels: + + # Set member as the author member = ctx.message.author + # Get the member avatar userAvatar = member.avatar_url + # Set up the embed to display a random lemon gif embed = discord.Embed( title=f" | **{member.display_name}** Gives A Lemon To **{target.display_name}**", - colour=discord.Colour(int(random.choice(colour_list)))) + colour=discord.Colour(int(random.choice(config.colour_list)))) embed.set_image(url=random.choice(lemon_array)) embed.set_footer(text=f"Requested by {ctx.message.author}", icon_url='{}'.format(userAvatar)) embed.timestamp = datetime.datetime.utcnow() + # Send the embedded message to the user await ctx.send(embed=embed) + # else the command is sent in an invalid channel else: + # Call error_function() and display it to the user message = await ctx.send(error_function()) # Let the user read the message for 2.5 seconds @@ -153,7 +290,7 @@ class Embeds(commands.Cog): print(e) -# Error handling function to make sure that the commands only work in enso-chan-commands +# Error handling function to make sure that the commands only work in "enso-chan-commands" def error_function(): return "Sorry! I only work in #enso-chan-commands!"