Decrypt redaction events

Signed-off-by: Šimon Brandner <[email protected]>

src/crypto/index.js

@@ -57,6 +57,7 @@ import {IllegalMethod} from "./verification/IllegalMethod";
 import {KeySignatureUploadError} from "../errors";
 import {decryptAES, encryptAES} from './aes';
 import {DehydrationManager} from './dehydration';
+import { MatrixEvent } from "../models/event";
 
 const DeviceVerification = DeviceInfo.DeviceVerification;
 
@@ -3028,19 +3029,28 @@ Crypto.prototype.encryptEvent = async function(event, room) {
  *  finished decrypting. Rejects with an `algorithms.DecryptionError` if there
  *  is a problem decrypting the event.
  */
-Crypto.prototype.decryptEvent = function(event) {
+Crypto.prototype.decryptEvent = async function(event) {
     if (event.isRedacted()) {
-        return Promise.resolve({
+        const redactionEvent = new MatrixEvent(event.getUnsigned().redacted_because);
+        const content = redactionEvent.getWireContent();
+        const alg = this._getRoomDecryptor(event.getRoomId(), content.algorithm);
+        const decryptedEvent = await alg.decryptEvent(redactionEvent);
+
+        return {
             clearEvent: {
                 room_id: event.getRoomId(),
                 type: "m.room.message",
                 content: {},
+                unsigned: {
+                    redacted_because: decryptedEvent.clearEvent,
+                },
             },
-        });
+        };
+    } else {
+        const content = event.getWireContent();
+        const alg = this._getRoomDecryptor(event.getRoomId(), content.algorithm);
+        return await alg.decryptEvent(event);
     }
-    const content = event.getWireContent();
-    const alg = this._getRoomDecryptor(event.getRoomId(), content.algorithm);
-    return alg.decryptEvent(event);
 };
 
 /**

src/models/event.js

@@ -811,6 +811,24 @@ utils.extend(MatrixEvent.prototype, {
         return this.getType() === "m.room.redaction";
     },
 
+    /**
+     * Get the (decrypted, if necessary) redaction event JSON
+     * if event was redacted
+     *
+     * @returns {object} The redaction event JSON, or an empty object
+     */
+    getRedactionEvent: function() {
+        if (!this.isRedacted()) return null;
+
+        if (this._clearEvent.unsigned) {
+            return this._clearEvent.unsigned.redacted_because;
+        } else if (this.event.unsigned.redacted_because) {
+            return this.event.unsigned.redacted_because;
+        } else {
+            return {};
+        }
+    },
+
     /**
      * Get the push actions, if known, for this event
      *