PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4885 from matrix-org/travis/room-list/preview-crash-2

Browse source 
Add a null guard for message event previews
This commit is contained in:
Travis Ralston 2020-07-02 16:25:30 -06:00 committed by GitHub
commit 8f3c8ba804
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/stores/room-list/previews/MessageEventPreview.ts
View file

@ -30,6 +30,8 @@ export class MessageEventPreview implements IPreview {
eventContent = event.getContent()['m.new_content']; eventContent = event.getContent()['m.new_content'];
} }
if (!eventContent || !eventContent['body']) return null; // invalid for our purposes
let body = (eventContent['body'] || '').trim(); let body = (eventContent['body'] || '').trim();
const msgtype = eventContent['msgtype']; const msgtype = eventContent['msgtype'];
if (!body || !msgtype) return null; // invalid event, no preview if (!body || !msgtype) return null; // invalid event, no preview