Small changes to parseEmoji regex #3407
Merged
Conversation
This file contains hidden or 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
I just made a small change to the parseEmoji regex, this change will make an invalid emoji, like `<aname:id>` return as null, before this change it would return as an animated emoji because the name started with an `a` which would result in false positives, then the `?` I added to the end of `(\d{17,19})?` is used if someone provided an emoji as `:name:` or `a:name:` it will return the correct values but have an invalid id.
2nd Update: I changed the regex to output the results if you provide `<aemoji:123456789012345678>` and <:aemoji:123456789012345678>` which will output `{ animated: false, name: "aemoji", id: "123456789012345678" }` or `<:emojiname:>` which outputs `{ animated: false, name: "emojiname", id: null }` or `<a:emoji:>` which would output `{ animated: true, name: "emoji", id: null }`. Before this PR the method would return that the emoji was animated if you provided something like `<anemojiname:emoji_id>` because the name started with an `a`.
vladfrangu
approved these changes
Jul 28, 2019
kyranet
approved these changes
Jul 28, 2019
SpaceEEC
approved these changes
Aug 17, 2019
samsamson33
pushed a commit
to samsamson33/discord.js
that referenced
this pull request
Feb 27, 2020
…ional (discordjs#3407) * Small changes to parseEmoji regex I just made a small change to the parseEmoji regex, this change will make an invalid emoji, like `<aname:id>` return as null, before this change it would return as an animated emoji because the name started with an `a` which would result in false positives, then the `?` I added to the end of `(\d{17,19})?` is used if someone provided an emoji as `:name:` or `a:name:` it will return the correct values but have an invalid id. * Update Util.js 2nd Update: I changed the regex to output the results if you provide `<aemoji:123456789012345678>` and <:aemoji:123456789012345678>` which will output `{ animated: false, name: "aemoji", id: "123456789012345678" }` or `<:emojiname:>` which outputs `{ animated: false, name: "emojiname", id: null }` or `<a:emoji:>` which would output `{ animated: true, name: "emoji", id: null }`. Before this PR the method would return that the emoji was animated if you provided something like `<anemojiname:emoji_id>` because the name started with an `a`.
samsamson33
added a commit
to samsamson33/discord.js
that referenced
this pull request
Feb 27, 2020
…e id optional (discordjs#3407)" This reverts commit 0d73ba6.
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.
Please describe the changes this PR makes and why it should be merged:
Paragraph on this PR
I changed the regex to output the results if you provide
<aemoji:123456789012345678>and<:aemoji:123456789012345678>which will output{ animated: false, name: "aemoji", id: "123456789012345678" }or<:emojiname:>which outputs{ animated: false, name: "emojiname", id: null }or<a:emoji:>which would output{ animated: true, name: "emoji", id: null }. Before this PR the method would return that the emoji was animated if you provided something like<anemojiname:emoji_id>because the name started with ana.Simplified description of this PR (using examples)
I changed the regex a bit for the
parseEmojifunction to fix a few parsing issues.Parsing results before this PR:
Parsing results after this PR:
Status
Semantic versioning classification: