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

turt2live · web-flow · commit 8f3c8ba804ad · 2020-07-02T16:25:30.000-06:00
Add a null guard for message event previews
diff --git a/src/stores/room-list/previews/MessageEventPreview.ts b/src/stores/room-list/previews/MessageEventPreview.ts
@@ -30,6 +30,8 @@ export class MessageEventPreview implements IPreview {
             eventContent = event.getContent()['m.new_content'];
         }
 
+        if (!eventContent || !eventContent['body']) return null; // invalid for our purposes
+
         let body = (eventContent['body'] || '').trim();
         const msgtype = eventContent['msgtype'];
         if (!body || !msgtype) return null; // invalid event, no preview

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ export class MessageEventPreview implements IPreview {`
`30`	`30`	`eventContent = event.getContent()['m.new_content'];`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ if (!eventContent \|\| !eventContent['body']) return null; // invalid for our purposes`
	`34`	`+`
`33`	`35`	`let body = (eventContent['body'] \|\| '').trim();`
`34`	`36`	`const msgtype = eventContent['msgtype'];`
`35`	`37`	`if (!body \|\| !msgtype) return null; // invalid event, no preview`