CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-12-08 10:22:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Emil Hammarstrom
2016-02-08 09:46:56 +01:00
parent 0fe98846a1 1026c8188b
commit b4c238e541
4 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cogs/audio.py
View File

@@ -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.")

2
cogs/trivia.py
View File

@@ -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()