WIP

go-gitea · Jun 1, 2021 · 3c82f01 · 3c82f01
1 parent 6f991de
commit 3c82f01
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
   }