From 6094778e697fea8daf1e4d6c4c92dec6e71999a7 Mon Sep 17 00:00:00 2001
From: Fede <gnufede@gmail.com>
Date: Fri, 23 Mar 2018 14:11:43 +0100
Subject: [MM-9777] Avoids adding custom emojis with the same name as a system
 emoji (#8461)

* Emoji validation fails if name exists in system emojis

* Use hashmap instead of array to improve performance

* Changed utils/StringInMap to emoji/isSystemEmoji

* Load system emojis from model/emoji.json

* Added emoji.json from webapp

* Load system emojis from emoji_data.go instead of emoji.json

* Run `gofmt -w model/emoji_data.go`
---
 model/emoji_test.go | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'model/emoji_test.go')

diff --git a/model/emoji_test.go b/model/emoji_test.go
index 1e1c46714..95abe37c6 100644
--- a/model/emoji_test.go
+++ b/model/emoji_test.go
@@ -80,4 +80,9 @@ func TestEmojiIsValid(t *testing.T) {
 	if err := emoji.IsValid(); err == nil {
 		t.Fatal(err)
 	}
+
+	emoji.Name = "croissant"
+	if err := emoji.IsValid(); err == nil {
+		t.Fatal(err)
+	}
 }
-- 
cgit v1.2.3-1-g7c22