Merge branch 'dev' into pinned

16 files changed, 108 insertions, 52 deletions

diff --git a/lib/csapi/definitions/cross_signing_key.h b/lib/csapi/definitions/cross_signing_key.h
new file mode 100644
index 00000000..0cec8161
--- /dev/null
+++ b/lib/csapi/definitions/cross_signing_key.h
@@ -0,0 +1,47 @@
+/******************************************************************************
+ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
+ */
+
+#pragma once
+
+#include "converters.h"
+
+namespace Quotient {
+/// Cross signing key
+struct CrossSigningKey {
+    /// The ID of the user the key belongs to.
+    QString userId;
+
+    /// What the key is used for.
+    QStringList usage;
+
+    /// The public key.  The object must have exactly one property, whose name
+    /// is in the form `<algorithm>:<unpadded_base64_public_key>`, and whose
+    /// value is the unpadded base64 public key.
+    QHash<QString, QString> keys;
+
+    /// Signatures of the key, calculated using the process described at
+    /// [Signing JSON](/appendices/#signing-json). Optional for the master key.
+    /// Other keys must be signed by the user\'s master key.
+    QJsonObject signatures;
+};
+
+template <>
+struct JsonObjectConverter<CrossSigningKey> {
+    static void dumpTo(QJsonObject& jo, const CrossSigningKey& pod)
+    {
+        addParam<>(jo, QStringLiteral("user_id"), pod.userId);
+        addParam<>(jo, QStringLiteral("usage"), pod.usage);
+        addParam<>(jo, QStringLiteral("keys"), pod.keys);
+        addParam<IfNotEmpty>(jo, QStringLiteral("signatures"), pod.signatures);
+    }
+    static void fillFrom(const QJsonObject& jo, CrossSigningKey& pod)
+    {
+        fromJson(jo.value("user_id"_ls), pod.userId);
+        fromJson(jo.value("usage"_ls), pod.usage);
+        fromJson(jo.value("keys"_ls), pod.keys);
+        fromJson(jo.value("signatures"_ls), pod.signatures);
+    }
+};
+
+} // namespace Quotient
diff --git a/lib/csapi/definitions/device_keys.h b/lib/csapi/definitions/device_keys.h
index 3065f218..84ecefae 100644
--- a/lib/csapi/definitions/device_keys.h
+++ b/lib/csapi/definitions/device_keys.h
@@ -21,15 +21,15 @@ struct DeviceKeys {
     QStringList algorithms;
 
     /// Public identity keys. The names of the properties should be in the
-    /// format ``<algorithm>:<device_id>``. The keys themselves should be
+    /// format `<algorithm>:<device_id>`. The keys themselves should be
     /// encoded as specified by the key algorithm.
     QHash<QString, QString> keys;
 
     /// Signatures for the device key object. A map from user ID, to a map from
-    /// ``<algorithm>:<device_id>`` to the signature.
+    /// `<algorithm>:<device_id>` to the signature.
     ///
-    /// The signature is calculated using the process described at `Signing
-    /// JSON`_.
+    /// The signature is calculated using the process described at [Signing
+    /// JSON](/appendices/#signing-json).
     QHash<QString, QHash<QString, QString>> signatures;
 };
 
diff --git a/lib/csapi/definitions/event_filter.h b/lib/csapi/definitions/event_filter.h
index 67497412..c55d4f92 100644
--- a/lib/csapi/definitions/event_filter.h
+++ b/lib/csapi/definitions/event_filter.h
@@ -14,13 +14,13 @@ struct EventFilter {
 
     /// A list of sender IDs to exclude. If this list is absent then no senders
     /// are excluded. A matching sender will be excluded even if it is listed in
-    /// the ``'senders'`` filter.
+    /// the `'senders'` filter.
     QStringList notSenders;
 
     /// A list of event types to exclude. If this list is absent then no event
     /// types are excluded. A matching type will be excluded even if it is
-    /// listed in the ``'types'`` filter. A '*' can be used as a wildcard to
-    /// match any sequence of characters.
+    /// listed in the `'types'` filter. A '*' can be used as a wildcard to match
+    /// any sequence of characters.
     QStringList notTypes;
 
     /// A list of senders IDs to include. If this list is absent then all
@@ -28,7 +28,7 @@ struct EventFilter {
     QStringList senders;
 
     /// A list of event types to include. If this list is absent then all event
-    /// types are included. A ``'*'`` can be used as a wildcard to match any
+    /// types are included. A `'*'` can be used as a wildcard to match any
     /// sequence of characters.
     QStringList types;
 };
diff --git a/lib/csapi/definitions/openid_token.h b/lib/csapi/definitions/openid_token.h
index 5e68c376..3c447321 100644
--- a/lib/csapi/definitions/openid_token.h
+++ b/lib/csapi/definitions/openid_token.h
@@ -11,10 +11,10 @@ namespace Quotient {
 struct OpenidToken {
     /// An access token the consumer may use to verify the identity of
     /// the person who generated the token. This is given to the federation
-    /// API ``GET /openid/userinfo`` to verify the user's identity.
+    /// API `GET /openid/userinfo` to verify the user's identity.
     QString accessToken;
 
-    /// The string ``Bearer``.
+    /// The string `Bearer`.
     QString tokenType;
 
     /// The homeserver domain the consumer should use when attempting to
diff --git a/lib/csapi/definitions/public_rooms_response.h b/lib/csapi/definitions/public_rooms_response.h
index 8f30e607..2938b4ec 100644
--- a/lib/csapi/definitions/public_rooms_response.h
+++ b/lib/csapi/definitions/public_rooms_response.h
@@ -36,7 +36,13 @@ struct PublicRoomsChunk {
     bool guestCanJoin;
 
     /// The URL for the room's avatar, if one is set.
-    QString avatarUrl;
+    QUrl avatarUrl;
+
+    /// The room's join rule. When not present, the room is assumed to
+    /// be `public`. Note that rooms with `invite` join rules are not
+    /// expected here, but rooms with `knock` rules are given their
+    /// near-public nature.
+    QString joinRule;
 };
 
 template <>
@@ -54,6 +60,7 @@ struct JsonObjectConverter<PublicRoomsChunk> {
         addParam<>(jo, QStringLiteral("world_readable"), pod.worldReadable);
         addParam<>(jo, QStringLiteral("guest_can_join"), pod.guestCanJoin);
         addParam<IfNotEmpty>(jo, QStringLiteral("avatar_url"), pod.avatarUrl);
+        addParam<IfNotEmpty>(jo, QStringLiteral("join_rule"), pod.joinRule);
     }
     static void fillFrom(const QJsonObject& jo, PublicRoomsChunk& pod)
     {
@@ -66,6 +73,7 @@ struct JsonObjectConverter<PublicRoomsChunk> {
         fromJson(jo.value("world_readable"_ls), pod.worldReadable);
         fromJson(jo.value("guest_can_join"_ls), pod.guestCanJoin);
         fromJson(jo.value("avatar_url"_ls), pod.avatarUrl);
+        fromJson(jo.value("join_rule"_ls), pod.joinRule);
     }
 };
 
diff --git a/lib/csapi/definitions/push_condition.h b/lib/csapi/definitions/push_condition.h
index a6decf1b..ce66d075 100644
--- a/lib/csapi/definitions/push_condition.h
+++ b/lib/csapi/definitions/push_condition.h
@@ -9,26 +9,27 @@
 namespace Quotient {
 
 struct PushCondition {
-    /// The kind of condition to apply. See `conditions <#conditions>`_ for
-    /// more information on the allowed kinds and how they work.
+    /// The kind of condition to apply. See
+    /// [conditions](/client-server-api/#conditions) for more information on the
+    /// allowed kinds and how they work.
     QString kind;
 
-    /// Required for ``event_match`` conditions. The dot-separated field of the
+    /// Required for `event_match` conditions. The dot-separated field of the
     /// event to match.
     ///
-    /// Required for ``sender_notification_permission`` conditions. The field in
+    /// Required for `sender_notification_permission` conditions. The field in
     /// the power level event the user needs a minimum power level for. Fields
-    /// must be specified under the ``notifications`` property in the power
-    /// level event's ``content``.
+    /// must be specified under the `notifications` property in the power level
+    /// event's `content`.
     QString key;
 
-    /// Required for ``event_match`` conditions. The glob-style pattern to
+    /// Required for `event_match` conditions. The glob-style pattern to
     /// match against. Patterns with no special glob characters should be
     /// treated as having asterisks prepended and appended when testing the
     /// condition.
     QString pattern;
 
-    /// Required for ``room_member_count`` conditions. A decimal integer
+    /// Required for `room_member_count` conditions. A decimal integer
     /// optionally prefixed by one of, ==, <, >, >= or <=. A prefix of < matches
     /// rooms where the member count is strictly less than the given number and
     /// so forth. If no prefix is present, this parameter defaults to ==.
diff --git a/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h
index 43749bae..135537c1 100644
--- a/lib/csapi/definitions/push_rule.h
+++ b/lib/csapi/definitions/push_rule.h
@@ -25,10 +25,10 @@ struct PushRule {
 
     /// The conditions that must hold true for an event in order for a rule to
     /// be applied to an event. A rule with no conditions always matches. Only
-    /// applicable to ``underride`` and ``override`` rules.
+    /// applicable to `underride` and `override` rules.
     QVector<PushCondition> conditions;
 
-    /// The glob-style pattern to match against.  Only applicable to ``content``
+    /// The glob-style pattern to match against.  Only applicable to `content`
     /// rules.
     QString pattern;
 };
diff --git a/lib/csapi/definitions/request_email_validation.h b/lib/csapi/definitions/request_email_validation.h
index ab34862e..b1781e27 100644
--- a/lib/csapi/definitions/request_email_validation.h
+++ b/lib/csapi/definitions/request_email_validation.h
@@ -16,15 +16,14 @@ struct EmailValidationData : RequestEmailValidation {
     /// 3PID verification.
     ///
     /// This parameter is deprecated with a plan to be removed in a future
-    /// specification version for ``/account/password`` and ``/register``
-    /// requests.
+    /// specification version for `/account/password` and `/register` requests.
     QString idServer;
 
     /// An access token previously registered with the identity server. Servers
     /// can treat this as optional to distinguish between r0.5-compatible
     /// clients and this specification version.
     ///
-    /// Required if an ``id_server`` is supplied.
+    /// Required if an `id_server` is supplied.
     QString idAccessToken;
 };
 
diff --git a/lib/csapi/definitions/request_msisdn_validation.h b/lib/csapi/definitions/request_msisdn_validation.h
index 8539cd98..4600b48c 100644
--- a/lib/csapi/definitions/request_msisdn_validation.h
+++ b/lib/csapi/definitions/request_msisdn_validation.h
@@ -16,15 +16,14 @@ struct MsisdnValidationData : RequestMsisdnValidation {
     /// 3PID verification.
     ///
     /// This parameter is deprecated with a plan to be removed in a future
-    /// specification version for ``/account/password`` and ``/register``
-    /// requests.
+    /// specification version for `/account/password` and `/register` requests.
     QString idServer;
 
     /// An access token previously registered with the identity server. Servers
     /// can treat this as optional to distinguish between r0.5-compatible
     /// clients and this specification version.
     ///
-    /// Required if an ``id_server`` is supplied.
+    /// Required if an `id_server` is supplied.
     QString idAccessToken;
 };
 
diff --git a/lib/csapi/definitions/request_token_response.h b/lib/csapi/definitions/request_token_response.h
index 00222839..d5fbbadb 100644
--- a/lib/csapi/definitions/request_token_response.h
+++ b/lib/csapi/definitions/request_token_response.h
@@ -10,22 +10,22 @@ namespace Quotient {
 
 struct RequestTokenResponse {
     /// The session ID. Session IDs are opaque strings that must consist
-    /// entirely of the characters ``[0-9a-zA-Z.=_-]``. Their length must not
+    /// entirely of the characters `[0-9a-zA-Z.=_-]`. Their length must not
     /// exceed 255 characters and they must not be empty.
     QString sid;
 
     /// An optional field containing a URL where the client must submit the
     /// validation token to, with identical parameters to the Identity Service
-    /// API's ``POST /validate/email/submitToken`` endpoint (without the
+    /// API's `POST /validate/email/submitToken` endpoint (without the
     /// requirement for an access token). The homeserver must send this token to
     /// the user (if applicable), who should then be prompted to provide it to
     /// the client.
     ///
     /// If this field is not present, the client can assume that verification
     /// will happen without the client's involvement provided the homeserver
-    /// advertises this specification version in the ``/versions`` response
+    /// advertises this specification version in the `/versions` response
     /// (ie: r0.5.0).
-    QString submitUrl;
+    QUrl submitUrl;
 };
 
 template <>
diff --git a/lib/csapi/definitions/room_event_filter.h b/lib/csapi/definitions/room_event_filter.h
index 11e87fde..91caf667 100644
--- a/lib/csapi/definitions/room_event_filter.h
+++ b/lib/csapi/definitions/room_event_filter.h
@@ -11,30 +11,31 @@
 namespace Quotient {
 
 struct RoomEventFilter : EventFilter {
-    /// If ``true``, enables lazy-loading of membership events. See
-    /// `Lazy-loading room members <#lazy-loading-room-members>`_
-    /// for more information. Defaults to ``false``.
+    /// If `true`, enables lazy-loading of membership events. See
+    /// [Lazy-loading room
+    /// members](/client-server-api/#lazy-loading-room-members) for more
+    /// information. Defaults to `false`.
     Omittable<bool> lazyLoadMembers;
 
-    /// If ``true``, sends all membership events for all events, even if they
-    /// have already been sent to the client. Does not apply unless
-    /// ``lazy_load_members`` is ``true``. See `Lazy-loading room members
-    /// <#lazy-loading-room-members>`_ for more information. Defaults to
-    /// ``false``.
+    /// If `true`, sends all membership events for all events, even if they have
+    /// already been sent to the client. Does not apply unless
+    /// `lazy_load_members` is `true`. See [Lazy-loading room
+    /// members](/client-server-api/#lazy-loading-room-members) for more
+    /// information. Defaults to `false`.
     Omittable<bool> includeRedundantMembers;
 
     /// A list of room IDs to exclude. If this list is absent then no rooms are
     /// excluded. A matching room will be excluded even if it is listed in the
-    /// ``'rooms'`` filter.
+    /// `'rooms'` filter.
     QStringList notRooms;
 
     /// A list of room IDs to include. If this list is absent then all rooms are
     /// included.
     QStringList rooms;
 
-    /// If ``true``, includes only events with a ``url`` key in their content.
-    /// If ``false``, excludes those events. If omitted, ``url`` key is not
-    /// considered for filtering.
+    /// If `true`, includes only events with a `url` key in their content. If
+    /// `false`, excludes those events. If omitted, `url` key is not considered
+    /// for filtering.
     Omittable<bool> containsUrl;
 };
 
diff --git a/lib/csapi/definitions/sync_filter.h b/lib/csapi/definitions/sync_filter.h
index 9c8f08d5..62e17962 100644
--- a/lib/csapi/definitions/sync_filter.h
+++ b/lib/csapi/definitions/sync_filter.h
@@ -14,13 +14,13 @@ namespace Quotient {
 struct RoomFilter {
     /// A list of room IDs to exclude. If this list is absent then no rooms are
     /// excluded. A matching room will be excluded even if it is listed in the
-    /// ``'rooms'`` filter. This filter is applied before the filters in
-    /// ``ephemeral``, ``state``, ``timeline`` or ``account_data``
+    /// `'rooms'` filter. This filter is applied before the filters in
+    /// `ephemeral`, `state`, `timeline` or `account_data`
     QStringList notRooms;
 
     /// A list of room IDs to include. If this list is absent then all rooms are
-    /// included. This filter is applied before the filters in ``ephemeral``,
-    /// ``state``, ``timeline`` or ``account_data``
+    /// included. This filter is applied before the filters in `ephemeral`,
+    /// `state`, `timeline` or `account_data`
     QStringList rooms;
 
     /// The events that aren't recorded in the room history, e.g. typing and
diff --git a/lib/csapi/definitions/third_party_signed.h b/lib/csapi/definitions/third_party_signed.h
index 526545d0..7097bda4 100644
--- a/lib/csapi/definitions/third_party_signed.h
+++ b/lib/csapi/definitions/third_party_signed.h
@@ -7,7 +7,7 @@
 #include "converters.h"
 
 namespace Quotient {
-/// A signature of an ``m.third_party_invite`` token to prove that this user
+/// 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.
diff --git a/lib/csapi/definitions/user_identifier.h b/lib/csapi/definitions/user_identifier.h
index dadf6f97..cb585a6a 100644
--- a/lib/csapi/definitions/user_identifier.h
+++ b/lib/csapi/definitions/user_identifier.h
@@ -9,8 +9,9 @@
 namespace Quotient {
 /// Identification information for a user
 struct UserIdentifier {
-    /// The type of identification.  See `Identifier types`_ for supported
-    /// values and additional property descriptions.
+    /// The type of identification.  See [Identifier
+    /// types](/client-server-api/#identifier-types) for supported values and
+    /// additional property descriptions.
     QString type;
 
     /// Identification information for a user
diff --git a/lib/csapi/definitions/wellknown/homeserver.h b/lib/csapi/definitions/wellknown/homeserver.h
index 5cfaca24..b7db4182 100644
--- a/lib/csapi/definitions/wellknown/homeserver.h
+++ b/lib/csapi/definitions/wellknown/homeserver.h
@@ -10,7 +10,7 @@ namespace Quotient {
 /// Used by clients to discover homeserver information.
 struct HomeserverInformation {
     /// The base URL for the homeserver for client-server connections.
-    QString baseUrl;
+    QUrl baseUrl;
 };
 
 template <>
diff --git a/lib/csapi/definitions/wellknown/identity_server.h b/lib/csapi/definitions/wellknown/identity_server.h
index 3bd07bd1..885e3d34 100644
--- a/lib/csapi/definitions/wellknown/identity_server.h
+++ b/lib/csapi/definitions/wellknown/identity_server.h
@@ -10,7 +10,7 @@ namespace Quotient {
 /// Used by clients to discover identity server information.
 struct IdentityServerInformation {
     /// The base URL for the identity server for client-server connections.
-    QString baseUrl;
+    QUrl baseUrl;
 };
 
 template <>