From 6f991de19fabb2323f028bc7775f8b8cd94a341f Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 27 May 2021 23:33:23 +0200
Subject: [PATCH 01/13] add "codeberg" emoji

---
 modules/markup/html.go        |   2 +-
 public/img/emoji/codeberg.png | Bin 0 -> 8317 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 public/img/emoji/codeberg.png

diff --git a/modules/markup/html.go b/modules/markup/html.go
index 4d1b49e24155..20d73281c2ed 100644
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -916,7 +916,7 @@ func emojiShortCodeProcessor(ctx *RenderContext, node *html.Node) {
 	converted := emoji.FromAlias(alias)
 	if converted == nil {
 		// check if this is a custom reaction
-		s := strings.Join(setting.UI.Reactions, " ") + "gitea"
+		s := strings.Join(setting.UI.Reactions, " ") + "gitea" + "codeberg"
 		if strings.Contains(s, alias) {
 			replaceContent(node, m[0], m[1], createCustomEmoji(alias, "emoji"))
 			return
diff --git a/public/img/emoji/codeberg.png b/public/img/emoji/codeberg.png
new file mode 100644
index 0000000000000000000000000000000000000000..b91613833a2ffafc514facb6beac699ee8973b89
GIT binary patch
literal 8317
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

literal 0
HcmV?d00001


From 3c82f01c8b5e4a4b1808e06c15155bd121a28f48 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 1 Jun 2021 23:14:21 +0200
Subject: [PATCH 02/13] WIP

---
 modules/markup/html.go              | 5 ++---
 modules/markup/html_test.go         | 7 +++++++
 modules/setting/setting.go          | 4 +++-
 modules/structs/settings.go         | 1 +
 routers/api/v1/settings/settings.go | 1 +
 web_src/js/features/emoji.js        | 8 +++++---
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/modules/markup/html.go b/modules/markup/html.go
index 20d73281c2ed..6f451d682943 100644
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -66,7 +66,7 @@ var (
 	blackfridayExtRegex = regexp.MustCompile(`[^:]*:user-content-`)
 
 	// EmojiShortCodeRegex find emoji by alias like :smile:
-	EmojiShortCodeRegex = regexp.MustCompile(`\:[\w\+\-]+\:{1}`)
+	EmojiShortCodeRegex = regexp.MustCompile(`\:[\w\+\-]+\:`)
 )
 
 // CSS class for action keywords (e.g. "closes: #1")
@@ -916,8 +916,7 @@ func emojiShortCodeProcessor(ctx *RenderContext, node *html.Node) {
 	converted := emoji.FromAlias(alias)
 	if converted == nil {
 		// check if this is a custom reaction
-		s := strings.Join(setting.UI.Reactions, " ") + "gitea" + "codeberg"
-		if strings.Contains(s, alias) {
+		if util.ExistsInSlice(alias, setting.UI.CustomEmojis) {
 			replaceContent(node, m[0], m[1], createCustomEmoji(alias, "emoji"))
 			return
 		}
diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go
index fa8c848601fe..0e77975f88fe 100644
--- a/modules/markup/html_test.go
+++ b/modules/markup/html_test.go
@@ -284,6 +284,13 @@ func TestRender_emoji(t *testing.T) {
 	test(
 		":gitea:",
 		`<p><span class="emoji" aria-label="gitea"><img alt=":gitea:" src="`+setting.StaticURLPrefix+`/assets/img/emoji/gitea.png"/></span></p>`)
+	test(
+		":custom-emoji:",
+		`<p>:custom-emoji:</p>`)
+	setting.UI.CustomEmojis = append(setting.UI.CustomEmojis, "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(
 		"Some text with 😄 in the middle",
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index c16520572d35..e4e0fa7b2d16 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -198,7 +198,8 @@ var (
 		DefaultTheme          string
 		Themes                []string
 		Reactions             []string
-		ReactionsMap          map[string]bool
+		ReactionsMap          map[string]bool `ini:"-"`
+		CustomEmojis          []string
 		SearchRepoDescription bool
 		UseServiceWorker      bool
 
@@ -246,6 +247,7 @@ var (
 		DefaultTheme:        `gitea`,
 		Themes:              []string{`gitea`, `arc-green`},
 		Reactions:           []string{`+1`, `-1`, `laugh`, `hooray`, `confused`, `heart`, `rocket`, `eyes`},
+		CustomEmojis:        []string{`gitea`, `codeberg`},
 		Notification: struct {
 			MinTimeout            time.Duration
 			TimeoutStep           time.Duration
diff --git a/modules/structs/settings.go b/modules/structs/settings.go
index 842b12792d1d..90c4a2107bbd 100644
--- a/modules/structs/settings.go
+++ b/modules/structs/settings.go
@@ -18,6 +18,7 @@ type GeneralRepoSettings struct {
 type GeneralUISettings struct {
 	DefaultTheme     string   `json:"default_theme"`
 	AllowedReactions []string `json:"allowed_reactions"`
+	CustomEmojis     []string `json:"custom_emojis"`
 }
 
 // GeneralAPISettings contains global api settings exposed by it
diff --git a/routers/api/v1/settings/settings.go b/routers/api/v1/settings/settings.go
index e6417e40748c..ca2d28fb8bf2 100644
--- a/routers/api/v1/settings/settings.go
+++ b/routers/api/v1/settings/settings.go
@@ -25,6 +25,7 @@ func GetGeneralUISettings(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, api.GeneralUISettings{
 		DefaultTheme:     setting.UI.DefaultTheme,
 		AllowedReactions: setting.UI.Reactions,
+		CustomEmojis:     setting.UI.CustomEmojis,
 	})
 }
 
diff --git a/web_src/js/features/emoji.js b/web_src/js/features/emoji.js
index 7a522b95fc63..ecd751e4ef8b 100644
--- a/web_src/js/features/emoji.js
+++ b/web_src/js/features/emoji.js
@@ -2,7 +2,8 @@ import emojis from '../../../assets/emoji.json';
 
 const {AssetUrlPrefix} = window.config;
 
-const tempMap = {gitea: ':gitea:'};
+// TODO: use setting.UI.CustomEmojis
+const tempMap = {gitea: ':gitea:', codeberg: ':codeberg:'};
 for (const {emoji, aliases} of emojis) {
   for (const alias of aliases || []) {
     tempMap[alias] = emoji;
@@ -23,8 +24,9 @@ for (const key of emojiKeys) {
 // retrieve HTML for given emoji name
 export function emojiHTML(name) {
   let inner;
-  if (name === 'gitea') {
-    inner = `<img alt=":${name}:" src="${AssetUrlPrefix}/img/emoji/gitea.png">`;
+  // TODO: use setting.UI.CustomEmojis
+  if (name === 'gitea' || name === 'codeberg') {
+    inner = `<img alt=":${name}:" src="${AssetUrlPrefix}/img/emoji/${name}.png">`;
   } else {
     inner = emojiString(name);
   }

From 866339435b78ac65f1e5852c45d1c3f201c6d4bd Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 29 Jun 2021 02:39:39 +0200
Subject: [PATCH 03/13] do UI part

---
 modules/templates/helper.go  | 7 +++++++
 templates/base/head.tmpl     | 1 +
 web_src/js/features/emoji.js | 7 +++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index 83359a6ef234..0e1406c10074 100644
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -90,6 +90,13 @@ func NewFuncMap() []template.FuncMap {
 		"AllowedReactions": func() []string {
 			return setting.UI.Reactions
 		},
+		"CustomEmojis": func() map[string]string {
+			result := make(map[string]string)
+			for _, emoji := range setting.UI.CustomEmojis {
+				result[emoji] = fmt.Sprintf(":%s:", emoji)
+			}
+			return result
+		},
 		"Safe":          Safe,
 		"SafeJS":        SafeJS,
 		"JSEscape":      JSEscape,
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 10fc2bad4a02..5091eda1e996 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -30,6 +30,7 @@
 			AppVer: '{{AppVer}}',
 			AppSubUrl: '{{AppSubUrl}}',
 			AssetUrlPrefix: '{{AssetUrlPrefix}}',
+			CustomEmojis: {{CustomEmojis}},
 			UseServiceWorker: {{UseServiceWorker}},
 			csrf: '{{.CsrfToken}}',
 			HighlightJS: {{if .RequireHighlightJS}}true{{else}}false{{end}},
diff --git a/web_src/js/features/emoji.js b/web_src/js/features/emoji.js
index ecd751e4ef8b..254a0b5c4d92 100644
--- a/web_src/js/features/emoji.js
+++ b/web_src/js/features/emoji.js
@@ -1,9 +1,9 @@
 import emojis from '../../../assets/emoji.json';
 
 const {AssetUrlPrefix} = window.config;
+const {CustomEmojis} = window.config;
 
-// TODO: use setting.UI.CustomEmojis
-const tempMap = {gitea: ':gitea:', codeberg: ':codeberg:'};
+const tempMap = {...CustomEmojis};
 for (const {emoji, aliases} of emojis) {
   for (const alias of aliases || []) {
     tempMap[alias] = emoji;
@@ -24,8 +24,7 @@ for (const key of emojiKeys) {
 // retrieve HTML for given emoji name
 export function emojiHTML(name) {
   let inner;
-  // TODO: use setting.UI.CustomEmojis
-  if (name === 'gitea' || name === 'codeberg') {
+  if (Object.prototype.hasOwnProperty.call(CustomEmojis, name)) {
     inner = `<img alt=":${name}:" src="${AssetUrlPrefix}/img/emoji/${name}.png">`;
   } else {
     inner = emojiString(name);

From 3951cf2fa08ecfb29dbc71c82ebb8565d776ebe2 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 29 Jun 2021 02:56:41 +0200
Subject: [PATCH 04/13] calc CustomEmojisMap once

---
 modules/markup/html.go      | 2 +-
 modules/setting/setting.go  | 5 +++++
 modules/templates/helper.go | 6 +-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/markup/html.go b/modules/markup/html.go
index d94416860b27..604ebe5ebe14 100644
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -948,7 +948,7 @@ func emojiShortCodeProcessor(ctx *RenderContext, node *html.Node) {
 		converted := emoji.FromAlias(alias)
 		if converted == nil {
 			// check if this is a custom reaction
-			if util.ExistsInSlice(alias, setting.UI.CustomEmojis) {
+			if _, exist := setting.UI.CustomEmojisMap[alias]; exist {
 				replaceContent(node, m[0], m[1], createCustomEmoji(alias, "emoji"))
 				node = node.NextSibling.NextSibling
 				start = 0
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index c15713aee715..2a38d9fa8ebc 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -210,6 +210,7 @@ var (
 		Reactions             []string
 		ReactionsMap          map[string]bool `ini:"-"`
 		CustomEmojis          []string
+		CustomEmojisMap       map[string]string `ini:"-"`
 		SearchRepoDescription bool
 		UseServiceWorker      bool
 
@@ -985,6 +986,10 @@ func NewContext() {
 	for _, reaction := range UI.Reactions {
 		UI.ReactionsMap[reaction] = true
 	}
+	UI.CustomEmojisMap = make(map[string]string)
+	for _, emoji := range UI.CustomEmojis {
+		UI.CustomEmojisMap[emoji] = fmt.Sprintf(":%s:", emoji)
+	}
 }
 
 func parseAuthorizedPrincipalsAllow(values []string) ([]string, bool) {
diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index 0e1406c10074..f9b2dafd22a1 100644
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -91,11 +91,7 @@ func NewFuncMap() []template.FuncMap {
 			return setting.UI.Reactions
 		},
 		"CustomEmojis": func() map[string]string {
-			result := make(map[string]string)
-			for _, emoji := range setting.UI.CustomEmojis {
-				result[emoji] = fmt.Sprintf(":%s:", emoji)
-			}
-			return result
+			return setting.UI.CustomEmojisMap
 		},
 		"Safe":          Safe,
 		"SafeJS":        SafeJS,

From c51fcd0777fbf035d5fbf8b595fb4f187642b631 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 29 Jun 2021 02:57:06 +0200
Subject: [PATCH 05/13] refactor createCustomEmoji

---
 modules/markup/html.go | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/modules/markup/html.go b/modules/markup/html.go
index 604ebe5ebe14..5d77234947a2 100644
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -460,17 +460,14 @@ func createEmoji(content, class, name string) *html.Node {
 	return span
 }
 
-func createCustomEmoji(alias, class string) *html.Node {
-
+func createCustomEmoji(alias string) *html.Node {
 	span := &html.Node{
 		Type: html.ElementNode,
 		Data: atom.Span.String(),
 		Attr: []html.Attribute{},
 	}
-	if class != "" {
-		span.Attr = append(span.Attr, html.Attribute{Key: "class", Val: class})
-		span.Attr = append(span.Attr, html.Attribute{Key: "aria-label", Val: alias})
-	}
+	span.Attr = append(span.Attr, html.Attribute{Key: "class", Val: "emoji"})
+	span.Attr = append(span.Attr, html.Attribute{Key: "aria-label", Val: alias})
 
 	img := &html.Node{
 		Type:     html.ElementNode,
@@ -478,10 +475,8 @@ func createCustomEmoji(alias, class string) *html.Node {
 		Data:     "img",
 		Attr:     []html.Attribute{},
 	}
-	if class != "" {
-		img.Attr = append(img.Attr, html.Attribute{Key: "alt", Val: fmt.Sprintf(`:%s:`, alias)})
-		img.Attr = append(img.Attr, html.Attribute{Key: "src", Val: fmt.Sprintf(`%s/assets/img/emoji/%s.png`, setting.StaticURLPrefix, alias)})
-	}
+	img.Attr = append(img.Attr, html.Attribute{Key: "alt", Val: fmt.Sprintf(`:%s:`, alias)})
+	img.Attr = append(img.Attr, html.Attribute{Key: "src", Val: fmt.Sprintf(`%s/assets/img/emoji/%s.png`, setting.StaticURLPrefix, alias)})
 
 	span.AppendChild(img)
 	return span
@@ -949,7 +944,7 @@ func emojiShortCodeProcessor(ctx *RenderContext, node *html.Node) {
 		if converted == nil {
 			// check if this is a custom reaction
 			if _, exist := setting.UI.CustomEmojisMap[alias]; exist {
-				replaceContent(node, m[0], m[1], createCustomEmoji(alias, "emoji"))
+				replaceContent(node, m[0], m[1], createCustomEmoji(alias))
 				node = node.NextSibling.NextSibling
 				start = 0
 				continue

From 9769c8fa37e3f482d78b7ddca8bceb60a174897d Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 29 Jun 2021 03:30:28 +0200
Subject: [PATCH 06/13] extend tests

---
 modules/markup/html_test.go | 8 ++++++--
 modules/setting/setting.go  | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go
index 157c86f72857..3353cda724e3 100644
--- a/modules/markup/html_test.go
+++ b/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>`)
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 2a38d9fa8ebc..3eac8c32b06e 100644
--- a/modules/setting/setting.go
+++ b/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

From b11a4aa5bcab5c3fe8e13c074024baba049e4e9f Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 29 Jun 2021 03:32:54 +0200
Subject: [PATCH 07/13] update swagger docs

---
 templates/swagger/v1_json.tmpl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 7f7907b3b0c6..40dddb06a078 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -14481,6 +14481,13 @@
           },
           "x-go-name": "AllowedReactions"
         },
+        "custom_emojis": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "x-go-name": "CustomEmojis"
+        },
         "default_theme": {
           "type": "string",
           "x-go-name": "DefaultTheme"

From 4e2c217f136a4f70519280a5880a0997c3c0255c Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 29 Jun 2021 03:40:22 +0200
Subject: [PATCH 08/13] add test case for #16060

---
 modules/markup/html_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go
index 3353cda724e3..85418892ef7f 100644
--- a/modules/markup/html_test.go
+++ b/modules/markup/html_test.go
@@ -292,8 +292,8 @@ func TestRender_emoji(t *testing.T) {
 		":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> `+
+		"这是字符:1::+1: some🐊 \U0001f44d:custom-emoji: :gitea:",
+		`<p>这是字符:1:<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(

From 04edd2d235226e9153b657b1c9c4f5eabe44857e Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 29 Jun 2021 11:43:36 +0200
Subject: [PATCH 09/13] =?UTF-8?q?remove=20codeberg=20=F0=9F=98=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/setting/setting.go    |   4 ++--
 public/img/emoji/codeberg.png | Bin 8317 -> 0 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 public/img/emoji/codeberg.png

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 3eac8c32b06e..405d28654fe8 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -258,8 +258,8 @@ var (
 		DefaultTheme:        `gitea`,
 		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:"},
+		CustomEmojis:        []string{`gitea`},
+		CustomEmojisMap:     map[string]string{"gitea": ":gitea:"},
 		Notification: struct {
 			MinTimeout            time.Duration
 			TimeoutStep           time.Duration
diff --git a/public/img/emoji/codeberg.png b/public/img/emoji/codeberg.png
deleted file mode 100644
index b91613833a2ffafc514facb6beac699ee8973b89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8317
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


From ca7577f6c902d1f38f53dda4edf9a112079c2807 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 29 Jun 2021 11:50:29 +0200
Subject: [PATCH 10/13] use "+" instead "of fmt.Sprintf()"

---
 modules/markup/html.go     | 5 ++---
 modules/setting/setting.go | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/markup/html.go b/modules/markup/html.go
index 5d77234947a2..3e9d22438a6f 100644
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -6,7 +6,6 @@ package markup
 
 import (
 	"bytes"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"net/url"
@@ -475,8 +474,8 @@ func createCustomEmoji(alias string) *html.Node {
 		Data:     "img",
 		Attr:     []html.Attribute{},
 	}
-	img.Attr = append(img.Attr, html.Attribute{Key: "alt", Val: fmt.Sprintf(`:%s:`, alias)})
-	img.Attr = append(img.Attr, html.Attribute{Key: "src", Val: fmt.Sprintf(`%s/assets/img/emoji/%s.png`, setting.StaticURLPrefix, alias)})
+	img.Attr = append(img.Attr, html.Attribute{Key: "alt", Val: ":" + alias + ":"})
+	img.Attr = append(img.Attr, html.Attribute{Key: "src", Val: setting.StaticURLPrefix + "/assets/img/emoji/" + alias + ".png"})
 
 	span.AppendChild(img)
 	return span
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 405d28654fe8..e37b78834202 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -989,7 +989,7 @@ func NewContext() {
 	}
 	UI.CustomEmojisMap = make(map[string]string)
 	for _, emoji := range UI.CustomEmojis {
-		UI.CustomEmojisMap[emoji] = fmt.Sprintf(":%s:", emoji)
+		UI.CustomEmojisMap[emoji] = ":" + emoji + ":"
 	}
 }
 

From c291d2352431f82081e6c435d610389bda4676a1 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 29 Jun 2021 12:05:22 +0200
Subject: [PATCH 11/13] add docs

---
 custom/conf/app.example.ini                           | 11 ++++++++---
 docs/content/doc/advanced/config-cheat-sheet.en-us.md |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 33ff7a62c56b..e3c2b4d30ce3 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -1029,11 +1029,16 @@ PATH =
 ;; All available themes. Allow users select personalized themes regardless of the value of `DEFAULT_THEME`.
 ;THEMES = gitea,arc-green
 ;;
-;;All available reactions users can choose on issues/prs and comments.
-;;Values can be emoji alias (:smile:) or a unicode emoji.
-;;For custom reactions, add a tightly cropped square image to public/emoji/img/reaction_name.png
+;; All available reactions users can choose on issues/prs and comments.
+;; Values can be emoji alias (:smile:) or a unicode emoji.
+;; For custom reactions, add a tightly cropped square image to public/emoji/img/reaction_name.png
 ;REACTIONS = +1, -1, laugh, hooray, confused, heart, rocket, eyes
 ;;
+;; Additional Emojis, who are not defined in the utf8 standart
+;; By default we support gitea (:gitea:), to add more copy them to public/emoji/img/emoji_name.png and add it to this config.
+;; Dont mistake it for Reactions.
+;CUSTOM_EMOJIS = gitea
+;;
 ;; Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
 ;DEFAULT_SHOW_FULL_NAME = false
 ;;
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
index d1d47bc89301..5f305ac007ce 100644
--- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md
+++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
@@ -181,6 +181,9 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 - `REACTIONS`: All available reactions users can choose on issues/prs and comments
     Values can be emoji alias (:smile:) or a unicode emoji.
     For custom reactions, add a tightly cropped square image to public/emoji/img/reaction_name.png
+- `CUSTOM_EMOJIS`: **gitea**: Additional Emojis, who are not defined in the utf8 standart.
+    By default we support gitea (:gitea:), to add more copy them to public/emoji/img/emoji_name.png and
+    add it to this config. Dont mistake it for Reactions.
 - `DEFAULT_SHOW_FULL_NAME`: **false**: Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
 - `SEARCH_REPO_DESCRIPTION`: **true**: Whether to search within description at repository search on explore page.
 - `USE_SERVICE_WORKER`: **true**: Whether to enable a Service Worker to cache frontend assets.

From cb774d5450012c9d49d9b66a2aacf40c1dfe806b Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 29 Jun 2021 12:26:09 +0200
Subject: [PATCH 12/13] Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>
---
 custom/conf/app.example.ini                           | 2 +-
 docs/content/doc/advanced/config-cheat-sheet.en-us.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index e3c2b4d30ce3..7cae16cd79ab 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -1034,7 +1034,7 @@ PATH =
 ;; For custom reactions, add a tightly cropped square image to public/emoji/img/reaction_name.png
 ;REACTIONS = +1, -1, laugh, hooray, confused, heart, rocket, eyes
 ;;
-;; Additional Emojis, who are not defined in the utf8 standart
+;; Additional Emojis not defined in the utf8 standard
 ;; By default we support gitea (:gitea:), to add more copy them to public/emoji/img/emoji_name.png and add it to this config.
 ;; Dont mistake it for Reactions.
 ;CUSTOM_EMOJIS = gitea
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
index 5f305ac007ce..dc3b36cb4fc1 100644
--- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md
+++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
@@ -181,9 +181,9 @@ The following configuration set `Content-Type: application/vnd.android.package-a
 - `REACTIONS`: All available reactions users can choose on issues/prs and comments
     Values can be emoji alias (:smile:) or a unicode emoji.
     For custom reactions, add a tightly cropped square image to public/emoji/img/reaction_name.png
-- `CUSTOM_EMOJIS`: **gitea**: Additional Emojis, who are not defined in the utf8 standart.
+- `CUSTOM_EMOJIS`: **gitea**: Additional Emojis not defined in the utf8 standard.
     By default we support gitea (:gitea:), to add more copy them to public/emoji/img/emoji_name.png and
-    add it to this config. Dont mistake it for Reactions.
+    add it to this config.
 - `DEFAULT_SHOW_FULL_NAME`: **false**: Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
 - `SEARCH_REPO_DESCRIPTION`: **true**: Whether to search within description at repository search on explore page.
 - `USE_SERVICE_WORKER`: **true**: Whether to enable a Service Worker to cache frontend assets.

From 38dd164069151101a1cc4124ba4e7e30e3be3046 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 29 Jun 2021 15:32:35 +0200
Subject: [PATCH 13/13] dont need to escape ":" in regex

---
 modules/markup/html.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/markup/html.go b/modules/markup/html.go
index 3e9d22438a6f..1e55629ab5dd 100644
--- a/modules/markup/html.go
+++ b/modules/markup/html.go
@@ -65,7 +65,7 @@ var (
 	blackfridayExtRegex = regexp.MustCompile(`[^:]*:user-content-`)
 
 	// EmojiShortCodeRegex find emoji by alias like :smile:
-	EmojiShortCodeRegex = regexp.MustCompile(`\:[\w\+\-]+\:`)
+	EmojiShortCodeRegex = regexp.MustCompile(`:[\w\+\-]+:`)
 )
 
 // CSS class for action keywords (e.g. "closes: #1")