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

[commands] Allow coroutine functions in Bot.command_prefix

Browse Source
This commit is contained in:
Rapptz
2016-09-17 15:01:56 -04:00
parent 203c64a9a4
commit 967d43c35b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
discord/ext/commands/bot.py
View File

@@ -161,7 +161,8 @@ class Bot(GroupMixin, discord.Client):
indicate what the prefix should be, or a callable that takes in the bot indicate what the prefix should be, or a callable that takes in the bot
as its first parameter and :class:`discord.Message` as its second as its first parameter and :class:`discord.Message` as its second
parameter and returns the prefix. This is to facilitate "dynamic" parameter and returns the prefix. This is to facilitate "dynamic"
command prefixes. command prefixes. This callable can be either a regular function or
a coroutine.
The command prefix could also be a list or a tuple indicating that The command prefix could also be a list or a tuple indicating that
multiple checks for the prefix should be used and the first one to multiple checks for the prefix should be used and the first one to
@@ -234,10 +235,14 @@ class Bot(GroupMixin, discord.Client):
# internal helpers # internal helpers
@asyncio.coroutine
def _get_prefix(self, message): def _get_prefix(self, message):
prefix = self.command_prefix prefix = self.command_prefix
if callable(prefix): if callable(prefix):
return prefix(self, message) ret = prefix(self, message)
if asyncio.iscoroutine(ret):
ret = yield from ret
return ret
else: else:
return prefix return prefix
@@ -787,7 +792,7 @@ class Bot(GroupMixin, discord.Client):
if self._skip_check(message.author, self.user): if self._skip_check(message.author, self.user):
return return
prefix = self._get_prefix(message) prefix = yield from self._get_prefix(message)
invoked_prefix = prefix invoked_prefix = prefix
if not isinstance(prefix, (tuple, list)): if not isinstance(prefix, (tuple, list)):