Refine the invite code before filtering it #2522
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mbaruh
added
t: bug
ChrisLovering
approved these changes
Apr 8, 2023
CaedenPH
reviewed
Apr 10, 2023
| @@ -18,6 +19,13 @@ | |||
| from bot.exts.filtering.filtering import Filtering | |||
|
|
|||
|
|
|||
| REFINED_INVITE_CODE = re.compile( | |||
| r"(?P<invite>[a-zA-Z0-9/]+)" # The supposedly real invite code. | |||
There was a problem hiding this comment.
Would it be possible to add a comment showing what an example invite code looks like? Difficult to understand what a real invite code looks like
There was a problem hiding this comment.
It's really just a random combination of letters and numbers.
brad90four
approved these changes
Apr 17, 2023
| @@ -18,6 +19,13 @@ | |||
| from bot.exts.filtering.filtering import Filtering | |||
|
|
|||
|
|
|||
| REFINED_INVITE_CODE = re.compile( | |||
| r"(?P<invite>[a-zA-Z0-9/]+)" # The supposedly real invite code. | |||
| r"(?:[^a-zA-Z0-9/].*)?" # Ignoring anything that may come after an invalid character. | |||
There was a problem hiding this comment.
That isn't quite how discord link parsing works.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refines the invite to what it is most likely to be. If the refining process changes the invite code, then that means it originally wasn't a valid invite code. So the refining can find that the invite is actually whitelisted, or maybe it is explictly denied and that there's a specific action that needs to be taken.
For exmaple, for
discord.gg/python.it will ignore the dot at the end.Forward slashes (after discord.gg/) are included in the invite code because it can confuse Discord, so the behavior of blocking these invites stays unchanged for now.