Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix application command validation #1372

Merged
merged 2 commits into from
May 24, 2022
Merged

Fix application command validation #1372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee56fc2
Update core.py
baronkobama May 18, 2022
44791bd
Update core.py
amachn May 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions discord/commands/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1642,20 +1642,18 @@ def validate_chat_input_name(name: Any, locale: Optional[str] = None):
# Must meet the regex ^[-_\w\d\u0901-\u097D\u0E00-\u0E7F]{1,32}$
if locale is not None and locale not in valid_locales:
raise ValidationError(
f"Locale '{locale}' is not a valid locale, " f"see {docs}/reference#locales for list of supported locales."
f"Locale '{locale}' is not a valid locale, see {docs}/reference#locales for list of supported locales."
)
error = None
if not isinstance(name, str) or not re.match(r"^[\w-]{1,32}$", name):
if not isinstance(name, str):
error = TypeError(f'Command names and options must be of type str. Received "{name}"')
elif not re.match(r"^[-_\w\d\u0901-\u097D\u0E00-\u0E7F]{1,32}$", name):
error = ValidationError(
r"Command names and options must follow the regex \"^[-_\w\d\u0901-\u097D\u0E00-\u0E7F]{1,32}$\". For more information, see "
f"{docs}/interactions/application-commands#application-command-object-application-command-naming. "
f'Received "{name}"'
r"Command names and options must follow the regex \"^[-_\w\d\u0901-\u097D\u0E00-\u0E7F]{1,32}$\". "
f"For more information, see {docs}/interactions/application-commands#application-command-object-"
f'application-command-naming. Received "{name}"'
)
elif not 1 <= len(name) <= 32:
error = ValidationError(f'Command names and options must be 1-32 characters long. Received "{name}"')
elif name.lower() != name: # Can't use islower() as it fails if none of the chars can be lower. See #512.
elif name.lower() != name: # Can't use islower() as it fails if none of the chars can be lowered. See #512.
error = ValidationError(f'Command names and options must be lowercase. Received "{name}"')

if error:
Expand All @@ -1667,7 +1665,7 @@ def validate_chat_input_name(name: Any, locale: Optional[str] = None):
def validate_chat_input_description(description: Any, locale: Optional[str] = None):
if locale is not None and locale not in valid_locales:
raise ValidationError(
f"Locale '{locale}' is not a valid locale, " f"see {docs}/reference#locales for list of supported locales."
f"Locale '{locale}' is not a valid locale, see {docs}/reference#locales for list of supported locales."
)
error = None
if not isinstance(description, str):
Expand Down