1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-06-26 04:01:04 +03:00

Various fixes and improvements to emojification.

- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Add emoji shortcodes as titles
This commit is contained in:
Aviral Dasgupta
2016-08-09 21:40:05 +05:30
parent 4b8ad3c102
commit dbbea63227
5 changed files with 83 additions and 6 deletions

View File

@ -23,6 +23,7 @@ var linkify = require('linkifyjs');
var linkifyElement = require('linkifyjs/element');
var linkifyMatrix = require('../../../linkify-matrix');
var sdk = require('../../../index');
import {emojifyText} from '../../../HtmlUtils';
linkifyMatrix(linkify);
@ -200,10 +201,11 @@ module.exports = React.createClass({
switch (content.msgtype) {
case "m.emote":
var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
const nameHtml = emojifyText(name);
return (
<span ref="content" className="mx_MEmoteBody mx_EventTile_content">
* { name } { body }
* <span dangerouslySetInnerHTML={nameHtml} /> { body }
{ widgets }
</span>
);