1 files changed, 4 insertions, 3 deletions
diff --git a/web_src/js/features/emoji.js b/web_src/js/features/emoji.js
index 7a522b95fc..254a0b5c4d 100644
--- a/web_src/js/features/emoji.js
+++ b/web_src/js/features/emoji.js
@@ -1,8 +1,9 @@
 import emojis from '../../../assets/emoji.json';
 
 const {AssetUrlPrefix} = window.config;
+const {CustomEmojis} = window.config;
 
-const tempMap = {gitea: ':gitea:'};
+const tempMap = {...CustomEmojis};
 for (const {emoji, aliases} of emojis) {
   for (const alias of aliases || []) {
     tempMap[alias] = emoji;
@@ -23,8 +24,8 @@ 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">`;
+  if (Object.prototype.hasOwnProperty.call(CustomEmojis, name)) {
+    inner = `<img alt=":${name}:" src="${AssetUrlPrefix}/img/emoji/${name}.png">`;
   } else {
     inner = emojiString(name);
   }