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

This commit is contained in:
Emil Hammarstrom
2016-02-10 21:26:43 +01:00
2 changed files with 4 additions and 3 deletions

View File

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