OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1956 from matrix-org/t3chguy/show_redacted_sticker 

show redacted stickers like other redacted messages
pull/21833/head
David Baker 2018-06-13 17:28:22 +01:00 committed by GitHub
parent bfb535d05c 20caea47f8
commit 038b43aabd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/views/messages/MessageEvent.js
View File

@ -62,17 +62,24 @@ module.exports = React.createClass({
'm.audio': sdk.getComponent('messages.MAudioBody'), 'm.audio': sdk.getComponent('messages.MAudioBody'),
'm.video': sdk.getComponent('messages.MVideoBody'), 'm.video': sdk.getComponent('messages.MVideoBody'),
}; };
const evTypes = {
'm.sticker': sdk.getComponent('messages.MStickerBody'),
};
const content = this.props.mxEvent.getContent(); const content = this.props.mxEvent.getContent();
const type = this.props.mxEvent.getType();
const msgtype = content.msgtype; const msgtype = content.msgtype;
let BodyType = UnknownBody; let BodyType = UnknownBody;
if (msgtype && bodyTypes[msgtype]) { if (!this.props.mxEvent.isRedacted()) {
BodyType = bodyTypes[msgtype]; // only resolve BodyType if event is not redacted
} else if (this.props.mxEvent.getType() === 'm.sticker') { if (msgtype && bodyTypes[msgtype]) {
BodyType = sdk.getComponent('messages.MStickerBody'); BodyType = bodyTypes[msgtype];
} else if (content.url) { } else if (type && evTypes[type]) {
// Fallback to MFileBody if there's a content URL BodyType = evTypes[type];
BodyType = bodyTypes['m.file']; } else if (content.url) {
// Fallback to MFileBody if there's a content URL
BodyType = bodyTypes['m.file'];
}
} }
return <BodyType return <BodyType

10
src/components/views/rooms/EventTile.js
View File

@ -490,7 +490,7 @@ module.exports = withMatrixClient(React.createClass({
} }
const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1); const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1);
const isRedacted = (eventType === 'm.room.message') && this.props.isRedacted; const isRedacted = isMessageEvent(this.props.mxEvent) && this.props.isRedacted;
const isEncryptionFailure = this.props.mxEvent.isDecryptionFailure(); const isEncryptionFailure = this.props.mxEvent.isDecryptionFailure();
const classes = classNames({ const classes = classNames({
@ -715,9 +715,15 @@ module.exports = withMatrixClient(React.createClass({
}, },
})); }));
// XXX this'll eventually be dynamic based on the fields once we have extensible event types
const messageTypes = ['m.room.message', 'm.sticker'];
function isMessageEvent(ev) {
return (messageTypes.includes(ev.getType()));
}
module.exports.haveTileForEvent = function(e) { module.exports.haveTileForEvent = function(e) {
// Only messages have a tile (black-rectangle) if redacted // Only messages have a tile (black-rectangle) if redacted
if (e.isRedacted() && e.getType() !== 'm.room.message') return false; if (e.isRedacted() && !isMessageEvent(e)) return false;
const handler = getHandlerTile(e); const handler = getHandlerTile(e);
if (handler === undefined) return false; if (handler === undefined) return false;