natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[web::text-compiler] enable compiling emoji with pictograph module (#510)

This commit is contained in:
otofune 2017-05-31 16:19:30 +09:00 committed by GitHub
parent b8e2bd97db
commit eb8076cfbf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -124,6 +124,7 @@
"multer": "1.3.0", "multer": "1.3.0",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"page": "1.7.1", "page": "1.7.1",
"pictograph": "2.0.0",
"prominence": "0.2.0", "prominence": "0.2.0",
"pug": "2.0.0-rc.1", "pug": "2.0.0-rc.1",
"ratelimiter": "3.0.3", "ratelimiter": "3.0.3",

5
src/web/app/common/scripts/text-compiler.js
View File

@ -1,5 +1,5 @@
import * as riot from 'riot'; import * as riot from 'riot';
//const emojinize = require('emojinize'); const pictograph = require('pictograph');
import CONFIG from './config'; import CONFIG from './config';
const escape = text => const escape = text =>
@ -34,8 +34,7 @@ export default (tokens, shouldBreak) => {
case 'inline-code': case 'inline-code':
return `<code>${token.html}</code>`; return `<code>${token.html}</code>`;
case 'emoji': case 'emoji':
return `<i>${token.content}</i>`; return pictograph.dic[token.emoji] || token.content;
//return emojinize.encode(token.content)
} }
}).join(''); }).join('');