Merge pull request #8237 from matheusml/fix-8168

[FIX] Removing pipe and commas from custom emojis (#8168)
RocketChat · Sep 23, 2017 · f667dd0 · f667dd0
2 parents 7124dd6 + 24e221e
commit f667dd0
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/packages/rocketchat-emoji-custom/server/methods/insertOrUpdateEmoji.js b/packages/rocketchat-emoji-custom/server/methods/insertOrUpdateEmoji.js
@@ -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, '');