From abb7f34d9fae2a51129035f4f209e8a58a872a8c Mon Sep 17 00:00:00 2001
From: Milka64 <michael.ricart@0w.tf>
Date: Thu, 18 Feb 2021 21:54:01 +0100
Subject: [PATCH] WIP on #11

---
 kabot/kabot/kabot.py | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/kabot/kabot/kabot.py b/kabot/kabot/kabot.py
index 43ca715..547bfdc 100644
--- a/kabot/kabot/kabot.py
+++ b/kabot/kabot/kabot.py
@@ -43,11 +43,11 @@ logger.addHandler(stream_handler)
 class Mybot(commands.Cog):
     #Fonctions necesaires pour Kabot.
     def __init__(
-            self, 
-            bot, 
-            gl_url=None, 
-            gl_token=None, 
-            gif_token=None, 
+            self,
+            bot,
+            gl_url=None,
+            gl_token=None,
+            gif_token=None,
             audio_path=None,
             nickname=None,
             voice_channel=None,
@@ -237,18 +237,24 @@ class Mybot(commands.Cog):
                 await ctx.channel.send("Exception when calling DefaultApi->gifs_search_get: %s\n" % e)
         else:
             await ctx.channel.send("Exception : No api key found")
-                
 
     @commands.guild_only()
     @commands.command()
     async def joke(self, ctx, folder=None):
-        user = ctx.message.author.name
-        if not folder or not ctx.message.content:
-            audio_file = random.choice([f"{f}" for f in Path(self.audio_path + '/').glob('**/*.mp3')])
-        else:
-            folder = folder.lower()
-            audio_file = random.choice([f"{f}" for f in Path(self.audio_path + '/').glob('**/*.mp3') if folder in str(f).lower()])
-        self.sounds.append((audio_file, ctx))
+        try:
+            user = ctx.message.author.name
+            if not folder or not ctx.message.content:
+                audio_file = random.choice([f"{f}" for f in Path(self.audio_path + '/').glob('**/*.mp3')])
+            else:
+                folder = folder.lower()
+                audio_file = random.choice([f"{f}" for f in Path(self.audio_path + '/').glob('**/*.mp3') if folder in str(f).lower()])
+                if not audio_file:
+                    ctx.channel.send("%s not found" % folder)
+            self.sounds.append((audio_file, ctx))
+        except:
+            e = sys.exc_info()[0]
+            await ctx.channel.send("Exception when calling joke: %s\n" % e)
+
 
     @commands.command(help="optionnal args : [livre] [character]")
     async def kaamelott(self, ctx, *args):
@@ -550,8 +556,8 @@ def main():
     logger.info("Initialisation de Kabot")
     parser = argparse.ArgumentParser()
     parser.add_argument(
-            "-c", 
-            "--config", 
+            "-c",
+            "--config",
             help="config file",
             default="config.ini"
             )
@@ -587,7 +593,7 @@ def main():
     gl_token = config['gitlab']['token']
     gif_token = config['giphy']['token']
     bot = commands.Bot(
-            command_prefix='!', 
+            command_prefix='!',
             )
 
     test = False