Merge remote-tracking branch 'upstream/develop' into develop

cogs/audio.py

@@ -391,7 +391,10 @@ class Audio:
     def empty_cache(self):
         files = os.listdir("data/audio/cache")
         for f in files:
+            try:
                 os.unlink("data/audio/cache/" + f)
+            except PermissionError: # In case it tries to delete the file that it's currently playing
+                pass
 
     def cache_size(self):
         total = [os.path.getsize("data/audio/cache/" + f) for f in os.listdir("data/audio/cache")]

cogs/economy.py

@@ -71,7 +71,7 @@ class Economy:
                 self.add_money(id, self.settings["PAYDAY_CREDITS"])
                 await self.bot.say("{} `Here, take some credits. Enjoy! (+{} credits!)`".format(author.mention, str(self.settings["PAYDAY_CREDITS"])))
         else:
-            await self.bot.say("{} `You need an account to receive credits. (!economy)`".format(author.mention))
+            await self.bot.say("{} `You need an account to receive credits.`".format(author.mention))
 
     @commands.command(pass_context=True)
     async def payouts(self, ctx):

cogs/general.py

@@ -106,7 +106,7 @@ class General:
         """
         question = " ".join(question)
         if question.endswith("?") and question != "?":
-            return await self.bot.say("```" + randchoice(self.ball) + "```")
+            return await self.bot.say("`" + randchoice(self.ball) + "`")
         else:
             return await self.bot.say("That doesn't look like a question.")
 
@@ -200,9 +200,9 @@ class General:
         """Starts/stops a poll
 
         Usage example:
-        poll Is this a poll?;Yes;No;Maybe"""
+        poll Is this a poll?;Yes;No;Maybe
+        poll stop"""
         message = ctx.message
-        print(text)
         if len(text) == 1:
             if text[0].lower() == "stop":
                 await self.endpoll(message)

startRed.bat

@@ -1,2 +1,3 @@
+chcp 65001
 python red.py
 pause

startRedLoop.bat

@@ -1,4 +1,5 @@
 @Echo off
+chcp 65001
 :Start
 
 python red.py