Rename Author to CurrentAuthor

discord/ext/commands/__init__.py

@@ -18,3 +18,4 @@
 from .converter import *
 from .cooldowns import *
 from .cog import *
+from .default import CustomDefault

discord/ext/commands/core.py

@@ -35,6 +35,7 @@
 from .errors import *
 from .cooldowns import Cooldown, BucketType, CooldownMapping, MaxConcurrency
 from . import converter as converters
+from . import default as defaults
 from ._types import _BaseCommand
 from .cog import Cog
 
@@ -500,12 +501,25 @@ async def do_conversion(self, ctx, converter, argument, param):
     def _get_converter(self, param):
         converter = param.annotation
         if converter is param.empty:
-            if param.default is not param.empty:
-                converter = str if param.default is None else type(param.default)
-            else:
+            if param.default is param.empty or param.default is None or (inspect.isclass(param.default) and issubclass(param.default, defaults.CustomDefault)):
                 converter = str
+            else:
+                converter = type(param.default)
         return converter
 
+    async def _resolve_default(self, ctx, param):
+        try:
+            if inspect.isclass(param.default) and issubclass(param.default, defaults.CustomDefault):
+                instance = param.default()
+                return await instance.default(ctx=ctx, param=param)
+            elif isinstance(param.default, defaults.CustomDefault):
+                return await param.default.default(ctx=ctx, param=param)
+        except CommandError as e:
+            raise e
+        except Exception as e:
+            raise ConversionError(param.default, e) from e
+        return param.default
+
     async def transform(self, ctx, param):
         required = param.default is param.empty
         converter = self._get_converter(param)
@@ -533,7 +547,7 @@ async def transform(self, ctx, param):
                 if self._is_typing_optional(param.annotation):
                     return None
                 raise MissingRequiredArgument(param)
-            return param.default
+            return await self._resolve_default(ctx, param)
 
         previous = view.index
         if consume_rest_is_special:

discord/ext/commands/default.py

@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+
+"""
+The MIT License (MIT)
+
+Copyright (c) 2015-2019 Rapptz
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+"""
+
+from .errors import MissingRequiredArgument
+
+__all__ = (
+    'CustomDefault',
+    'Author',
+    'CurrentChannel',
+    'CurrentGuild',
+    'Call',
+)
+
+class CustomDefaultMeta(type):
+    def __new__(cls, *args, **kwargs):
+        name, bases, attrs = args
+        attrs['display'] = kwargs.pop('display', name)
+        return super().__new__(cls, name, bases, attrs, **kwargs)
+
+    def __repr__(cls):
+        return str(cls)
+
+    def __str__(cls):
+        return cls.display
+
+class CustomDefault(metaclass=CustomDefaultMeta):
+    """The base class of custom defaults that require the :class:`.Context`.
+
+    Classes that derive from this should override the :meth:`~.CustomDefault.default`
+    method to do its conversion logic. This method must be a coroutine.
+    """
+
+    async def default(self, ctx, param):
+        """|coro|
+
+        The method to override to do conversion logic.
+
+        If an error is found while converting, it is recommended to
+        raise a :exc:`.CommandError` derived exception as it will
+        properly propagate to the error handlers.
+
+        Parameters
+        -----------
+        ctx: :class:`.Context`
+            The invocation context that the argument is being used in.
+        """
+        raise NotImplementedError('Derived classes need to implement this.')
+
+
+class CurrentAuthor(CustomDefault):
+    """Default parameter which returns the author for this context."""
+
+    async def default(self, ctx, param):
+        return ctx.author
+
+Author = CurrentAuthor
+
+class CurrentChannel(CustomDefault):
+    """Default parameter which returns the channel for this context."""
+
+    async def default(self, ctx, param):
+        return ctx.channel
+
+class CurrentGuild(CustomDefault):
+    """Default parameter which returns the guild for this context."""
+
+    async def default(self, ctx, param):
+        if ctx.guild:
+            return ctx.guild
+        raise MissingRequiredArgument(param)
+
+class Call(CustomDefault):
+    """Easy wrapper for lambdas/inline defaults."""
+
+    def __init__(self, callback):
+        self._callback = callback
+
+    async def default(self, ctx, param):
+        return self._callback(ctx, param)

docs/ext/commands/api.rst

@@ -270,6 +270,22 @@ Converters
 
     For more information, check :ref:`ext_commands_special_converters`.
 
+.. _ext_commands_api_custom_default:
+
+Default Parameters
+-------------------
+
+.. autoclass:: discord.ext.commands.CustomDefault
+    :members:
+
+.. autoclass:: discord.ext.commands.default.Author
+
+.. autoclass:: discord.ext.commands.default.CurrentChannel
+
+.. autoclass:: discord.ext.commands.default.CurrentGuild
+
+.. autoclass:: discord.ext.commands.default.Call
+
 .. _ext_commands_api_errors:
 
 Exceptions

docs/ext/commands/commands.rst

@@ -586,6 +586,65 @@ handlers that allow us to do just that. First we decorate an error handler funct
 The first parameter of the error handler is the :class:`.Context` while the second one is an exception that is derived from
 :exc:`~ext.commands.CommandError`. A list of errors is found in the :ref:`ext_commands_api_errors` page of the documentation.
 
+
+Custom Defaults
+---------------
+
+Custom defaults allow us to specify :class:`.Context`-based defaults. Custom defaults are always classes which inherit from
+:class:`.CustomDefault`.
+
+The library provides some simple default implementations in ``ext.commands.default`` - :class:`.default.Author`, :class:`.default.CurrentChannel`,
+and :class:`.default.CurrentGuild` returning the corresponding properties from the Context. These can be used along with Converters to
+simplify your individual commands. You can also use :class:`.default.Call` to quickly wrap existing functions.
+
+A DefaultParam returning ``None`` is valid - if this should be an error, raise :class:`.MissingRequiredArgument`.
+
+.. code-block:: python3
+    :emphasize-lines: 14,17,32
+
+    class Image(Converter):
+        """Find images associated with the message."""
+
+        async def convert(self, ctx, argument):
+            if argument.startswith("http://") or argument.startswith("https://"):
+                return argument
+
+            member = await MemberConverter().convert(ctx, argument)
+            if member:
+                return str(member.avatar_url_as(format="png"))
+
+            raise errors.BadArgument(f"{argument} isn't a member or url.")
+
+    class LastImage(CustomDefault):
+        """Default param which finds the last image in chat."""
+
+        async def default(self, ctx, param):
+            for attachment in message.attachments:
+                if attachment.proxy_url:
+                    return attachment.proxy_url
+            async for message in ctx.history(ctx, limit=100):
+                for embed in message.embeds:
+                    if embed.thumbnail and embed.thumbnail.proxy_url:
+                        return embed.thumbnail.proxy_url
+                for attachment in message.attachments:
+                    if attachment.proxy_url:
+                        return attachment.proxy_url
+
+            raise errors.MissingRequiredArgument(param)
+
+    @bot.command()
+    async def echo_image(ctx, *, image: Image = LastImage):
+        async with aiohttp.ClientSession() as sess:
+            async with sess.get(image) as resp:
+                resp.raise_for_status()
+                my_bytes = io.BytesIO(await resp.content.read())
+        await ctx.send(file=discord.File(filename="your_image", fp=my_bytes))
+
+.. tip:: You can change the name of a Custom Default that is displayed in help command by passing ``display`` meta option. Using previous example: ``class LastImage(CustomDefault, display='last image from chat')``
+
+
+
+
 Checks
 -------