[MM-24391] Render icon_emoji names surrounded by colons in incoming webhooks (#15753)
Этот коммит содержится в:
@@ -81,6 +81,8 @@ func (a *App) OverrideIconURLIfEmoji(post *model.Post) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
emojiName = strings.ReplaceAll(emojiName, ":", "")
|
||||||
|
|
||||||
if emojiUrl, err := a.GetEmojiStaticUrl(emojiName); err == nil {
|
if emojiUrl, err := a.GetEmojiStaticUrl(emojiName); err == nil {
|
||||||
post.AddProp(model.POST_PROPS_OVERRIDE_ICON_URL, emojiUrl)
|
post.AddProp(model.POST_PROPS_OVERRIDE_ICON_URL, emojiUrl)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -327,6 +327,18 @@ func TestPreparePostForClient(t *testing.T) {
|
|||||||
assert.EqualValues(t, emoji, s)
|
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) {
|
t.Run("markdown image dimensions", func(t *testing.T) {
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user