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

[commands] Helper functions now take *args and **kwargs.

Browse Source
This commit is contained in:
Rapptz 2016-02-18 19:39:40 -05:00
parent 89de0e7e9f
commit 98090a2a57
1 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,45 +216,43 @@ class Bot(GroupMixin, discord.Client):
# utility "send_*" functions # utility "send_*" functions
@asyncio.coroutine @asyncio.coroutine
def say(self, content): def say(self, *args, **kwargs):
"""|coro| """|coro|
A helper function that is equivalent to doing A helper function that is equivalent to doing
.. code-block:: python .. code-block:: python
self.send_message(message.channel, content) self.send_message(message.channel, *args, **kwargs)
Parameters See Also
---------- ---------
content : str :meth:`Client.send_message`
The content to pass to :class:`Client.send_message`
""" """
destination = _get_variable('_internal_channel') destination = _get_variable('_internal_channel')
result = yield from self.send_message(destination, content) result = yield from self.send_message(destination, *args, **kwargs)
return result return result
@asyncio.coroutine @asyncio.coroutine
def whisper(self, content): def whisper(self, *args, **kwargs):
"""|coro| """|coro|
A helper function that is equivalent to doing A helper function that is equivalent to doing
.. code-block:: python .. code-block:: python
self.send_message(message.author, content) self.send_message(message.author, *args, **kwargs)
Parameters See Also
---------- ---------
content : str :meth:`Client.send_message`
The content to pass to :class:`Client.send_message`
""" """
destination = _get_variable('_internal_author') destination = _get_variable('_internal_author')
result = yield from self.send_message(destination, content) result = yield from self.send_message(destination, *args, **kwargs)
return result return result
@asyncio.coroutine @asyncio.coroutine
def reply(self, content): def reply(self, content, *args, **kwargs):
"""|coro| """|coro|
A helper function that is equivalent to doing A helper function that is equivalent to doing
@ -262,38 +260,34 @@ class Bot(GroupMixin, discord.Client):
.. code-block:: python .. code-block:: python
msg = '{0.mention}, {1}'.format(message.author, content) msg = '{0.mention}, {1}'.format(message.author, content)
self.send_message(message.channel, msg) self.send_message(message.channel, msg, *args, **kwargs)
Parameters See Also
---------- ---------
content : str :meth:`Client.send_message`
The content to pass to :class:`Client.send_message`
""" """
author = _get_variable('_internal_author') author = _get_variable('_internal_author')
destination = _get_variable('_internal_channel') destination = _get_variable('_internal_channel')
fmt = '{0.mention}, {1}'.format(author, str(content)) fmt = '{0.mention}, {1}'.format(author, str(content))
result = yield from self.send_message(destination, fmt) result = yield from self.send_message(destination, fmt, *args, **kwargs)
return result return result
@asyncio.coroutine @asyncio.coroutine
def upload(self, fp, name=None): def upload(self, *args, **kwargs):
"""|coro| """|coro|
A helper function that is equivalent to doing A helper function that is equivalent to doing
.. code-block:: python .. code-block:: python
self.send_file(message.channel, fp, name) self.send_file(message.channel, *args, **kwargs)
Parameters See Also
---------- ---------
fp :meth:`Client.sned_file`
The first parameter to pass to :meth:`Client.send_file`
name
The second parameter to pass to :meth:`Client.send_file`
""" """
destination = _get_variable('_internal_channel') destination = _get_variable('_internal_channel')
result = yield from self.send_file(destination, fp, name) result = yield from self.send_file(destination, *args, **kwargs)
return result return result
@asyncio.coroutine @asyncio.coroutine