From c35ff4cfc637907ad797617df485f964ff26c301 Mon Sep 17 00:00:00 2001 From: Rapptz Date: Tue, 20 Sep 2022 23:53:48 -0400 Subject: [PATCH] [commands] Allow Greedy to potentially maintain state between calls --- discord/ext/commands/converter.py | 11 +++++++++++ discord/ext/commands/core.py | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/discord/ext/commands/converter.py b/discord/ext/commands/converter.py index c0303e179..f58f8c777 100644 --- a/discord/ext/commands/converter.py +++ b/discord/ext/commands/converter.py @@ -1039,6 +1039,17 @@ class Greedy(List[T]): return cls(converter=converter) + @property + def constructed_converter(self) -> Any: + # Only construct a converter once in order to maintain state between convert calls + if ( + inspect.isclass(self.converter) + and issubclass(self.converter, Converter) + and not inspect.ismethod(self.converter.convert) + ): + return self.converter() + return self.converter + if TYPE_CHECKING: from typing_extensions import Annotated as Range diff --git a/discord/ext/commands/core.py b/discord/ext/commands/core.py index 26ea15eaf..4fc6792ea 100644 --- a/discord/ext/commands/core.py +++ b/discord/ext/commands/core.py @@ -657,14 +657,14 @@ class Command(_BaseCommand, Generic[CogT, P, T]): return list(attachments) if param.kind in (param.POSITIONAL_OR_KEYWORD, param.POSITIONAL_ONLY): - return await self._transform_greedy_pos(ctx, param, param.required, converter.converter) + return await self._transform_greedy_pos(ctx, param, param.required, converter.constructed_converter) elif param.kind == param.VAR_POSITIONAL: - return await self._transform_greedy_var_pos(ctx, param, converter.converter) + return await self._transform_greedy_var_pos(ctx, param, converter.constructed_converter) else: # if we're here, then it's a KEYWORD_ONLY param type # since this is mostly useless, we'll helpfully transform Greedy[X] # into just X and do the parsing that way. - converter = converter.converter + converter = converter.constructed_converter # Try to detect Optional[discord.Attachment] or discord.Attachment special converter if converter is discord.Attachment: