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

Avoid `MatrixEvent.toJSON` in event indexer (#11765) 

Part of the solution to https://github.com/vector-im/element-web/issues/26380:
`toJSON` is dangerous, and I'd like to kill it off. There is no need for it
here; it is simpler to call `getEffectiveEvent` directly.
pull/28217/head
Richard van der Hoff 2023-10-17 16:54:22 +01:00 committed by GitHub
parent 49cfde82de
commit a283bc4889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/indexing/EventIndex.ts
View File

@ -309,8 +309,7 @@ export default class EventIndex extends EventEmitter {
} }
private eventToJson(ev: MatrixEvent): IEventWithRoomId { private eventToJson(ev: MatrixEvent): IEventWithRoomId {
const jsonEvent: any = ev.toJSON(); const e = ev.getEffectiveEvent() as any;
const e = ev.isEncrypted() ? jsonEvent.decrypted : jsonEvent;
if (ev.isEncrypted()) { if (ev.isEncrypted()) {
// Let us store some additional data so we can re-verify the event. // Let us store some additional data so we can re-verify the event.