diff options
| author | Corey Hulen <corey@hulen.com> | 2017-02-15 21:06:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 21:06:30 -0500 |
| commit | a7ea2d20cfd91138d25e5afa12eee2a8fbd09ec0 (patch) | |
| tree | c17b8b35cc514ba9d84e84b945a88c99271d2281 /store | |
| parent | e505577abf64e1a879e834619668cebe839eb190 (diff) | |
| download | chat-a7ea2d20cfd91138d25e5afa12eee2a8fbd09ec0.tar.gz chat-a7ea2d20cfd91138d25e5afa12eee2a8fbd09ec0.tar.bz2 chat-a7ea2d20cfd91138d25e5afa12eee2a8fbd09ec0.zip | |
Fixing emoji bug (#5438)
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_emoji_store.go | 2 | ||||
| -rw-r--r-- | store/sql_emoji_store_test.go | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/store/sql_emoji_store.go b/store/sql_emoji_store.go index 5aad725f9..e2bd00e0f 100644 --- a/store/sql_emoji_store.go +++ b/store/sql_emoji_store.go @@ -79,7 +79,7 @@ func (es SqlEmojiStore) Get(id string, allowFromCache bool) StoreChannel { if metrics != nil { metrics.IncrementMemCacheHitCounter("Emoji") } - result.Data = cacheItem.(map[string]*model.Emoji) + result.Data = cacheItem.(*model.Emoji) storeChannel <- result close(storeChannel) return diff --git a/store/sql_emoji_store_test.go b/store/sql_emoji_store_test.go index 3c05257f5..8cd3eac8c 100644 --- a/store/sql_emoji_store_test.go +++ b/store/sql_emoji_store_test.go @@ -84,6 +84,12 @@ func TestEmojiGet(t *testing.T) { t.Fatalf("failed to get emoji with id %v: %v", emoji.Id, result.Err) } } + + for _, emoji := range emojis { + if result := <-store.Emoji().Get(emoji.Id, true); result.Err != nil { + t.Fatalf("failed to get emoji with id %v: %v", emoji.Id, result.Err) + } + } } func TestEmojiGetByName(t *testing.T) { |