1 files changed, 64 insertions, 55 deletions

diff --git a/lib/csapi/definitions/public_rooms_response.h b/lib/csapi/definitions/public_rooms_response.h
index 88c805ba..7c7d9cc6 100644
--- a/lib/csapi/definitions/public_rooms_response.h
+++ b/lib/csapi/definitions/public_rooms_response.h
@@ -6,67 +6,76 @@
 
 #include "converters.h"
 
-#include <QtCore/QVector>
-#include "converters.h"
+namespace Quotient {
 
-namespace QMatrixClient
-{
-    // Data structures
+struct PublicRoomsChunk {
+    /// The canonical alias of the room, if any.
+    QString canonicalAlias;
 
-    struct PublicRoomsChunk
-    {
-        /// Aliases of the room. May be empty.
-        QStringList aliases;
-        /// The canonical alias of the room, if any.
-        QString canonicalAlias;
-        /// The name of the room, if any.
-        QString name;
-        /// The number of members joined to the room.
-        int numJoinedMembers;
-        /// The ID of the room.
-        QString roomId;
-        /// The topic of the room, if any.
-        QString topic;
-        /// Whether the room may be viewed by guest users without joining.
-        bool worldReadable;
-        /// Whether guest users may join the room and participate in it.
-        /// If they can, they will be subject to ordinary power level
-        /// rules like any other user.
-        bool guestCanJoin;
-        /// The URL for the room's avatar, if one is set.
-        QString avatarUrl;
-    };
+    /// The name of the room, if any.
+    QString name;
 
-    QJsonObject toJson(const PublicRoomsChunk& pod);
+    /// The number of members joined to the room.
+    int numJoinedMembers;
 
-    template <> struct FromJsonObject<PublicRoomsChunk>
-    {
-        PublicRoomsChunk operator()(const QJsonObject& jo) const;
-    };
+    /// The ID of the room.
+    QString roomId;
 
-    /// A list of the rooms on the server.
-    struct PublicRoomsResponse
-    {
-        /// A paginated chunk of public rooms.
-        QVector<PublicRoomsChunk> chunk;
-        /// A pagination token for the response. The absence of this token
-        /// means there are no more results to fetch and the client should
-        /// stop paginating.
-        QString nextBatch;
-        /// A pagination token that allows fetching previous results. The
-        /// absence of this token means there are no results before this
-        /// batch, i.e. this is the first batch.
-        QString prevBatch;
-        /// An estimate on the total number of public rooms, if the
-        /// server has an estimate.
-        Omittable<int> totalRoomCountEstimate;
-    };
+    /// The topic of the room, if any.
+    QString topic;
+
+    /// Whether the room may be viewed by guest users without joining.
+    bool worldReadable;
 
-    QJsonObject toJson(const PublicRoomsResponse& pod);
+    /// Whether guest users may join the room and participate in it.
+    /// If they can, they will be subject to ordinary power level
+    /// rules like any other user.
+    bool guestCanJoin;
 
-    template <> struct FromJsonObject<PublicRoomsResponse>
+    /// The URL for the room's avatar, if one is set.
+    QUrl avatarUrl;
+
+    /// The `type` of room (from
+    /// [`m.room.create`](/client-server-api/#mroomcreate)), if any.
+    QString roomType;
+
+    /// 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 <>
+struct JsonObjectConverter<PublicRoomsChunk> {
+    static void dumpTo(QJsonObject& jo, const PublicRoomsChunk& pod)
+    {
+        addParam<IfNotEmpty>(jo, QStringLiteral("canonical_alias"),
+                             pod.canonicalAlias);
+        addParam<IfNotEmpty>(jo, QStringLiteral("name"), pod.name);
+        addParam<>(jo, QStringLiteral("num_joined_members"),
+                   pod.numJoinedMembers);
+        addParam<>(jo, QStringLiteral("room_id"), pod.roomId);
+        addParam<IfNotEmpty>(jo, QStringLiteral("topic"), pod.topic);
+        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("room_type"), pod.roomType);
+        addParam<IfNotEmpty>(jo, QStringLiteral("join_rule"), pod.joinRule);
+    }
+    static void fillFrom(const QJsonObject& jo, PublicRoomsChunk& pod)
     {
-        PublicRoomsResponse operator()(const QJsonObject& jo) const;
-    };
+        fromJson(jo.value("canonical_alias"_ls), pod.canonicalAlias);
+        fromJson(jo.value("name"_ls), pod.name);
+        fromJson(jo.value("num_joined_members"_ls), pod.numJoinedMembers);
+        fromJson(jo.value("room_id"_ls), pod.roomId);
+        fromJson(jo.value("topic"_ls), pod.topic);
+        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("room_type"_ls), pod.roomType);
+        fromJson(jo.value("join_rule"_ls), pod.joinRule);
+    }
+};
 
-} // namespace QMatrixClient
+} // namespace Quotient