mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 03:36:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

support emotes in edit history

Browse source
This commit is contained in:
Bruno Windels 2019-06-25 10:18:27 +02:00
parent beb003b2d6
commit 0fe28cba43
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/components/views/elements/EditHistoryMessage.js
View file

@ -40,12 +40,23 @@ export default class EditHistoryMessage extends React.Component {
}
render() {
const event = this.props.mxEvent;
const timestamp = formatTime(new Date(event.getTs()), this.props.isTwelveHour);
const content = event.event.content["m.new_content"] || event.event.content;
const {mxEvent} = this.props;
const content = mxEvent.event.content["m.new_content"] || mxEvent.event.content;
const contentElements = HtmlUtils.bodyToHtml(content);
let contentContainer;
if (mxEvent.getContent().msgtype === "m.emote") {
const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
contentContainer = (<p ref="content">*&nbsp;
<span className="mx_MEmoteBody_sender">{ name }</span>
&nbsp;{contentElements}
</p>);
} else {
contentContainer = (<p ref="content">{contentElements}</p>);
}
const timestamp = formatTime(new Date(mxEvent.getTs()), this.props.isTwelveHour);
return <li className="edit mx_EventTile_content">
<span className="mx_MessageTimestamp">{timestamp}</span>
<p ref="content">{HtmlUtils.bodyToHtml(content)}</p>
{ contentContainer }
</li>;
}
}