opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[MM-24391] Render icon_emoji names surrounded by colons in incoming webhooks (#15753)

Browse Source
This commit is contained in:
Ed Trist
2020-10-21 14:13:10 +02:00
committed by GitHub
parent 20491c2585
commit 91bb7d3b11
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/post_metadata.go
+2
View File
@@ -81,6 +81,8 @@ func (a *App) OverrideIconURLIfEmoji(post *model.Post) {
return
}
emojiName = strings.ReplaceAll(emojiName, ":", "")
if emojiUrl, err := a.GetEmojiStaticUrl(emojiName); err == nil {
post.AddProp(model.POST_PROPS_OVERRIDE_ICON_URL, emojiUrl)
} else {
app/post_metadata_test.go
+12
View File
@@ -327,6 +327,18 @@ func TestPreparePostForClient(t *testing.T) {
assert.EqualValues(t, emoji, s)
})
t.Run("overrides icon URL with name surrounded by colons", func(t *testing.T) {
colonEmoji := ":basketball:"
clientPost := prepare(true, url, colonEmoji)
s, ok := clientPost.GetProps()[model.POST_PROPS_OVERRIDE_ICON_URL]
assert.True(t, ok)
assert.EqualValues(t, overridenUrl, s)
s, ok = clientPost.GetProps()[model.POST_PROPS_OVERRIDE_ICON_EMOJI]
assert.True(t, ok)
assert.EqualValues(t, colonEmoji, s)
})
})
t.Run("markdown image dimensions", func(t *testing.T) {