Fix construction of EncryptedEvents

The parent constructor requires full json instead of content json now

1 files changed, 16 insertions, 8 deletions

diff --git a/lib/events/encryptedevent.cpp b/lib/events/encryptedevent.cpp
index 94b44901..9ef3b22a 100644
--- a/lib/events/encryptedevent.cpp
+++ b/lib/events/encryptedevent.cpp
@@ -8,20 +8,28 @@ using namespace Quotient;
 
 EncryptedEvent::EncryptedEvent(const QJsonObject& ciphertexts,
                                const QString& senderKey)
-    : RoomEvent({ { AlgorithmKeyL, OlmV1Curve25519AesSha2AlgoKey },
-                  { CiphertextKeyL, ciphertexts },
-                  { SenderKeyKeyL, senderKey } })
+    : RoomEvent({
+        {"content", QJsonObject{
+            { AlgorithmKeyL, OlmV1Curve25519AesSha2AlgoKey },
+            { CiphertextKeyL, ciphertexts },
+            { SenderKeyKeyL, senderKey }
+        }},
+        {TypeKeyL, "m.room.encrypted"}
+    })
 {}
 
 EncryptedEvent::EncryptedEvent(const QByteArray& ciphertext,
                                const QString& senderKey,
                                const QString& deviceId, const QString& sessionId)
     : RoomEvent({
-        { AlgorithmKeyL, MegolmV1AesSha2AlgoKey },
-        { CiphertextKeyL, QString(ciphertext) },
-        { DeviceIdKeyL, deviceId },
-        { SenderKeyKeyL, senderKey },
-        { SessionIdKeyL, sessionId },
+        {"content", QJsonObject{
+            { AlgorithmKeyL, MegolmV1AesSha2AlgoKey },
+            { CiphertextKeyL, QString(ciphertext) },
+            { DeviceIdKeyL, deviceId },
+            { SenderKeyKeyL, senderKey },
+            { SessionIdKeyL, sessionId },
+        }},
+        {TypeKeyL, "m.room.encrypted"}
     })
 {}