CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-07 03:38:53 -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-10 21:26:43 +01:00
commit 5436f78d84
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogs/audio.py
View File

@ -259,7 +259,7 @@ class Audio:
return True return True
elif discord.utils.get(author.roles, name=checks.settings["MOD_ROLE"]) is not None: elif discord.utils.get(author.roles, name=checks.settings["MOD_ROLE"]) is not None:
return True return True
elif len(author.voice_channel.voice_members) == 2: elif len(author.voice_channel.voice_members) in (1, 2):
return True return True
else: else:
return False return False
@ -585,7 +585,7 @@ class MaximumLength(Exception):
return self.message return self.message
def check_folders(): def check_folders():
folders = ("data/audio", "data/audio/cache", "data/audio/playlists") folders = ("data/audio", "data/audio/cache", "data/audio/playlists", "data/audio/localtracks")
for folder in folders: for folder in folders:
if not os.path.exists(folder): if not os.path.exists(folder):
print("Creating " + folder + " folder...") print("Creating " + folder + " folder...")

3
cogs/general.py
View File

@ -99,11 +99,12 @@ class General:
await self.bot.say("Choose rock, paper or scissors.") await self.bot.say("Choose rock, paper or scissors.")
@commands.command(name="8", aliases=["8ball"]) @commands.command(name="8", aliases=["8ball"])
async def _8ball(self, question : str): async def _8ball(self, *question):
"""Ask 8 ball a question """Ask 8 ball a question
Question must end with a question mark. Question must end with a question mark.
""" """
question = " ".join(question)
if question.endswith("?") and question != "?": if question.endswith("?") and question != "?":
return await self.bot.say("```" + randchoice(self.ball) + "```") return await self.bot.say("```" + randchoice(self.ball) + "```")
else: else: