hippoz/cinny
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle messages with invalid body (#833)

Browse source
This commit is contained in:
ginnyTheCat 2022-09-11 15:21:05 +02:00 committed by GitHub
parent 0a2cca6e40
commit a343d9999e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/molecules/message/Message.jsx
View file

@ -737,7 +737,6 @@ function Message({
replyTo(senderId, mEvent.getId(), body); replyTo(senderId, mEvent.getId(), body);
}, [body]); }, [body]);
if (body === undefined) return null;
if (msgType === 'm.emote') className.push('message--type-emote'); if (msgType === 'm.emote') className.push('message--type-emote');
let isCustomHTML = content.format === 'org.matrix.custom.html'; let isCustomHTML = content.format === 'org.matrix.custom.html';
@ -752,13 +751,14 @@ function Message({
const editedList = editedTimeline.get(eventId); const editedList = editedTimeline.get(eventId);
const editedMEvent = editedList[editedList.length - 1]; const editedMEvent = editedList[editedList.length - 1];
[body, isCustomHTML, customHTML] = getEditedBody(editedMEvent); [body, isCustomHTML, customHTML] = getEditedBody(editedMEvent);
if (typeof body !== 'string') return null;
} }
if (isReply) { if (isReply) {
body = parseReply(body)?.body ?? body; body = parseReply(body)?.body ?? body;
} }
if (typeof body !== 'string') body = '';
return ( return (
<div className={className.join(' ')}> <div className={className.join(' ')}>
{ {