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

This commit is contained in:
Emil Hammarstrom 2016-02-07 23:29:50 +01:00
commit 0fe98846a1
3 changed files with 5 additions and 5 deletions

View File

@ -70,7 +70,7 @@ class Audio:
else:
self.playlist = []
self.current = -1
if not queue: await self.bot.say("The link has been put into queue.")
if not self.queue: await self.bot.say("The link has been put into queue.")
self.queue.append(link)
else:
await self.bot.say("That link is not allowed.")

View File

@ -31,7 +31,7 @@ class General:
if len(choices) < 2:
await self.bot.say('Not enough choices to pick from.')
else:
await self.bot.say(choice(choices))
await self.bot.say(randchoice(choices))
@commands.command()
async def roll(self, number : int = 100):

View File

@ -87,8 +87,8 @@ class Mod:
"""Deletes last X messages from specified user.
Examples:
cleanup @\u200bTwentysix 2
cleanup Red 6"""
cleanup user @\u200bTwentysix 2
cleanup user Red 6"""
message = ctx.message
cmdmsg = message
if number > 0 and number < 10000:
@ -112,7 +112,7 @@ class Mod:
"""Deletes last X messages.
Example:
cleanup 26"""
cleanup messages 26"""
channel = ctx.message.channel
if number > 0 and number < 10000:
async for x in self.bot.logs_from(channel, limit=number+1):