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:
parent
4b8ad3c102
commit
dbbea63227
5 changed files with 83 additions and 6 deletions
43
src/components/views/messages/SenderProfile.js
Normal file
43
src/components/views/messages/SenderProfile.js
Normal file
|
@ -0,0 +1,43 @@
|
|||
/*
|
||||
Copyright 2015, 2016 OpenMarket Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
import React from 'react';
|
||||
import {emojifyText} from '../../../HtmlUtils';
|
||||
|
||||
export default function SenderProfile(props) {
|
||||
const {mxEvent} = props;
|
||||
const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
|
||||
const {msgtype} = mxEvent.getContent();
|
||||
|
||||
if (msgtype === 'm.emote') {
|
||||
return <span />; // emote message must include the name so don't duplicate it
|
||||
}
|
||||
|
||||
return (
|
||||
<span className="mx_SenderProfile"
|
||||
dangerouslySetInnerHTML={emojifyText(`${name || ''} ${props.aux || ''}`)}
|
||||
onClick={props.onClick}>
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
SenderProfile.propTypes = {
|
||||
mxEvent: React.PropTypes.object.isRequired, // event whose sender we're showing
|
||||
aux: React.PropTypes.string, // stuff to go after the sender name, if anything
|
||||
onClick: React.PropTypes.func,
|
||||
};
|
Loading…
Add table
Add a link
Reference in a new issue