matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

dont try to decrypt reactions

Browse Source
This commit is contained in:
Bruno Windels
2019-06-27 15:03:47 +02:00
parent c5cddf1607
commit fdacc2f7ab
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.js
View File

@@ -4008,9 +4008,7 @@ MatrixClient.prototype.getCanResetTimelineCallback = function() {
*/ */
MatrixClient.prototype.relations = MatrixClient.prototype.relations =
async function(roomId, eventId, relationType, eventType, opts = {}) { async function(roomId, eventId, relationType, eventType, opts = {}) {
const isEncrypted = this.isRoomEncrypted(roomId);
const fetchedEventType = _getEncryptedIfNeededEventType(this, roomId, eventType); const fetchedEventType = _getEncryptedIfNeededEventType(this, roomId, eventType);
const result = await this.fetchRelations( const result = await this.fetchRelations(
roomId, roomId,
eventId, eventId,
@@ -4019,7 +4017,7 @@ async function(roomId, eventId, relationType, eventType, opts = {}) {
opts); opts);
let events = result.chunk.map(this.getEventMapper()); let events = result.chunk.map(this.getEventMapper());
if (isEncrypted) { if (fetchedEventType === "m.room.encrypted") {
await Promise.all(events.map(e => { await Promise.all(events.map(e => {
return new Promise(resolve => e.once("Event.decrypted", resolve)); return new Promise(resolve => e.once("Event.decrypted", resolve));
})); }));