Skip to content

[FIX] Able to react with invalid emoji#8667

Merged
rodrigok merged 6 commits intoRocketChat:developfrom
mutdmour:feature/8336
Mar 15, 2018
Merged

[FIX] Able to react with invalid emoji#8667
rodrigok merged 6 commits intoRocketChat:developfrom
mutdmour:feature/8336

Conversation

@mutdmour
Copy link
Copy Markdown
Contributor

[FIX] For bug fixes

@RocketChat/core

Closes #8336

Added verification to check if emoji is regular or custom

@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Oct 26, 2017

CLA assistant check
All committers have signed the CLA.

@mutdmour mutdmour changed the title fixed issue #8336 [Able to react with invalid emoji] [Fix] Able to react with invalid emoji #8336 Oct 27, 2017
Copy link
Copy Markdown
Contributor

@graywolf336 graywolf336 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the submission!

}

if (!RocketChat.emoji.list[reaction] && RocketChat.models.EmojiCustom.findByNameOrAlias(reaction).count() === 0) {
throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setReaction' });
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is an older pull request, do you mind changing this to be error-invalid-emoji and the text be Invalid emoji provided.?

@graywolf336 graywolf336 added this to the 0.62.0 milestone Feb 6, 2018
@rodrigok rodrigok changed the title [Fix] Able to react with invalid emoji #8336 [FIX] Able to react with invalid emoji Feb 17, 2018
Marcos Defendi added 2 commits February 19, 2018 11:48
change to valid emoji to fix broken tests, /chat.react endpoint
fix lint issues, about trailing spaces
@theorenck theorenck modified the milestones: 0.62.0, 0.63.0 Feb 20, 2018
@rodrigok rodrigok merged commit c20f3fd into RocketChat:develop Mar 15, 2018
@rodrigok rodrigok mentioned this pull request Apr 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Able to react with invalid emoji

6 participants