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

Fix references to snowflakes being max 21 long

Browse Source
This commit is contained in:
Nihaal Sangha 2021-03-03 00:04:03 +00:00 committed by GitHub
parent d01500bccd
commit a3f700c11f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ class Converter:
class IDConverter(Converter): class IDConverter(Converter):
def __init__(self): def __init__(self):
self._id_regex = re.compile(r'([0-9]{15,21})$') self._id_regex = re.compile(r'([0-9]{15,20})$')
super().__init__() super().__init__()
def _get_id_match(self, argument): def _get_id_match(self, argument):
@ -265,11 +265,11 @@ class PartialMessageConverter(Converter):
3. By message URL 3. By message URL
""" """
def _get_id_matches(self, argument): def _get_id_matches(self, argument):
id_regex = re.compile(r'(?:(?P<channel_id>[0-9]{15,21})-)?(?P<message_id>[0-9]{15,21})$') id_regex = re.compile(r'(?:(?P<channel_id>[0-9]{15,20})-)?(?P<message_id>[0-9]{15,20})$')
link_regex = re.compile( link_regex = re.compile(
r'https?://(?:(ptb|canary|www)\.)?discord(?:app)?\.com/channels/' r'https?://(?:(ptb|canary|www)\.)?discord(?:app)?\.com/channels/'
r'(?:[0-9]{15,21}|@me)' r'(?:[0-9]{15,20}|@me)'
r'/(?P<channel_id>[0-9]{15,21})/(?P<message_id>[0-9]{15,21})/?$' r'/(?P<channel_id>[0-9]{15,20})/(?P<message_id>[0-9]{15,20})/?$'
) )
match = id_regex.match(argument) or link_regex.match(argument) match = id_regex.match(argument) or link_regex.match(argument)
if not match: if not match:

2
discord/utils.py
View File

@ -544,4 +544,4 @@ def escape_mentions(text):
:class:`str` :class:`str`
The text with the mentions removed. The text with the mentions removed.
""" """
return re.sub(r'@(everyone|here|[!&]?[0-9]{17,21})', '@\u200b\\1', text) return re.sub(r'@(everyone|here|[!&]?[0-9]{17,20})', '@\u200b\\1', text)

2
discord/webhook.py
View File

@ -687,7 +687,7 @@ class Webhook(Hashable):
A partial webhook is just a webhook object with an ID and a token. A partial webhook is just a webhook object with an ID and a token.
""" """
m = re.search(r'discord(?:app)?.com/api/webhooks/(?P<id>[0-9]{17,21})/(?P<token>[A-Za-z0-9\.\-\_]{60,68})', url) m = re.search(r'discord(?:app)?.com/api/webhooks/(?P<id>[0-9]{17,20})/(?P<token>[A-Za-z0-9\.\-\_]{60,68})', url)
if m is None: if m is None:
raise InvalidArgument('Invalid webhook URL given.') raise InvalidArgument('Invalid webhook URL given.')
data = m.groupdict() data = m.groupdict()