aboutsummaryrefslogtreecommitdiff
path: root/lib/csapi/keys.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/csapi/keys.cpp')
-rw-r--r--lib/csapi/keys.cpp92
1 files changed, 44 insertions, 48 deletions
diff --git a/lib/csapi/keys.cpp b/lib/csapi/keys.cpp
index 6c16a8a3..862366a3 100644
--- a/lib/csapi/keys.cpp
+++ b/lib/csapi/keys.cpp
@@ -15,15 +15,15 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0");
class UploadKeysJob::Private
{
public:
- QHash<QString, int> oneTimeKeyCounts;
+ QHash<QString, int> oneTimeKeyCounts;
};
static const auto UploadKeysJobName = QStringLiteral("UploadKeysJob");
-UploadKeysJob::UploadKeysJob(const Omittable<DeviceKeys>& deviceKeys, const QHash<QString, QVariant>& oneTimeKeys)
- : BaseJob(HttpVerb::Post, UploadKeysJobName,
- basePath % "/keys/upload")
- , d(new Private)
+UploadKeysJob::UploadKeysJob(const Omittable<DeviceKeys>& deviceKeys,
+ const QHash<QString, QVariant>& oneTimeKeys)
+ : BaseJob(HttpVerb::Post, UploadKeysJobName, basePath % "/keys/upload"),
+ d(new Private)
{
QJsonObject _data;
addParam<IfNotEmpty>(_data, QStringLiteral("device_keys"), deviceKeys);
@@ -43,29 +43,29 @@ BaseJob::Status UploadKeysJob::parseJson(const QJsonDocument& data)
auto json = data.object();
if (!json.contains("one_time_key_counts"_ls))
return { JsonParseError,
- "The key 'one_time_key_counts' not found in the response" };
+ "The key 'one_time_key_counts' not found in the response" };
fromJson(json.value("one_time_key_counts"_ls), d->oneTimeKeyCounts);
return Success;
}
-namespace QMatrixClient
-{
+namespace QMatrixClient {
// Converters
- template <> struct JsonObjectConverter<QueryKeysJob::UnsignedDeviceInfo>
- {
- static void fillFrom(const QJsonObject& jo, QueryKeysJob::UnsignedDeviceInfo& result)
+ template <> struct JsonObjectConverter<QueryKeysJob::UnsignedDeviceInfo> {
+ static void fillFrom(const QJsonObject& jo,
+ QueryKeysJob::UnsignedDeviceInfo& result)
{
- fromJson(jo.value("device_display_name"_ls), result.deviceDisplayName);
+ fromJson(jo.value("device_display_name"_ls),
+ result.deviceDisplayName);
}
};
- template <> struct JsonObjectConverter<QueryKeysJob::DeviceInformation>
- {
- static void fillFrom(const QJsonObject& jo, QueryKeysJob::DeviceInformation& result)
+ template <> struct JsonObjectConverter<QueryKeysJob::DeviceInformation> {
+ static void fillFrom(const QJsonObject& jo,
+ QueryKeysJob::DeviceInformation& result)
{
fillFromJson<DeviceKeys>(jo, result);
- fromJson(jo.value("unsigned"_ls), result.unsignedData);
+ fromJson(jo.value("unsigned"_ls), result.unsignedData);
}
};
} // namespace QMatrixClient
@@ -73,16 +73,16 @@ namespace QMatrixClient
class QueryKeysJob::Private
{
public:
- QHash<QString, QJsonObject> failures;
- QHash<QString, QHash<QString, DeviceInformation>> deviceKeys;
+ QHash<QString, QJsonObject> failures;
+ QHash<QString, QHash<QString, DeviceInformation>> deviceKeys;
};
static const auto QueryKeysJobName = QStringLiteral("QueryKeysJob");
-QueryKeysJob::QueryKeysJob(const QHash<QString, QStringList>& deviceKeys, Omittable<int> timeout, const QString& token)
- : BaseJob(HttpVerb::Post, QueryKeysJobName,
- basePath % "/keys/query")
- , d(new Private)
+QueryKeysJob::QueryKeysJob(const QHash<QString, QStringList>& deviceKeys,
+ Omittable<int> timeout, const QString& token)
+ : BaseJob(HttpVerb::Post, QueryKeysJobName, basePath % "/keys/query"),
+ d(new Private)
{
QJsonObject _data;
addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
@@ -98,7 +98,8 @@ const QHash<QString, QJsonObject>& QueryKeysJob::failures() const
return d->failures;
}
-const QHash<QString, QHash<QString, QueryKeysJob::DeviceInformation>>& QueryKeysJob::deviceKeys() const
+const QHash<QString, QHash<QString, QueryKeysJob::DeviceInformation>>&
+QueryKeysJob::deviceKeys() const
{
return d->deviceKeys;
}
@@ -114,16 +115,17 @@ BaseJob::Status QueryKeysJob::parseJson(const QJsonDocument& data)
class ClaimKeysJob::Private
{
public:
- QHash<QString, QJsonObject> failures;
- QHash<QString, QHash<QString, QVariant>> oneTimeKeys;
+ QHash<QString, QJsonObject> failures;
+ QHash<QString, QHash<QString, QVariant>> oneTimeKeys;
};
static const auto ClaimKeysJobName = QStringLiteral("ClaimKeysJob");
-ClaimKeysJob::ClaimKeysJob(const QHash<QString, QHash<QString, QString>>& oneTimeKeys, Omittable<int> timeout)
- : BaseJob(HttpVerb::Post, ClaimKeysJobName,
- basePath % "/keys/claim")
- , d(new Private)
+ClaimKeysJob::ClaimKeysJob(
+ const QHash<QString, QHash<QString, QString>>& oneTimeKeys,
+ Omittable<int> timeout)
+ : BaseJob(HttpVerb::Post, ClaimKeysJobName, basePath % "/keys/claim"),
+ d(new Private)
{
QJsonObject _data;
addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
@@ -138,7 +140,8 @@ const QHash<QString, QJsonObject>& ClaimKeysJob::failures() const
return d->failures;
}
-const QHash<QString, QHash<QString, QVariant>>& ClaimKeysJob::oneTimeKeys() const
+const QHash<QString, QHash<QString, QVariant>>&
+ClaimKeysJob::oneTimeKeys() const
{
return d->oneTimeKeys;
}
@@ -154,8 +157,8 @@ BaseJob::Status ClaimKeysJob::parseJson(const QJsonDocument& data)
class GetKeysChangesJob::Private
{
public:
- QStringList changed;
- QStringList left;
+ QStringList changed;
+ QStringList left;
};
BaseJob::Query queryToGetKeysChanges(const QString& from, const QString& to)
@@ -166,34 +169,28 @@ BaseJob::Query queryToGetKeysChanges(const QString& from, const QString& to)
return _q;
}
-QUrl GetKeysChangesJob::makeRequestUrl(QUrl baseUrl, const QString& from, const QString& to)
+QUrl GetKeysChangesJob::makeRequestUrl(QUrl baseUrl, const QString& from,
+ const QString& to)
{
return BaseJob::makeRequestUrl(std::move(baseUrl),
- basePath % "/keys/changes",
- queryToGetKeysChanges(from, to));
+ basePath % "/keys/changes",
+ queryToGetKeysChanges(from, to));
}
static const auto GetKeysChangesJobName = QStringLiteral("GetKeysChangesJob");
GetKeysChangesJob::GetKeysChangesJob(const QString& from, const QString& to)
- : BaseJob(HttpVerb::Get, GetKeysChangesJobName,
- basePath % "/keys/changes",
- queryToGetKeysChanges(from, to))
- , d(new Private)
+ : BaseJob(HttpVerb::Get, GetKeysChangesJobName, basePath % "/keys/changes",
+ queryToGetKeysChanges(from, to)),
+ d(new Private)
{
}
GetKeysChangesJob::~GetKeysChangesJob() = default;
-const QStringList& GetKeysChangesJob::changed() const
-{
- return d->changed;
-}
+const QStringList& GetKeysChangesJob::changed() const { return d->changed; }
-const QStringList& GetKeysChangesJob::left() const
-{
- return d->left;
-}
+const QStringList& GetKeysChangesJob::left() const { return d->left; }
BaseJob::Status GetKeysChangesJob::parseJson(const QJsonDocument& data)
{
@@ -202,4 +199,3 @@ BaseJob::Status GetKeysChangesJob::parseJson(const QJsonDocument& data)
fromJson(json.value("left"_ls), d->left);
return Success;
}
-