Adding emoji support

- Fixes #163 - Bad because it doubles the size of the codebase, and it breaks hot module reloading. Decide later on merge.
LemmyNet · Jun 1, 2019 · 52ffd96 · 52ffd96
1 parent 5161ff4
commit 52ffd96
Show file tree

Hide file tree

Showing 5 changed files with 182 additions and 170 deletions.
diff --git a/ui/assets/libs/markdown-it-emoji/markdown-it-emoji.min.js b/ui/assets/libs/markdown-it-emoji/markdown-it-emoji.min.js
diff --git a/ui/package.json b/ui/package.json
@@ -29,6 +29,7 @@
     "jwt-decode": "^2.2.0",
     "markdown-it": "^8.4.2",
     "markdown-it-container": "^2.0.0",
+    "markdown-it-emoji": "^1.4.0",
     "moment": "^2.24.0",
     "rxjs": "^6.4.0",
     "terser": "^3.17.0"

diff --git a/ui/src/index.html b/ui/src/index.html
@@ -7,8 +7,9 @@
 	<link rel="shortcut icon" type="image/svg+xml" href="/static/assets/favicon.svg" />
 	<link rel="apple-touch-icon" href="/static/assets/apple-touch-icon.png" />
 	<title>Lemmy</title>
-	<link rel="stylesheet" href="/static/assets/libs/balloon-css/balloon.min.css">
-  <script src="/static/assets/libs/sortable/sortable.min.js"></script>
+	<link rel="stylesheet" href="/static/assets/libs/balloon-css/balloon.min.css" type="text/css">
+    <script src="/static/assets/libs/sortable/sortable.min.js" type="text/javascript"></script>
+    <script src="/static/assets/libs/markdown-it-emoji/markdown-it-emoji.min.js" type="text/javascript"></script>
 </head>
 
 <body>

diff --git a/ui/src/utils.ts b/ui/src/utils.ts
@@ -1,5 +1,6 @@
 import { UserOperation, Comment, User, SortType, ListingType } from './interfaces';
 import * as markdown_it from 'markdown-it';
+declare var markdownitEmoji: any;
 import * as markdown_it_container from 'markdown-it-container';
 
 export let repoUrl = 'https://github.com/dessalines/lemmy';
@@ -30,7 +31,7 @@ var md = new markdown_it({
       return '</details>\n';
     }
   }
-});
+}).use(markdownitEmoji);
 
 export function hotRank(comment: Comment): number {
   // Rank = ScaleFactor * sign(Score) * log(1 + abs(Score)) / (Time + 2)^Gravity