matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

[commands] Allow role mentions to work with discord.Role params.

Browse Source 
This also fixes the Member regex to support the new <@!user_id> syntax
and allows colours to have a leading # before the number.
This commit is contained in:
Rapptz 2016-04-29 08:45:12 -04:00
parent e112536ce2
commit 7f09acf871
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
discord/ext/commands/core.py
View File

@ -155,7 +155,7 @@ class Command:
return result return result
def _convert_member(self, bot, message, argument): def _convert_member(self, bot, message, argument):
match = re.match(r'<@([0-9]+)>$', argument) match = re.match(r'<@!?([0-9]+)>$', argument)
server = message.server server = message.server
result = None result = None
if match is None: if match is None:
@ -202,6 +202,8 @@ class Command:
def _convert_colour(self, bot, message, argument): def _convert_colour(self, bot, message, argument):
arg = argument.replace('0x', '').lower() arg = argument.replace('0x', '').lower()
if arg[0] == '#':
arg = arg[1:]
try: try:
value = int(arg, base=16) value = int(arg, base=16)
return discord.Colour(value=value) return discord.Colour(value=value)
@ -216,7 +218,9 @@ class Command:
if not server: if not server:
raise NoPrivateMessage() raise NoPrivateMessage()
result = discord.utils.get(server.roles, name=argument) match = re.match(r'<@&([0-9]+)>$', argument)
params = dict(id=match.group(1)) if match else dict(name=argument)
result = discord.utils.get(server.roles, **params)
if result is None: if result is None:
raise BadArgument('Role "{}" not found.'.format(argument)) raise BadArgument('Role "{}" not found.'.format(argument))
return result return result