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

Fixed converter upload errors

Browse Source
This commit is contained in:
Gnome 2021-09-02 14:31:19 +01:00
parent fe780a04a2
commit 5eeefb8af6
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ from discord.types.interactions import (
_ApplicationCommandInteractionDataOptionString _ApplicationCommandInteractionDataOptionString
) )
from .core import Command, GroupMixin from .core import GroupMixin
from .converter import Greedy from .converter import Greedy
from .view import StringView, supported_quotes from .view import StringView, supported_quotes
from .context import Context from .context import Context
@ -213,7 +213,11 @@ class BotBase(GroupMixin):
if command.hidden or (command.slash_command is None and not self.slash_commands): if command.hidden or (command.slash_command is None and not self.slash_commands):
continue continue
payload = command.to_application_command() try:
payload = command.to_application_command()
except Exception:
raise errors.ApplicationCommandRegistrationError(command)
if payload is None: if payload is None:
continue continue

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

@ -54,7 +54,7 @@ import discord
from .errors import * from .errors import *
from .cooldowns import Cooldown, BucketType, CooldownMapping, MaxConcurrency, DynamicCooldownMapping from .cooldowns import Cooldown, BucketType, CooldownMapping, MaxConcurrency, DynamicCooldownMapping
from .converter import run_converters, get_converter, Greedy, Option from .converter import CONVERTER_MAPPING, Converter, run_converters, get_converter, Greedy, Option
from ._types import _BaseCommand from ._types import _BaseCommand
from .cog import Cog from .cog import Cog
from .context import Context from .context import Context
@ -112,6 +112,8 @@ ContextT = TypeVar('ContextT', bound='Context')
GroupT = TypeVar('GroupT', bound='Group') GroupT = TypeVar('GroupT', bound='Group')
HookT = TypeVar('HookT', bound='Hook') HookT = TypeVar('HookT', bound='Hook')
ErrorT = TypeVar('ErrorT', bound='Error') ErrorT = TypeVar('ErrorT', bound='Error')
REVERSED_CONVERTER_MAPPING = {v: k for k, v in CONVERTER_MAPPING.items()}
application_option_type_lookup = { application_option_type_lookup = {
str: 3, str: 3,
bool: 5, bool: 5,
@ -1211,11 +1213,19 @@ class Command(_BaseCommand, Generic[CogT, P, T]):
annotation, origin = annotation.__args__[0], None annotation, origin = annotation.__args__[0], None
if origin is None: if origin is None:
generator = (num for t, num in application_option_type_lookup.items() if issubclass(annotation, t)) if not inspect.isclass(annotation):
try: annotation = type(annotation)
option["type"] = next(generator, 3)
except Exception as err: if issubclass(annotation, Converter):
raise ApplicationCommandRegistrationError(self) # If this is a converter, we want to check if it is a native
# one, in which we can get the original type, eg, (MemberConverter -> Member)
annotation = REVERSED_CONVERTER_MAPPING.get(annotation, annotation)
option["type"] = 3
for python_type, discord_type in application_option_type_lookup.items():
if issubclass(annotation, python_type):
option["type"] = discord_type
break
elif origin is Literal and len(origin.__args__) <= 25: # type: ignore elif origin is Literal and len(origin.__args__) <= 25: # type: ignore
option["choices"] = [{ option["choices"] = [{