1 files changed, 10 insertions, 2 deletions
diff --git a/ui/src/utils.ts b/ui/src/utils.ts
index 30080fb7..fb326deb 100644
--- a/ui/src/utils.ts
+++ b/ui/src/utils.ts
@@ -12,7 +12,7 @@ import * as markdown_it from 'markdown-it';
 import * as markdownitEmoji from 'markdown-it-emoji/light';
 import * as markdown_it_container from 'markdown-it-container';
 import * as twemoji from 'twemoji';
-import { twemojis } from './twemojis';
+import * as emojiShortName from 'emoji-short-name';
 
 export const repoUrl = 'https://github.com/dessalines/lemmy';
 export const imageUploadUrl = 'https://postimages.org/';
@@ -50,7 +50,7 @@ export const md = new markdown_it({
     }
   }
 }).use(markdownitEmoji, {
-  defs: twemojis
+  defs: objectFlip(emojiShortName)
 });
 
 md.renderer.rules.emoji = function(token, idx) {
@@ -197,6 +197,14 @@ export function getLanguage(): string {
   return (navigator.language || navigator.userLanguage);
 }
 
+export function objectFlip(obj: any) {
+  const ret = {};
+  Object.keys(obj).forEach((key) => {
+    ret[obj[key]] = key;
+  });
+  return ret;
+}
+
 export function getMomentLanguage(): string {
   let lang = getLanguage();
   if (lang.startsWith('zh')) {