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

Merge pull request #3596 from matrix-org/dbkr/fix_editing_softcrash 

Fix softcrash if editing silly events
pull/21833/head
David Baker 2019-11-06 11:53:18 +00:00 committed by GitHub
parent d14c0c342d 0464b094a6
commit e2acc90fbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/utils/EventUtils.js
View File

@ -52,6 +52,7 @@ export function canEditContent(mxEvent) {
const content = mxEvent.getOriginalContent(); const content = mxEvent.getOriginalContent();
const {msgtype} = content; const {msgtype} = content;
return (msgtype === "m.text" || msgtype === "m.emote") && return (msgtype === "m.text" || msgtype === "m.emote") &&
content.body && typeof content.body === 'string' &&
mxEvent.getSender() === MatrixClientPeg.get().getUserId(); mxEvent.getSender() === MatrixClientPeg.get().getUserId();
} }