CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-08 12:18:54 -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-07 23:29:50 +01:00
commit 0fe98846a1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogs/audio.py
View File

@ -70,7 +70,7 @@ class Audio:
else: else:
self.playlist = [] self.playlist = []
self.current = -1 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) self.queue.append(link)
else: else:
await self.bot.say("That link is not allowed.") await self.bot.say("That link is not allowed.")

2
cogs/general.py
View File

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

6
cogs/mod.py
View File

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