1 files changed, 36 insertions, 85 deletions

diff --git a/lib/csapi/joining.h b/lib/csapi/joining.h
index 6d93bcb1..6822fbdf 100644
--- a/lib/csapi/joining.h
+++ b/lib/csapi/joining.h
@@ -4,16 +4,12 @@
 
 #pragma once
 
-#include "converters.h"
+#include "csapi/definitions/third_party_signed.h"
 
 #include "jobs/basejob.h"
 
-#include <QtCore/QJsonObject>
-
 namespace Quotient {
 
-// Operations
-
 /*! \brief Start the requesting user participating in a particular room.
  *
  * *Note that this API requires a room ID, not alias.* ``/join/{roomIdOrAlias}``
@@ -33,49 +29,36 @@ namespace Quotient {
  */
 class JoinRoomByIdJob : public BaseJob {
 public:
-    // Inner data structures
-
-    /// A signature of an ``m.third_party_invite`` token to prove that this user
-    /// owns a third party identity which has been invited to the room.
-    struct ThirdPartySigned {
-        /// The Matrix ID of the user who issued the invite.
-        QString sender;
-        /// The Matrix ID of the invitee.
-        QString mxid;
-        /// The state key of the m.third_party_invite event.
-        QString token;
-        /// A signatures object containing a signature of the entire signed
-        /// object.
-        QJsonObject signatures;
-    };
-
-    // Construction/destruction
-
     /*! \brief Start the requesting user participating in a particular room.
      *
+     *
      * \param roomId
      *   The room identifier (not alias) to join.
+     *
      * \param thirdPartySigned
-     *   A signature of an ``m.third_party_invite`` token to prove that this
-     * user owns a third party identity which has been invited to the room.
+     *   *Note that this API requires a room ID, not alias.*
+     * ``/join/{roomIdOrAlias}`` *exists if you have a room alias.*
+     *
+     *   This API starts a user participating in a particular room, if that user
+     *   is allowed to participate in that room. After this call, the client is
+     *   allowed to see all current state events in the room, and all subsequent
+     *   events associated with the room until the user leaves the room.
+     *
+     *   After a user has joined a room, the room will appear as an entry in the
+     *   response of the |/initialSync|_ and |/sync|_ APIs.
+     *
+     *   If a ``third_party_signed`` was supplied, the homeserver must verify
+     *   that it matches a pending ``m.room.third_party_invite`` event in the
+     *   room, and perform key validity checking if required by the event.
      */
     explicit JoinRoomByIdJob(
         const QString& roomId,
         const Omittable<ThirdPartySigned>& thirdPartySigned = none);
 
-    ~JoinRoomByIdJob() override;
-
     // Result properties
 
     /// The joined room ID.
-    const QString& roomId() const;
-
-protected:
-    Status parseJson(const QJsonDocument& data) override;
-
-private:
-    class Private;
-    QScopedPointer<Private> d;
+    QString roomId() const { return loadFromJson<QString>("room_id"_ls); }
 };
 
 /*! \brief Start the requesting user participating in a particular room.
@@ -97,72 +80,40 @@ private:
  */
 class JoinRoomJob : public BaseJob {
 public:
-    // Inner data structures
-
-    /// *Note that this API takes either a room ID or alias, unlike*
-    /// ``/room/{roomId}/join``.
-    ///
-    /// This API starts a user participating in a particular room, if that user
-    /// is allowed to participate in that room. After this call, the client is
-    /// allowed to see all current state events in the room, and all subsequent
-    /// events associated with the room until the user leaves the room.
-    ///
-    /// After a user has joined a room, the room will appear as an entry in the
-    /// response of the |/initialSync|_ and |/sync|_ APIs.
-    ///
-    /// If a ``third_party_signed`` was supplied, the homeserver must verify
-    /// that it matches a pending ``m.room.third_party_invite`` event in the
-    /// room, and perform key validity checking if required by the event.
-    struct Signed {
-        /// The Matrix ID of the user who issued the invite.
-        QString sender;
-        /// The Matrix ID of the invitee.
-        QString mxid;
-        /// The state key of the m.third_party_invite event.
-        QString token;
-        /// A signatures object containing a signature of the entire signed
-        /// object.
-        QJsonObject signatures;
-    };
-
-    /// A signature of an ``m.third_party_invite`` token to prove that this user
-    /// owns a third party identity which has been invited to the room.
-    struct ThirdPartySigned {
-        /// A signature of an ``m.third_party_invite`` token to prove that this
-        /// user owns a third party identity which has been invited to the room.
-        Signed signedData;
-    };
-
-    // Construction/destruction
-
     /*! \brief Start the requesting user participating in a particular room.
      *
+     *
      * \param roomIdOrAlias
      *   The room identifier or alias to join.
+     *
      * \param serverName
      *   The servers to attempt to join the room through. One of the servers
      *   must be participating in the room.
+     *
      * \param thirdPartySigned
-     *   A signature of an ``m.third_party_invite`` token to prove that this
-     * user owns a third party identity which has been invited to the room.
+     *   *Note that this API takes either a room ID or alias, unlike*
+     * ``/room/{roomId}/join``.
+     *
+     *   This API starts a user participating in a particular room, if that user
+     *   is allowed to participate in that room. After this call, the client is
+     *   allowed to see all current state events in the room, and all subsequent
+     *   events associated with the room until the user leaves the room.
+     *
+     *   After a user has joined a room, the room will appear as an entry in the
+     *   response of the |/initialSync|_ and |/sync|_ APIs.
+     *
+     *   If a ``third_party_signed`` was supplied, the homeserver must verify
+     *   that it matches a pending ``m.room.third_party_invite`` event in the
+     *   room, and perform key validity checking if required by the event.
      */
     explicit JoinRoomJob(
         const QString& roomIdOrAlias, const QStringList& serverName = {},
         const Omittable<ThirdPartySigned>& thirdPartySigned = none);
 
-    ~JoinRoomJob() override;
-
     // Result properties
 
     /// The joined room ID.
-    const QString& roomId() const;
-
-protected:
-    Status parseJson(const QJsonDocument& data) override;
-
-private:
-    class Private;
-    QScopedPointer<Private> d;
+    QString roomId() const { return loadFromJson<QString>("room_id"_ls); }
 };
 
 } // namespace Quotient