aboutsummaryrefslogtreecommitdiff
path: root/lib/csapi/rooms.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/csapi/rooms.cpp')
-rw-r--r--lib/csapi/rooms.cpp220
1 files changed, 58 insertions, 162 deletions
diff --git a/lib/csapi/rooms.cpp b/lib/csapi/rooms.cpp
index 0b08ccec..724d941f 100644
--- a/lib/csapi/rooms.cpp
+++ b/lib/csapi/rooms.cpp
@@ -4,117 +4,59 @@
#include "rooms.h"
-#include "converters.h"
-
#include <QtCore/QStringBuilder>
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
+using namespace Quotient;
-class GetOneRoomEventJob::Private
-{
- public:
- EventPtr data;
-};
-
-QUrl GetOneRoomEventJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventId)
+QUrl GetOneRoomEventJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
+ const QString& eventId)
{
return BaseJob::makeRequestUrl(std::move(baseUrl),
- basePath % "/rooms/" % roomId % "/event/" % eventId);
+ QStringLiteral("/_matrix/client/r0")
+ % "/rooms/" % roomId % "/event/"
+ % eventId);
}
-static const auto GetOneRoomEventJobName = QStringLiteral("GetOneRoomEventJob");
+GetOneRoomEventJob::GetOneRoomEventJob(const QString& roomId,
+ const QString& eventId)
+ : BaseJob(HttpVerb::Get, QStringLiteral("GetOneRoomEventJob"),
+ QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
+ % "/event/" % eventId)
+{}
-GetOneRoomEventJob::GetOneRoomEventJob(const QString& roomId, const QString& eventId)
- : BaseJob(HttpVerb::Get, GetOneRoomEventJobName,
- basePath % "/rooms/" % roomId % "/event/" % eventId)
- , d(new Private)
-{
-}
-
-GetOneRoomEventJob::~GetOneRoomEventJob() = default;
-
-EventPtr&& GetOneRoomEventJob::data()
-{
- return std::move(d->data);
-}
-
-BaseJob::Status GetOneRoomEventJob::parseJson(const QJsonDocument& data)
-{
- fromJson(data, d->data);
- return Success;
-}
-
-QUrl GetRoomStateWithKeyJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventType, const QString& stateKey)
+QUrl GetRoomStateWithKeyJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
+ const QString& eventType,
+ const QString& stateKey)
{
return BaseJob::makeRequestUrl(std::move(baseUrl),
- basePath % "/rooms/" % roomId % "/state/" % eventType % "/" % stateKey);
+ QStringLiteral("/_matrix/client/r0")
+ % "/rooms/" % roomId % "/state/"
+ % eventType % "/" % stateKey);
}
-static const auto GetRoomStateWithKeyJobName = QStringLiteral("GetRoomStateWithKeyJob");
-
-GetRoomStateWithKeyJob::GetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey)
- : BaseJob(HttpVerb::Get, GetRoomStateWithKeyJobName,
- basePath % "/rooms/" % roomId % "/state/" % eventType % "/" % stateKey)
-{
-}
-
-QUrl GetRoomStateByTypeJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventType)
-{
- return BaseJob::makeRequestUrl(std::move(baseUrl),
- basePath % "/rooms/" % roomId % "/state/" % eventType);
-}
-
-static const auto GetRoomStateByTypeJobName = QStringLiteral("GetRoomStateByTypeJob");
-
-GetRoomStateByTypeJob::GetRoomStateByTypeJob(const QString& roomId, const QString& eventType)
- : BaseJob(HttpVerb::Get, GetRoomStateByTypeJobName,
- basePath % "/rooms/" % roomId % "/state/" % eventType)
-{
-}
-
-class GetRoomStateJob::Private
-{
- public:
- StateEvents data;
-};
+GetRoomStateWithKeyJob::GetRoomStateWithKeyJob(const QString& roomId,
+ const QString& eventType,
+ const QString& stateKey)
+ : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomStateWithKeyJob"),
+ QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
+ % "/state/" % eventType % "/" % stateKey)
+{}
QUrl GetRoomStateJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
{
return BaseJob::makeRequestUrl(std::move(baseUrl),
- basePath % "/rooms/" % roomId % "/state");
+ QStringLiteral("/_matrix/client/r0")
+ % "/rooms/" % roomId % "/state");
}
-static const auto GetRoomStateJobName = QStringLiteral("GetRoomStateJob");
-
GetRoomStateJob::GetRoomStateJob(const QString& roomId)
- : BaseJob(HttpVerb::Get, GetRoomStateJobName,
- basePath % "/rooms/" % roomId % "/state")
- , d(new Private)
-{
-}
-
-GetRoomStateJob::~GetRoomStateJob() = default;
-
-StateEvents&& GetRoomStateJob::data()
-{
- return std::move(d->data);
-}
+ : BaseJob(HttpVerb::Get, QStringLiteral("GetRoomStateJob"),
+ QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
+ % "/state")
+{}
-BaseJob::Status GetRoomStateJob::parseJson(const QJsonDocument& data)
-{
- fromJson(data, d->data);
- return Success;
-}
-
-class GetMembersByRoomJob::Private
-{
- public:
- EventsArray<RoomMemberEvent> chunk;
-};
-
-BaseJob::Query queryToGetMembersByRoom(const QString& at, const QString& membership, const QString& notMembership)
+auto queryToGetMembersByRoom(const QString& at, const QString& membership,
+ const QString& notMembership)
{
BaseJob::Query _q;
addParam<IfNotEmpty>(_q, QStringLiteral("at"), at);
@@ -123,83 +65,37 @@ BaseJob::Query queryToGetMembersByRoom(const QString& at, const QString& members
return _q;
}
-QUrl GetMembersByRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& at, const QString& membership, const QString& notMembership)
+QUrl GetMembersByRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId,
+ const QString& at,
+ const QString& membership,
+ const QString& notMembership)
{
- return BaseJob::makeRequestUrl(std::move(baseUrl),
- basePath % "/rooms/" % roomId % "/members",
- queryToGetMembersByRoom(at, membership, notMembership));
+ return BaseJob::makeRequestUrl(
+ std::move(baseUrl),
+ QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId % "/members",
+ queryToGetMembersByRoom(at, membership, notMembership));
}
-static const auto GetMembersByRoomJobName = QStringLiteral("GetMembersByRoomJob");
-
-GetMembersByRoomJob::GetMembersByRoomJob(const QString& roomId, const QString& at, const QString& membership, const QString& notMembership)
- : BaseJob(HttpVerb::Get, GetMembersByRoomJobName,
- basePath % "/rooms/" % roomId % "/members",
- queryToGetMembersByRoom(at, membership, notMembership))
- , d(new Private)
-{
-}
-
-GetMembersByRoomJob::~GetMembersByRoomJob() = default;
-
-EventsArray<RoomMemberEvent>&& GetMembersByRoomJob::chunk()
-{
- return std::move(d->chunk);
-}
-
-BaseJob::Status GetMembersByRoomJob::parseJson(const QJsonDocument& data)
-{
- auto json = data.object();
- fromJson(json.value("chunk"_ls), d->chunk);
- return Success;
-}
+GetMembersByRoomJob::GetMembersByRoomJob(const QString& roomId,
+ const QString& at,
+ const QString& membership,
+ const QString& notMembership)
+ : BaseJob(HttpVerb::Get, QStringLiteral("GetMembersByRoomJob"),
+ QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
+ % "/members",
+ queryToGetMembersByRoom(at, membership, notMembership))
+{}
-namespace QMatrixClient
-{
- // Converters
-
- template <> struct JsonObjectConverter<GetJoinedMembersByRoomJob::RoomMember>
- {
- static void fillFrom(const QJsonObject& jo, GetJoinedMembersByRoomJob::RoomMember& result)
- {
- fromJson(jo.value("display_name"_ls), result.displayName);
- fromJson(jo.value("avatar_url"_ls), result.avatarUrl);
- }
- };
-} // namespace QMatrixClient
-
-class GetJoinedMembersByRoomJob::Private
-{
- public:
- QHash<QString, RoomMember> joined;
-};
-
-QUrl GetJoinedMembersByRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId)
+QUrl GetJoinedMembersByRoomJob::makeRequestUrl(QUrl baseUrl,
+ const QString& roomId)
{
return BaseJob::makeRequestUrl(std::move(baseUrl),
- basePath % "/rooms/" % roomId % "/joined_members");
+ QStringLiteral("/_matrix/client/r0")
+ % "/rooms/" % roomId % "/joined_members");
}
-static const auto GetJoinedMembersByRoomJobName = QStringLiteral("GetJoinedMembersByRoomJob");
-
GetJoinedMembersByRoomJob::GetJoinedMembersByRoomJob(const QString& roomId)
- : BaseJob(HttpVerb::Get, GetJoinedMembersByRoomJobName,
- basePath % "/rooms/" % roomId % "/joined_members")
- , d(new Private)
-{
-}
-
-GetJoinedMembersByRoomJob::~GetJoinedMembersByRoomJob() = default;
-
-const QHash<QString, GetJoinedMembersByRoomJob::RoomMember>& GetJoinedMembersByRoomJob::joined() const
-{
- return d->joined;
-}
-
-BaseJob::Status GetJoinedMembersByRoomJob::parseJson(const QJsonDocument& data)
-{
- auto json = data.object();
- fromJson(json.value("joined"_ls), d->joined);
- return Success;
-}
-
+ : BaseJob(HttpVerb::Get, QStringLiteral("GetJoinedMembersByRoomJob"),
+ QStringLiteral("/_matrix/client/r0") % "/rooms/" % roomId
+ % "/joined_members")
+{}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 07:29:21 +0000