From 1e6510790dab6b9141ae52993987b406399668cd Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sun, 2 Sep 2018 16:08:13 +0900 Subject: Support CS API 0.4.0 Numerous changes in CS (and now also AS) API, including compatibility-breaking ones - see the diff for details. --- lib/csapi/definitions/event_filter.cpp | 6 ++--- lib/csapi/definitions/event_filter.h | 8 +++---- lib/csapi/definitions/public_rooms_response.cpp | 4 ++-- lib/csapi/definitions/public_rooms_response.h | 4 ++-- lib/csapi/definitions/room_event_filter.h | 4 ++-- lib/csapi/definitions/sync_filter.cpp | 10 ++++---- lib/csapi/definitions/sync_filter.h | 12 +++++----- lib/csapi/definitions/wellknown/homeserver.cpp | 24 +++++++++++++++++++ lib/csapi/definitions/wellknown/homeserver.h | 28 ++++++++++++++++++++++ .../definitions/wellknown/identity_server.cpp | 24 +++++++++++++++++++ lib/csapi/definitions/wellknown/identity_server.h | 28 ++++++++++++++++++++++ 11 files changed, 128 insertions(+), 24 deletions(-) create mode 100644 lib/csapi/definitions/wellknown/homeserver.cpp create mode 100644 lib/csapi/definitions/wellknown/homeserver.h create mode 100644 lib/csapi/definitions/wellknown/identity_server.cpp create mode 100644 lib/csapi/definitions/wellknown/identity_server.h (limited to 'lib/csapi/definitions') diff --git a/lib/csapi/definitions/event_filter.cpp b/lib/csapi/definitions/event_filter.cpp index 2f0bc899..cc444db0 100644 --- a/lib/csapi/definitions/event_filter.cpp +++ b/lib/csapi/definitions/event_filter.cpp @@ -6,7 +6,7 @@ using namespace QMatrixClient; -QJsonObject QMatrixClient::toJson(const Filter& pod) +QJsonObject QMatrixClient::toJson(const EventFilter& pod) { QJsonObject jo; addParam(jo, QStringLiteral("limit"), pod.limit); @@ -17,9 +17,9 @@ QJsonObject QMatrixClient::toJson(const Filter& pod) return jo; } -Filter FromJsonObject::operator()(const QJsonObject& jo) const +EventFilter FromJsonObject::operator()(const QJsonObject& jo) const { - Filter result; + EventFilter result; result.limit = fromJson(jo.value("limit"_ls)); result.notSenders = diff --git a/lib/csapi/definitions/event_filter.h b/lib/csapi/definitions/event_filter.h index 2c64181b..5c6a5b27 100644 --- a/lib/csapi/definitions/event_filter.h +++ b/lib/csapi/definitions/event_filter.h @@ -12,7 +12,7 @@ namespace QMatrixClient { // Data structures - struct Filter + struct EventFilter { /// The maximum number of events to return. Omittable limit; @@ -26,11 +26,11 @@ namespace QMatrixClient QStringList types; }; - QJsonObject toJson(const Filter& pod); + QJsonObject toJson(const EventFilter& pod); - template <> struct FromJsonObject + template <> struct FromJsonObject { - Filter operator()(const QJsonObject& jo) const; + EventFilter operator()(const QJsonObject& jo) const; }; } // namespace QMatrixClient diff --git a/lib/csapi/definitions/public_rooms_response.cpp b/lib/csapi/definitions/public_rooms_response.cpp index 60ae3749..2f52501d 100644 --- a/lib/csapi/definitions/public_rooms_response.cpp +++ b/lib/csapi/definitions/public_rooms_response.cpp @@ -31,7 +31,7 @@ PublicRoomsChunk FromJsonObject::operator()(const QJsonObject& result.name = fromJson(jo.value("name"_ls)); result.numJoinedMembers = - fromJson(jo.value("num_joined_members"_ls)); + fromJson(jo.value("num_joined_members"_ls)); result.roomId = fromJson(jo.value("room_id"_ls)); result.topic = @@ -66,7 +66,7 @@ PublicRoomsResponse FromJsonObject::operator()(const QJsonO result.prevBatch = fromJson(jo.value("prev_batch"_ls)); result.totalRoomCountEstimate = - fromJson(jo.value("total_room_count_estimate"_ls)); + fromJson(jo.value("total_room_count_estimate"_ls)); return result; } diff --git a/lib/csapi/definitions/public_rooms_response.h b/lib/csapi/definitions/public_rooms_response.h index e7fe5ad8..88c805ba 100644 --- a/lib/csapi/definitions/public_rooms_response.h +++ b/lib/csapi/definitions/public_rooms_response.h @@ -22,7 +22,7 @@ namespace QMatrixClient /// The name of the room, if any. QString name; /// The number of members joined to the room. - qint64 numJoinedMembers; + int numJoinedMembers; /// The ID of the room. QString roomId; /// The topic of the room, if any. @@ -59,7 +59,7 @@ namespace QMatrixClient QString prevBatch; /// An estimate on the total number of public rooms, if the /// server has an estimate. - Omittable totalRoomCountEstimate; + Omittable totalRoomCountEstimate; }; QJsonObject toJson(const PublicRoomsResponse& pod); diff --git a/lib/csapi/definitions/room_event_filter.h b/lib/csapi/definitions/room_event_filter.h index 1e8d644e..697fe661 100644 --- a/lib/csapi/definitions/room_event_filter.h +++ b/lib/csapi/definitions/room_event_filter.h @@ -13,13 +13,13 @@ namespace QMatrixClient { // Data structures - struct RoomEventFilter : Filter + struct RoomEventFilter : EventFilter { /// 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. 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 ``true``, includes only events with a ``url`` key in their content. If ``false``, excludes those events. Defaults to ``false``. bool containsUrl; }; diff --git a/lib/csapi/definitions/sync_filter.cpp b/lib/csapi/definitions/sync_filter.cpp index 984e99ae..bd87804c 100644 --- a/lib/csapi/definitions/sync_filter.cpp +++ b/lib/csapi/definitions/sync_filter.cpp @@ -40,7 +40,7 @@ RoomFilter FromJsonObject::operator()(const QJsonObject& jo) const return result; } -QJsonObject QMatrixClient::toJson(const SyncFilter& pod) +QJsonObject QMatrixClient::toJson(const Filter& pod) { QJsonObject jo; addParam(jo, QStringLiteral("event_fields"), pod.eventFields); @@ -51,17 +51,17 @@ QJsonObject QMatrixClient::toJson(const SyncFilter& pod) return jo; } -SyncFilter FromJsonObject::operator()(const QJsonObject& jo) const +Filter FromJsonObject::operator()(const QJsonObject& jo) const { - SyncFilter result; + Filter result; result.eventFields = fromJson(jo.value("event_fields"_ls)); result.eventFormat = fromJson(jo.value("event_format"_ls)); result.presence = - fromJson(jo.value("presence"_ls)); + fromJson(jo.value("presence"_ls)); result.accountData = - fromJson(jo.value("account_data"_ls)); + fromJson(jo.value("account_data"_ls)); result.room = fromJson(jo.value("room"_ls)); diff --git a/lib/csapi/definitions/sync_filter.h b/lib/csapi/definitions/sync_filter.h index 47b5fcdb..ca275a9a 100644 --- a/lib/csapi/definitions/sync_filter.h +++ b/lib/csapi/definitions/sync_filter.h @@ -40,25 +40,25 @@ namespace QMatrixClient RoomFilter operator()(const QJsonObject& jo) const; }; - struct SyncFilter + struct Filter { /// List of event fields to include. If this list is absent then all fields are included. The entries may include '.' charaters to indicate sub-fields. So ['content.body'] will include the 'body' field of the 'content' object. A literal '.' character in a field name may be escaped using a '\\'. A server may include more fields than were requested. QStringList eventFields; /// The format to use for events. 'client' will return the events in a format suitable for clients. 'federation' will return the raw event as receieved over federation. The default is 'client'. QString eventFormat; /// The presence updates to include. - Omittable presence; + Omittable presence; /// The user account data that isn't associated with rooms to include. - Omittable accountData; + Omittable accountData; /// Filters to be applied to room data. Omittable room; }; - QJsonObject toJson(const SyncFilter& pod); + QJsonObject toJson(const Filter& pod); - template <> struct FromJsonObject + template <> struct FromJsonObject { - SyncFilter operator()(const QJsonObject& jo) const; + Filter operator()(const QJsonObject& jo) const; }; } // namespace QMatrixClient diff --git a/lib/csapi/definitions/wellknown/homeserver.cpp b/lib/csapi/definitions/wellknown/homeserver.cpp new file mode 100644 index 00000000..f1482ee4 --- /dev/null +++ b/lib/csapi/definitions/wellknown/homeserver.cpp @@ -0,0 +1,24 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "homeserver.h" + +using namespace QMatrixClient; + +QJsonObject QMatrixClient::toJson(const HomeserverInformation& pod) +{ + QJsonObject jo; + addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl); + return jo; +} + +HomeserverInformation FromJsonObject::operator()(const QJsonObject& jo) const +{ + HomeserverInformation result; + result.baseUrl = + fromJson(jo.value("base_url"_ls)); + + return result; +} + diff --git a/lib/csapi/definitions/wellknown/homeserver.h b/lib/csapi/definitions/wellknown/homeserver.h new file mode 100644 index 00000000..09d6ba63 --- /dev/null +++ b/lib/csapi/definitions/wellknown/homeserver.h @@ -0,0 +1,28 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "converters.h" + + +namespace QMatrixClient +{ + // Data structures + + /// Used by clients to discover homeserver information. + struct HomeserverInformation + { + /// The base URL for the homeserver for client-server connections. + QString baseUrl; + }; + + QJsonObject toJson(const HomeserverInformation& pod); + + template <> struct FromJsonObject + { + HomeserverInformation operator()(const QJsonObject& jo) const; + }; + +} // namespace QMatrixClient diff --git a/lib/csapi/definitions/wellknown/identity_server.cpp b/lib/csapi/definitions/wellknown/identity_server.cpp new file mode 100644 index 00000000..f9d7bc37 --- /dev/null +++ b/lib/csapi/definitions/wellknown/identity_server.cpp @@ -0,0 +1,24 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "identity_server.h" + +using namespace QMatrixClient; + +QJsonObject QMatrixClient::toJson(const IdentityServerInformation& pod) +{ + QJsonObject jo; + addParam<>(jo, QStringLiteral("base_url"), pod.baseUrl); + return jo; +} + +IdentityServerInformation FromJsonObject::operator()(const QJsonObject& jo) const +{ + IdentityServerInformation result; + result.baseUrl = + fromJson(jo.value("base_url"_ls)); + + return result; +} + diff --git a/lib/csapi/definitions/wellknown/identity_server.h b/lib/csapi/definitions/wellknown/identity_server.h new file mode 100644 index 00000000..cb8ffcee --- /dev/null +++ b/lib/csapi/definitions/wellknown/identity_server.h @@ -0,0 +1,28 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "converters.h" + + +namespace QMatrixClient +{ + // Data structures + + /// Used by clients to discover identity server information. + struct IdentityServerInformation + { + /// The base URL for the identity server for client-server connections. + QString baseUrl; + }; + + QJsonObject toJson(const IdentityServerInformation& pod); + + template <> struct FromJsonObject + { + IdentityServerInformation operator()(const QJsonObject& jo) const; + }; + +} // namespace QMatrixClient -- cgit v1.2.3