2 files changed, 63 insertions, 13 deletions

diff --git a/lib/events/keyverificationevent.h b/lib/events/keyverificationevent.h
index 78457e0c..cdbd5d74 100644
--- a/lib/events/keyverificationevent.h
+++ b/lib/events/keyverificationevent.h
@@ -1,17 +1,23 @@
 // SPDX-FileCopyrightText: 2021 Carl Schwan <carlschwan@kde.org>
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
+#pragma once
+
 #include "event.h"
 
 namespace Quotient {
 
+static constexpr auto SasV1Method = "m.sas.v1"_ls;
+
 /// Requests a key verification with another user's devices.
 /// Typically sent as a to-device event.
 class QUOTIENT_API KeyVerificationRequestEvent : public Event {
 public:
     DEFINE_EVENT_TYPEID("m.key.verification.request", KeyVerificationRequestEvent)
 
-    explicit KeyVerificationRequestEvent(const QJsonObject& obj);
+    explicit KeyVerificationRequestEvent(const QJsonObject& obj)
+        : Event(TypeId, obj)
+    {}
 
     /// The device ID which is initiating the request.
     QUO_CONTENT_GETTER(QString, fromDevice)
@@ -27,16 +33,38 @@ public:
     /// made. If the request is in the future by more than 5 minutes or
     /// more than 10 minutes in the past, the message should be ignored
     /// by the receiver.
-    QUO_CONTENT_GETTER(uint64_t, timestamp)
+    QUO_CONTENT_GETTER(QDateTime, timestamp)
 };
 REGISTER_EVENT_TYPE(KeyVerificationRequestEvent)
 
+class QUOTIENT_API KeyVerificationReadyEvent : public Event {
+public:
+    DEFINE_EVENT_TYPEID("m.key.verification.ready", KeyVerificationReadyEvent)
+
+    explicit KeyVerificationReadyEvent(const QJsonObject& obj)
+        : Event(TypeId, obj)
+    {}
+
+    /// The device ID which is accepting the request.
+    QUO_CONTENT_GETTER(QString, fromDevice)
+
+    /// The transaction id of the verification request
+    QUO_CONTENT_GETTER(QString, transactionId)
+
+    /// The verification methods supported by the sender.
+    QUO_CONTENT_GETTER(QStringList, methods)
+};
+REGISTER_EVENT_TYPE(KeyVerificationReadyEvent)
+
+
 /// Begins a key verification process.
 class QUOTIENT_API KeyVerificationStartEvent : public Event {
 public:
     DEFINE_EVENT_TYPEID("m.key.verification.start", KeyVerificationStartEvent)
 
-    explicit KeyVerificationStartEvent(const QJsonObject &obj);
+    explicit KeyVerificationStartEvent(const QJsonObject &obj)
+        : Event(TypeId, obj)
+    {}
 
     /// The device ID which is initiating the process.
     QUO_CONTENT_GETTER(QString, fromDevice)
@@ -57,7 +85,7 @@ public:
     /// \note Only exist if method is m.sas.v1
     QStringList keyAgreementProtocols() const
     {
-        Q_ASSERT(method() == QStringLiteral("m.sas.v1"));
+        Q_ASSERT(method() == SasV1Method);
         return contentPart<QStringList>("key_agreement_protocols"_ls);
     }
 
@@ -65,7 +93,7 @@ public:
     /// \note Only exist if method is m.sas.v1
     QStringList hashes() const
     {
-        Q_ASSERT(method() == QStringLiteral("m.sas.v1"));
+        Q_ASSERT(method() == SasV1Method);
         return contentPart<QStringList>("hashes"_ls);
     }
 
@@ -73,7 +101,7 @@ public:
     /// \note Only exist if method is m.sas.v1
     QStringList messageAuthenticationCodes() const
     {
-        Q_ASSERT(method() == QStringLiteral("m.sas.v1"));
+        Q_ASSERT(method() == SasV1Method);
         return contentPart<QStringList>("message_authentication_codes"_ls);
     }
 
@@ -82,7 +110,7 @@ public:
     /// \note Only exist if method is m.sas.v1
     QString shortAuthenticationString() const
     {
-        Q_ASSERT(method() == QStringLiteral("m.sas.v1"));
+        Q_ASSERT(method() == SasV1Method);
         return contentPart<QString>("short_authentification_string"_ls);
     }
 };
@@ -94,7 +122,9 @@ class QUOTIENT_API KeyVerificationAcceptEvent : public Event {
 public:
     DEFINE_EVENT_TYPEID("m.key.verification.accept", KeyVerificationAcceptEvent)
 
-    explicit KeyVerificationAcceptEvent(const QJsonObject& obj);
+    explicit KeyVerificationAcceptEvent(const QJsonObject& obj)
+        : Event(TypeId, obj)
+    {}
 
     /// An opaque identifier for the verification process.
     QUO_CONTENT_GETTER(QString, transactionId)
@@ -131,7 +161,9 @@ class QUOTIENT_API KeyVerificationCancelEvent : public Event {
 public:
     DEFINE_EVENT_TYPEID("m.key.verification.cancel", KeyVerificationCancelEvent)
 
-    explicit KeyVerificationCancelEvent(const QJsonObject &obj);
+    explicit KeyVerificationCancelEvent(const QJsonObject &obj)
+        : Event(TypeId, obj)
+    {}
 
     /// An opaque identifier for the verification process.
     QUO_CONTENT_GETTER(QString, transactionId)
@@ -147,11 +179,13 @@ REGISTER_EVENT_TYPE(KeyVerificationCancelEvent)
 
 /// Sends the ephemeral public key for a device to the partner device.
 /// Typically sent as a to-device event.
-class KeyVerificationKeyEvent : public Event {
+class QUOTIENT_API KeyVerificationKeyEvent : public Event {
 public:
     DEFINE_EVENT_TYPEID("m.key.verification.key", KeyVerificationKeyEvent)
 
-    explicit KeyVerificationKeyEvent(const QJsonObject &obj);
+    explicit KeyVerificationKeyEvent(const QJsonObject &obj)
+        : Event(TypeId, obj)
+    {}
 
     /// An opaque identifier for the verification process.
     QUO_CONTENT_GETTER(QString, transactionId)
@@ -166,7 +200,9 @@ class QUOTIENT_API KeyVerificationMacEvent : public Event {
 public:
     DEFINE_EVENT_TYPEID("m.key.verification.mac", KeyVerificationMacEvent)
 
-    explicit KeyVerificationMacEvent(const QJsonObject &obj);
+    explicit KeyVerificationMacEvent(const QJsonObject &obj)
+        : Event(TypeId, obj)
+    {}
 
     /// An opaque identifier for the verification process.
     QUO_CONTENT_GETTER(QString, transactionId)
@@ -180,4 +216,18 @@ public:
     }
 };
 REGISTER_EVENT_TYPE(KeyVerificationMacEvent)
+
+class QUOTIENT_API KeyVerificationDoneEvent : public Event {
+public:
+    DEFINE_EVENT_TYPEID("m.key.verification.done", KeyVerificationRequestEvent)
+
+    explicit KeyVerificationDoneEvent(const QJsonObject& obj)
+        : Event(TypeId, obj)
+    {}
+
+    /// The same transactionId as before
+    QUO_CONTENT_GETTER(QString, transactionId)
+};
+REGISTER_EVENT_TYPE(KeyVerificationDoneEvent)
+
 } // namespace Quotient
diff --git a/lib/events/roomevent.h b/lib/events/roomevent.h
index 7f724689..9461340b 100644
--- a/lib/events/roomevent.h
+++ b/lib/events/roomevent.h
@@ -62,7 +62,7 @@ public:
 
 #ifdef Quotient_E2EE_ENABLED
     void setOriginalEvent(event_ptr_tt<RoomEvent>&& originalEvent);
-    const RoomEvent* originalEvent() { return _originalEvent.get(); }
+    const RoomEvent* originalEvent() const { return _originalEvent.get(); }
     const QJsonObject encryptedJson() const;
 #endif