IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-16389 - complement for emoji_icon issue (#11650)

Browse Source
This commit is contained in:
krjn
2019-07-18 12:54:01 +00:00
committed by Hanzei
parent 3b9da417a9
commit 4ada8aacd4
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/post_metadata.go
View File

@@ -63,7 +63,6 @@ func (a *App) OverrideIconURLIfEmoji(post *model.Post) {
return
}
emojiName := prop.(string)
delete(post.Props, model.POST_PROPS_OVERRIDE_ICON_EMOJI)
if !*a.Config().ServiceSettings.EnablePostIconOverride || emojiName == "" {
return

4
app/post_metadata_test.go
View File

@@ -267,6 +267,8 @@ func TestPreparePostForClient(t *testing.T) {
s, _ := clientPost.Props[model.POST_PROPS_OVERRIDE_ICON_URL]
assert.EqualValues(t, url, s)
s, _ = clientPost.Props[model.POST_PROPS_OVERRIDE_ICON_EMOJI]
assert.EqualValues(t, emoji, s)
})
t.Run("overrides icon URL", func(t *testing.T) {
@@ -274,6 +276,8 @@ func TestPreparePostForClient(t *testing.T) {
s, _ := clientPost.Props[model.POST_PROPS_OVERRIDE_ICON_URL]
assert.EqualValues(t, overridenUrl, s)
s, _ = clientPost.Props[model.POST_PROPS_OVERRIDE_ICON_EMOJI]
assert.EqualValues(t, emoji, s)
})
})