CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 03:08:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed [p]ban raising an unhandled error if an ID too large is provided (#6486)

Browse Source 
Co-authored-by: Jakub Kuczys <me@jacken.men>
This commit is contained in:
cdaman3141 2024-12-23 20:12:33 -05:00 committed by GitHub
parent f4ffc6bc80
commit 150692538f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
redbot/core/commands/converter.py
View File

@ -51,8 +51,11 @@ __all__ = [
_ = Translator("commands.converter", __file__) _ = Translator("commands.converter", __file__)
ID_REGEX = re.compile(r"([0-9]{15,20})") # You'd think that Discord's documentation showing an example of 2 ** 64 - 1 snowflake would mean that
USER_MENTION_REGEX = re.compile(r"<@!?([0-9]{15,21})>$") # this is going to be accepted by everything in their API but nope... Let's assume 2 ** 63 - 1 as the max instead.
ID_REGEX = re.compile(r"([0-9]{15,19})")
USER_MENTION_REGEX = re.compile(r"<@!?([0-9]{15,19})>$")
_MAX_ID = 2**63 - 1
# Taken with permission from # Taken with permission from
@ -239,8 +242,16 @@ class RawUserIdConverter(dpy_commands.Converter):
# are most likely not in the guild. # are most likely not in the guild.
# Mentions are supported, but most likely won't ever be in cache. # Mentions are supported, but most likely won't ever be in cache.
if match := ID_REGEX.match(argument) or USER_MENTION_REGEX.match(argument): if match := ID_REGEX.fullmatch(argument) or USER_MENTION_REGEX.fullmatch(argument):
return int(match.group(1)) user_id = int(match.group(1))
# Validate user ID range
if user_id > _MAX_ID:
raise BadArgument(
f"The ID '{argument}' is too large to be a valid Discord user ID."
)
return user_id
raise BadArgument(_("'{input}' doesn't look like a valid user ID.").format(input=argument)) raise BadArgument(_("'{input}' doesn't look like a valid user ID.").format(input=argument))