diff options
| author | Fede <gnufede@gmail.com> | 2018-03-23 14:11:43 +0100 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2018-03-23 09:11:43 -0400 |
| commit | 6094778e697fea8daf1e4d6c4c92dec6e71999a7 (patch) | |
| tree | e5bc923fa5ed5164fef9d0e2f1fe2e0af6ff1574 /model/emoji_test.go | |
| parent | 87762ae62eb887dfb3fd0957040919aede46f7d4 (diff) | |
| download | chat-6094778e697fea8daf1e4d6c4c92dec6e71999a7.tar.gz chat-6094778e697fea8daf1e4d6c4c92dec6e71999a7.tar.bz2 chat-6094778e697fea8daf1e4d6c4c92dec6e71999a7.zip | |
[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`
Diffstat (limited to 'model/emoji_test.go')
| -rw-r--r-- | model/emoji_test.go | 5 |
1 files changed, 5 insertions, 0 deletions
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) + } } |