diff --git a/cogs/fun/fun.py b/cogs/fun/fun.py index d28d4b28..e5e172f9 100644 --- a/cogs/fun/fun.py +++ b/cogs/fun/fun.py @@ -1,14 +1,9 @@ -import asyncio import random -import string -from aiohttp import request from discord import Member, Colour, Embed from discord.ext import commands from discord.ext.commands import BucketType, cooldown, command, has_any_role, is_owner -import settings -from cogs.anime.interactive import error_function from settings import time, colour_list @@ -182,113 +177,6 @@ class Fun(commands.Cog): except FileNotFoundError as e: print(e) - @command(name="doggo", aliases=["Doggo"]) - @cooldown(1, 1, BucketType.user) - async def doggo(self, ctx, breed=None): - """Allows an API to grab images of dogs""" - - # 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 avatar - userAvatar = member.avatar_url - - # Initialise array to store doggo pics - b_list = [] - - # If a breed if specified - if breed: - # Get the lowercase string input - lowercase_breed = breed.lower() - - # If the user wants to know what breeds there are - if lowercase_breed == "breeds": - # Get the list of breeds - breed_url = "https://dog.ceo/api/breeds/list/all" - - # Using API, retrieve the full list of breeds available - async with request("GET", breed_url, headers={}) as response: - if response.status == 200: - data = await response.json() - breed_link = data["message"] - - # Store every Doggo in an array - for doggo in breed_link: - b_list.append(doggo) - - # Join together all the breeds into a string - doggo_string = string.capwords(", ".join(b_list)) - - # Tell the user to try the breeds listed below - await ctx.send(f"Try the Breeds listed below!\n{doggo_string}") - - # If no breed has been specified - else: - - # Grab a random image of a doggo with the breed specified - image_url = f"https://dog.ceo/api/breed/{lowercase_breed}/images/random" - - # Using API, retrieve the image of a doggo of the breed specified - async with request("GET", image_url, headers={}) as response: - if response.status == 200: - data = await response.json() - image_link = data["message"] - - # Set up the embed for a doggo image - doggo_embed = Embed( - title=f"**It's a {lowercase_breed.capitalize()} Doggo!!** ", - colour=Colour(random.choice(colour_list)), - timestamp=time) - doggo_embed.set_image(url=image_link) - doggo_embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar)) - - # Send the doggo image - await ctx.send(embed=doggo_embed) - - else: - - # Send error message that Doggo was not found! - await ctx.send( - "Doggo Not Found! Please do **~doggo `breeds`** to see the full list of Doggos!") - else: - - # Grab a random image of a doggo of any breed - image_url = "https://dog.ceo/api/breeds/image/random" - - # Using API, retrieve the image of a doggo of any breed - async with request("GET", image_url, headers={}) as response: - if response.status == 200: - data = await response.json() - image_link = data["message"] - - # Set up the embed for a random doggo image - doggo_embed = Embed( - title=f"**Doggo!** ", - colour=Colour(random.choice(colour_list)), - timestamp=time) - doggo_embed.set_image(url=image_link) - doggo_embed.set_footer(text=f"Requested by {member}", icon_url='{}'.format(userAvatar)) - - # Send random doggo image to the channel - await ctx.send(embed=doggo_embed) - - else: - - # Send error message that Doggo was not found! - await ctx.send( - "Doggo Not Found! Please do **~doggo `breeds`** to see the full list of Doggos!") - 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() - def setup(bot): bot.add_cog(Fun(bot))