Merge branch 'develop' of https://github.com/Twentysix26/Red-DiscordBot into develop

README.md

@@ -1,18 +1,6 @@
 # Red - A multifunction Discord bot
 #### *Now fully modular*
 
-This is a work in progress. Bugs and missing features are to be expected.
+This is a work in progress. Bugs and missing features are to be expected.  
 
-The only requirement for the main part is:
-```
-pip3 install git+https://github.com/Rapptz/discord.py@async
-```
-The requirements for the audio module are:
-```
-pip3 install youtube_dl
-pip3 install beautifulsoup4
-Opus/ffmpeg
-```
-Either you install ffmpeg and opus from the original sources or you can download them directly from the [main branch](https://github.com/Twentysix26/Red-DiscordBot).  
-Just click on the 3 .exes and the opus dll, then click on the "raw" button to download them.  
-If you do this, you also need to put them in the main folder, next to red.py
+####[ [How to try it out](https://github.com/Twentysix26/Red-DiscordBot/wiki/Red-v2) ]

cogs/audio.py

@@ -248,7 +248,7 @@ class Audio:
         if await self.check_voice(ctx.message.author, ctx.message):
             if not self.playlist:
                 self.queue.append(link)
-                await self.bot.say(self.queue)
+                await self.bot.say("Link added to queue.")
             else:
                 await self.bot.say("I'm already playing a playlist.")
 

cogs/trivia.py

@@ -83,7 +83,7 @@ class TriviaSession():
                 if self.questionList: await self.newQuestion()
             else:
                 if os.path.isfile("data/trivia/" + qlist + ".txt"):
-                    self.questionList = self.loadList("trivia/" + qlist + ".txt")
+                    self.questionList = self.loadList("data/trivia/" + qlist + ".txt")
                     self.status = "new question"
                     self.timeout = time.perf_counter()
                     if self.questionList: await self.newQuestion()

red.py

@@ -23,7 +23,7 @@ description = """
 Red - A multifunction Discord bot by Twentysix
 """
 
-formatter = commands.HelpFormatter(show_check_failure=True)
+formatter = commands.HelpFormatter(show_check_failure=False)
 
 bot = commands.Bot(command_prefix=["_"], formatter=formatter,
                    description=description, pm_help=True)
@@ -221,6 +221,7 @@ def list_cogs():
     cogs = glob.glob("cogs/*.py")
     clean = []
     for c in cogs:
+        c = c.replace("/", "\\") # Linux fix
         clean.append("cogs." + c.split("\\")[1].replace(".py", ""))
     return clean