diff options
| author | syuilo⭐️ <Syuilotan@yahoo.co.jp> | 2017-03-01 13:26:19 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-01 13:26:19 +0900 |
| commit | 96f75842de217215d6eef6c45eb0666d1c0b81a9 (patch) | |
| tree | 30c490cde18e76d69a39bfce58cc340f955448a5 /src/web/app/common/scripts | |
| parent | Merge pull request #219 from armchair-philosophy/entrance_public-timeline-pro... (diff) | |
| parent | [test] add emoji test (diff) | |
| download | misskey-96f75842de217215d6eef6c45eb0666d1c0b81a9.tar.gz misskey-96f75842de217215d6eef6c45eb0666d1c0b81a9.tar.bz2 misskey-96f75842de217215d6eef6c45eb0666d1c0b81a9.zip | |
Merge pull request #216 from armchair-philosophy/emoji
support emoji
Diffstat (limited to 'src/web/app/common/scripts')
| -rw-r--r-- | src/web/app/common/scripts/text-compiler.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/web/app/common/scripts/text-compiler.js b/src/web/app/common/scripts/text-compiler.js index c9eb73e870..a3c1fe8dde 100644 --- a/src/web/app/common/scripts/text-compiler.js +++ b/src/web/app/common/scripts/text-compiler.js @@ -1,5 +1,6 @@ const riot = require('riot'); const nyaize = require('nyaize').default; +const emojinize = require('emojinize'); const CONFIG = require('./config'); const escape = function(text) { @@ -35,6 +36,8 @@ module.exports = function(tokens, shouldBreak, shouldEscape) { return '<pre><code>' + token.html + '</code></pre>'; case 'inline-code': return '<code>' + token.html + '</code>'; + case 'emoji': + return emojinize.encode(token.content) } }).join(''); |