Skip to content

Commit

Permalink
Merge pull request #8237 from matheusml/fix-8168
Browse files Browse the repository at this point in the history
[FIX] Removing pipe and commas from custom emojis (#8168)
  • Loading branch information
engelgabriel authored and rodrigok committed Sep 26, 2017
1 parent a51e992 commit e0f8247
Showing 1 changed file with 1 addition and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,10 @@ Meteor.methods({
throw new Meteor.Error('error-the-field-is-required', 'The field Name is required', { method: 'insertOrUpdateEmoji', field: 'Name' });
}

//let nameValidation = new RegExp('^[0-9a-zA-Z-_+;.]+$');
//let aliasValidation = new RegExp('^[0-9a-zA-Z-_+;., ]+$');

//allow all characters except colon, whitespace, comma, >, <, &, ", ', /, \, (, )
//more practical than allowing specific sets of characters; also allows foreign languages
const nameValidation = /[\s,:><&"'\/\\\(\)]/;
const aliasValidation = /[:><&"'\/\\\(\)]/;
const aliasValidation = /[:><&\|"'\/\\\(\)]/;

//silently strip colon; this allows for uploading :emojiname: as emojiname
emojiData.name = emojiData.name.replace(/:/g, '');
Expand Down

0 comments on commit e0f8247

Please sign in to comment.