Handle relations in encrypted rooms #969
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jryans
requested changes
Jun 27, 2019
src/client.js
Outdated
| @@ -3991,14 +3993,25 @@ MatrixClient.prototype.getCanResetTimelineCallback = function() { | |||
| */ | |||
| MatrixClient.prototype.relations = | |||
| async function(roomId, eventId, relationType, eventType, opts = {}) { | |||
| const isEncrypted = this.isRoomEncrypted(roomId); | |||
| const fetchedEventType = isEncrypted ? "m.room.encrypted" : eventType; | |||
There was a problem hiding this comment.
Hmm, so this fetchedEventType will be wrong for reactions, which are now always m.reaction even in E2E rooms. 😓 It does seem nice to handle encryption transparently though... Maybe we should add a helper function similar to _encryptEventIfNeeded called something like _getEncryptedIfNeededEventType that returns the eventual event type (with a similar exception for reactions)?
jryans
requested changes
Jun 27, 2019
| let events = result.chunk.map(this.getEventMapper()); | ||
| if (isEncrypted) { | ||
| await Promise.all(events.map(e => { | ||
| return new Promise(resolve => e.once("Event.decrypted", resolve)); |
There was a problem hiding this comment.
Reactions in an encrypted room won't be encrypted events themselves, so we can't use isEncrypted for the whole room to decide whether to await Event.decrypted.
Since the event mapper will invoke attemptDecryption, I think you only want to wait for Event.decrypted if event.isBeingDecrypted().
jryans
approved these changes
Jun 27, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of matrix-org/matrix-react-sdk#3151