From bd7c614220ebc2c34fea42aa6452cc9557b0b0d4 Mon Sep 17 00:00:00 2001 From: CramMK Date: Fri, 24 Apr 2020 10:58:27 +0200 Subject: [PATCH] Improve animegirl command --- aquabot.py | 2 +- cogs/anime.py | 28 ++++++++++++++++++++-------- config/media.py | 4 ++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/aquabot.py b/aquabot.py index 29cdb0b..2a5bfd1 100644 --- a/aquabot.py +++ b/aquabot.py @@ -32,7 +32,7 @@ import loadconfig # INIT THE BOT bot = commands.Bot( command_prefix=loadconfig.__prefix__, - description="Holy Goddess Aqua!") + description="Holy Goddess Aqua! - for further help on a command, use the argument `list`") # LOAD COGS SPECIFIED IN 'config/cogs.py' for cog in loadconfig.__cogs__: diff --git a/cogs/anime.py b/cogs/anime.py index 2dc34b6..6caf0ca 100644 --- a/cogs/anime.py +++ b/cogs/anime.py @@ -36,14 +36,26 @@ class Anime(commands.Cog): """ # config/media.py girl = query.capitalize() - try: - media = random.choice(loadconfig.__media_girl__[girl]) - await ctx.send(media) - except KeyError as error: - text = ( - f"Girl `{girl}` not found in database!\n" - "It probably sucks...") - await ctx.send(text) + + if girl == "List": + girl_list = "" + for key in loadconfig.__media_girl__.keys(): + if not girl_list: + girl_list = girl_list + key + else: + girl_list = girl_list + ", " + key + + await ctx.send(f"Currently listed girls: `{girl_list}`") + + else: + try: + media = random.choice(loadconfig.__media_girl__[girl]) + await ctx.send(media) + except KeyError as error: + text = ( + f"Girl `{girl}` not found in database!\n" + "It probably sucks...") + await ctx.send(text) # COG ENDING diff --git a/config/media.py b/config/media.py index 1bfd5fc..78f406b 100644 --- a/config/media.py +++ b/config/media.py @@ -48,6 +48,6 @@ __media_girl__ = { } __olli_memes__ = [ - "https://i.imgflip.com/3xpkiv.jpg" - "https://cdn.discordapp.com/attachments/541637988120133634/702992838702399518/grave.png" + "https://i.imgflip.com/3xpkiv.jpg", + "https://cdn.discordapp.com/attachments/541637988120133634/702992838702399518/grave.png", ]