Made sure that the ~enso [person] returns the correct error message in other channels

cogs/AnimeImages.py

@@ -35,6 +35,68 @@ def Abbrev(anime_msg):
     return new_msg
 
 
+# Function to return a random image of a waifu
+def randomWaifu(msg, waifu):
+    # Retrieve a random image of a waifu within the bot
+    with open(f'images/AnimeImages/Waifus/{random.choice(waifu)}.txt') as file:
+        array = file.readlines()
+
+    # Set member as the author
+    member = msg.author
+    # Get the member's avatar
+    userAvatar = member.avatar_url
+
+    # Set up the embed for a random waifu image
+    waifu_embed = discord.Embed(
+        title=f"Oh Look! A Wonderful Waifu! <a:huh:676195228872474643> <a:huh:676195228872474643> ",
+        colour=discord.Colour(random.choice(settings.colour_list)))
+    waifu_embed.set_image(url=random.choice(array))
+    waifu_embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar))
+    waifu_embed.timestamp = datetime.datetime.utcnow()
+
+    return waifu_embed
+
+
+# Function to return a random image of a husbando
+def randomHusbando(msg, husbando):
+    # Retrieve a random image of a husbando within the bot
+    with open(f'images/AnimeImages/Husbandos/{random.choice(husbando)}.txt') as file:
+        array = file.readlines()
+
+    # Set member as the author
+    member = msg.author
+    # Get the member's avatar
+    userAvatar = member.avatar_url
+
+    # Set up the embed for a random husbando image
+    husbando_embed = discord.Embed(
+        title=f"Oh Look! A Handsome Husbando! <a:huh:676195228872474643> <a:huh:676195228872474643> ",
+        colour=discord.Colour(random.choice(settings.colour_list)))
+    husbando_embed.set_image(url=random.choice(array))
+    husbando_embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar))
+    husbando_embed.timestamp = datetime.datetime.utcnow()
+
+    return husbando_embed
+
+
+# Function to allow modular code and sets up the embed for the anime images
+def displayAnimeImage(array, msg, name):
+    # Set member as the author
+    member = msg.author
+    # Get the member's avatar
+    userAvatar = member.avatar_url
+
+    # Set up embed for an image relating to a husbando or waifu
+    anime_embed = discord.Embed(
+        title=f"**{name}**",
+        colour=discord.Colour(random.choice(settings.colour_list)))
+    anime_embed.set_image(url=random.choice(array))
+    anime_embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar))
+    anime_embed.timestamp = datetime.datetime.utcnow()
+
+    return anime_embed
+
+
 class Waifus(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
@@ -54,8 +116,6 @@ class Waifus(commands.Cog):
 
         # Function to display all the images requested of the people
         def displayServerImage(array, ctx, name):
-            # If the channel that the command has been sent is in the list of accepted channels
-            if str(ctx.channel) in settings.channels:
                 # Set member as the author
                 member = ctx.message.author
                 # Get the member's avatar
@@ -71,6 +131,9 @@ class Waifus(commands.Cog):
 
                 return embed
 
+        # If the channel that the command has been sent is in the list of accepted channels
+        if str(ctx.channel) in settings.channels:
+
             # if a name is specified
             if name:
                 # Get the lowercase
@@ -110,8 +173,6 @@ class Waifus(commands.Cog):
         # Else if the name is not specified
             else:
 
-            # If the channel that the command has been sent is in the list of accepted channels
-            if str(ctx.channel) in settings.channels:
                 # Retrieve a random image of a member in the bot
                 with open(f'images/ServerMembers/{random.choice(array)}.txt') as file:
                     array = file.readlines()
@@ -131,9 +192,18 @@ class Waifus(commands.Cog):
 
                 await ctx.send(embed=embed)
 
+        else:
+
+            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()
+
     # Cog on_message for waifus and husbandos
     @commands.Cog.listener()
-    @commands.cooldown(1, 1, BucketType.user)
+    @cooldown(1, 1, BucketType.user)
     async def on_message(self, message):
 
         # Defining the channel and global variables
@@ -148,65 +218,6 @@ class Waifus(commands.Cog):
         waifu_array = ["toga", "yumeko"]
         husbando_array = ["husk", "kakashi", "tamaki"]
 
-        # Function to return a random image of a waifu
-        def randomWaifu(msg, waifu):
-            # Retrieve a random image of a waifu within the bot
-            with open(f'images/AnimeImages/Waifus/{random.choice(waifu)}.txt') as file:
-                array = file.readlines()
-
-            # Set member as the author
-            member = msg.author
-            # Get the member's avatar
-            userAvatar = member.avatar_url
-
-            # Set up the embed for a random waifu image
-            waifu_embed = discord.Embed(
-                title=f"Oh Look! A Wonderful Waifu! <a:huh:676195228872474643> <a:huh:676195228872474643> ",
-                colour=discord.Colour(random.choice(settings.colour_list)))
-            waifu_embed.set_image(url=random.choice(array))
-            waifu_embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar))
-            waifu_embed.timestamp = datetime.datetime.utcnow()
-
-            return waifu_embed
-
-        # Function to return a random image of a husbando
-        def randomHusbando(msg, husbando):
-            # Retrieve a random image of a husbando within the bot
-            with open(f'images/AnimeImages/Husbandos/{random.choice(husbando)}.txt') as file:
-                array = file.readlines()
-
-            # Set member as the author
-            member = msg.author
-            # Get the member's avatar
-            userAvatar = member.avatar_url
-
-            # Set up the embed for a random husbando image
-            husbando_embed = discord.Embed(
-                title=f"Oh Look! A Handsome Husbando! <a:huh:676195228872474643> <a:huh:676195228872474643> ",
-                colour=discord.Colour(random.choice(settings.colour_list)))
-            husbando_embed.set_image(url=random.choice(array))
-            husbando_embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar))
-            husbando_embed.timestamp = datetime.datetime.utcnow()
-
-            return husbando_embed
-
-        # Function to allow modular code and sets up the embed for the anime images
-        def displayAnimeImage(array, msg, name):
-            # Set member as the author
-            member = msg.author
-            # Get the member's avatar
-            userAvatar = member.avatar_url
-
-            # Set up embed for an image relating to a husbando or waifu
-            anime_embed = discord.Embed(
-                title=f"**{name}**",
-                colour=discord.Colour(random.choice(settings.colour_list)))
-            anime_embed.set_image(url=random.choice(array))
-            anime_embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar))
-            anime_embed.timestamp = datetime.datetime.utcnow()
-
-            return anime_embed
-
         # If the channel that the command has been sent is in the list of accepted channels
         if str(channel) in settings.channels: