extend tests

Author: 6543

modules/markup/html_test.go

@@ -287,11 +287,15 @@ func TestRender_emoji(t *testing.T) {
 	test(
 		":custom-emoji:",
 		`<p>:custom-emoji:</p>`)
-	setting.UI.CustomEmojis = append(setting.UI.CustomEmojis, "custom-emoji")
+	setting.UI.CustomEmojisMap["custom-emoji"] = ":custom-emoji:"
 	test(
 		":custom-emoji:",
 		`<p><span class="emoji" aria-label="custom-emoji"><img alt=":custom-emoji:" src="`+setting.StaticURLPrefix+`/assets/img/emoji/custom-emoji.png"/></span></p>`)
-
+	test(
+		"a :+1: some🐊 \U0001f44d:custom-emoji: :gitea:",
+		`<p>a <span class="emoji" aria-label="thumbs up">👍</span> some<span class="emoji" aria-label="crocodile">🐊</span> `+
+			`<span class="emoji" aria-label="thumbs up">👍</span><span class="emoji" aria-label="custom-emoji"><img alt=":custom-emoji:" src="`+setting.StaticURLPrefix+`/assets/img/emoji/custom-emoji.png"/></span> `+
+			`<span class="emoji" aria-label="gitea"><img alt=":gitea:" src="`+setting.StaticURLPrefix+`/assets/img/emoji/gitea.png"/></span></p>`)
 	test(
 		"Some text with 😄 in the middle",
 		`<p>Some text with <span class="emoji" aria-label="grinning face with smiling eyes">😄</span> in the middle</p>`)

modules/setting/setting.go

@@ -259,6 +259,7 @@ var (
 		Themes:              []string{`gitea`, `arc-green`},
 		Reactions:           []string{`+1`, `-1`, `laugh`, `hooray`, `confused`, `heart`, `rocket`, `eyes`},
 		CustomEmojis:        []string{`gitea`, `codeberg`},
+		CustomEmojisMap:     map[string]string{"gitea": ":gitea:", "codeberg": ":codeberg:"},
 		Notification: struct {
 			MinTimeout            time.Duration
 			TimeoutStep           time.Duration