aboutsummaryrefslogtreecommitdiff
path: root/lib/csapi/pushrules.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/csapi/pushrules.cpp')
-rw-r--r--lib/csapi/pushrules.cpp143
1 files changed, 37 insertions, 106 deletions
diff --git a/lib/csapi/pushrules.cpp b/lib/csapi/pushrules.cpp
index cd0fb02d..f2a16f1b 100644
--- a/lib/csapi/pushrules.cpp
+++ b/lib/csapi/pushrules.cpp
@@ -4,92 +4,58 @@
#include "pushrules.h"
-#include "converters.h"
-
#include <QtCore/QStringBuilder>
using namespace Quotient;
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-class GetPushRulesJob::Private {
-public:
- PushRuleset global;
-};
-
QUrl GetPushRulesJob::makeRequestUrl(QUrl baseUrl)
{
- return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/pushrules");
+ return BaseJob::makeRequestUrl(std::move(baseUrl),
+ QStringLiteral("/_matrix/client/r0")
+ % "/pushrules");
}
GetPushRulesJob::GetPushRulesJob()
: BaseJob(HttpVerb::Get, QStringLiteral("GetPushRulesJob"),
- basePath % "/pushrules")
- , d(new Private)
-{}
-
-GetPushRulesJob::~GetPushRulesJob() = default;
-
-const PushRuleset& GetPushRulesJob::global() const { return d->global; }
-
-BaseJob::Status GetPushRulesJob::parseJson(const QJsonDocument& data)
+ QStringLiteral("/_matrix/client/r0") % "/pushrules")
{
- auto json = data.object();
- if (!json.contains("global"_ls))
- return { IncorrectResponse,
- "The key 'global' not found in the response" };
- fromJson(json.value("global"_ls), d->global);
-
- return Success;
+ addExpectedKey("global");
}
-class GetPushRuleJob::Private {
-public:
- PushRule data;
-};
-
QUrl GetPushRuleJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
const QString& kind, const QString& ruleId)
{
- return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/pushrules/"
- % scope % "/" % kind
- % "/" % ruleId);
+ return BaseJob::makeRequestUrl(std::move(baseUrl),
+ QStringLiteral("/_matrix/client/r0")
+ % "/pushrules/" % scope % "/" % kind
+ % "/" % ruleId);
}
GetPushRuleJob::GetPushRuleJob(const QString& scope, const QString& kind,
const QString& ruleId)
: BaseJob(HttpVerb::Get, QStringLiteral("GetPushRuleJob"),
- basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId)
- , d(new Private)
+ QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
+ % kind % "/" % ruleId)
{}
-GetPushRuleJob::~GetPushRuleJob() = default;
-
-const PushRule& GetPushRuleJob::data() const { return d->data; }
-
-BaseJob::Status GetPushRuleJob::parseJson(const QJsonDocument& data)
-{
- fromJson(data, d->data);
-
- return Success;
-}
-
QUrl DeletePushRuleJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
const QString& kind,
const QString& ruleId)
{
- return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/pushrules/"
- % scope % "/" % kind
- % "/" % ruleId);
+ return BaseJob::makeRequestUrl(std::move(baseUrl),
+ QStringLiteral("/_matrix/client/r0")
+ % "/pushrules/" % scope % "/" % kind
+ % "/" % ruleId);
}
DeletePushRuleJob::DeletePushRuleJob(const QString& scope, const QString& kind,
const QString& ruleId)
: BaseJob(HttpVerb::Delete, QStringLiteral("DeletePushRuleJob"),
- basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId)
+ QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
+ % kind % "/" % ruleId)
{}
-BaseJob::Query queryToSetPushRule(const QString& before, const QString& after)
+auto queryToSetPushRule(const QString& before, const QString& after)
{
BaseJob::Query _q;
addParam<IfNotEmpty>(_q, QStringLiteral("before"), before);
@@ -103,27 +69,24 @@ SetPushRuleJob::SetPushRuleJob(const QString& scope, const QString& kind,
const QVector<PushCondition>& conditions,
const QString& pattern)
: BaseJob(HttpVerb::Put, QStringLiteral("SetPushRuleJob"),
- basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId,
+ QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
+ % kind % "/" % ruleId,
queryToSetPushRule(before, after))
{
QJsonObject _data;
addParam<>(_data, QStringLiteral("actions"), actions);
addParam<IfNotEmpty>(_data, QStringLiteral("conditions"), conditions);
addParam<IfNotEmpty>(_data, QStringLiteral("pattern"), pattern);
- setRequestData(_data);
+ setRequestData(std::move(_data));
}
-class IsPushRuleEnabledJob::Private {
-public:
- bool enabled;
-};
-
QUrl IsPushRuleEnabledJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
const QString& kind,
const QString& ruleId)
{
return BaseJob::makeRequestUrl(std::move(baseUrl),
- basePath % "/pushrules/" % scope % "/" % kind
+ QStringLiteral("/_matrix/client/r0")
+ % "/pushrules/" % scope % "/" % kind
% "/" % ruleId % "/enabled");
}
@@ -131,49 +94,31 @@ IsPushRuleEnabledJob::IsPushRuleEnabledJob(const QString& scope,
const QString& kind,
const QString& ruleId)
: BaseJob(HttpVerb::Get, QStringLiteral("IsPushRuleEnabledJob"),
- basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId
- % "/enabled")
- , d(new Private)
-{}
-
-IsPushRuleEnabledJob::~IsPushRuleEnabledJob() = default;
-
-bool IsPushRuleEnabledJob::enabled() const { return d->enabled; }
-
-BaseJob::Status IsPushRuleEnabledJob::parseJson(const QJsonDocument& data)
+ QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
+ % kind % "/" % ruleId % "/enabled")
{
- auto json = data.object();
- if (!json.contains("enabled"_ls))
- return { IncorrectResponse,
- "The key 'enabled' not found in the response" };
- fromJson(json.value("enabled"_ls), d->enabled);
-
- return Success;
+ addExpectedKey("enabled");
}
SetPushRuleEnabledJob::SetPushRuleEnabledJob(const QString& scope,
const QString& kind,
const QString& ruleId, bool enabled)
: BaseJob(HttpVerb::Put, QStringLiteral("SetPushRuleEnabledJob"),
- basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId
- % "/enabled")
+ QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
+ % kind % "/" % ruleId % "/enabled")
{
QJsonObject _data;
addParam<>(_data, QStringLiteral("enabled"), enabled);
- setRequestData(_data);
+ setRequestData(std::move(_data));
}
-class GetPushRuleActionsJob::Private {
-public:
- QStringList actions;
-};
-
QUrl GetPushRuleActionsJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
const QString& kind,
const QString& ruleId)
{
return BaseJob::makeRequestUrl(std::move(baseUrl),
- basePath % "/pushrules/" % scope % "/" % kind
+ QStringLiteral("/_matrix/client/r0")
+ % "/pushrules/" % scope % "/" % kind
% "/" % ruleId % "/actions");
}
@@ -181,24 +126,10 @@ GetPushRuleActionsJob::GetPushRuleActionsJob(const QString& scope,
const QString& kind,
const QString& ruleId)
: BaseJob(HttpVerb::Get, QStringLiteral("GetPushRuleActionsJob"),
- basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId
- % "/actions")
- , d(new Private)
-{}
-
-GetPushRuleActionsJob::~GetPushRuleActionsJob() = default;
-
-const QStringList& GetPushRuleActionsJob::actions() const { return d->actions; }
-
-BaseJob::Status GetPushRuleActionsJob::parseJson(const QJsonDocument& data)
+ QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
+ % kind % "/" % ruleId % "/actions")
{
- auto json = data.object();
- if (!json.contains("actions"_ls))
- return { IncorrectResponse,
- "The key 'actions' not found in the response" };
- fromJson(json.value("actions"_ls), d->actions);
-
- return Success;
+ addExpectedKey("actions");
}
SetPushRuleActionsJob::SetPushRuleActionsJob(const QString& scope,
@@ -206,10 +137,10 @@ SetPushRuleActionsJob::SetPushRuleActionsJob(const QString& scope,
const QString& ruleId,
const QStringList& actions)
: BaseJob(HttpVerb::Put, QStringLiteral("SetPushRuleActionsJob"),
- basePath % "/pushrules/" % scope % "/" % kind % "/" % ruleId
- % "/actions")
+ QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
+ % kind % "/" % ruleId % "/actions")
{
QJsonObject _data;
addParam<>(_data, QStringLiteral("actions"), actions);
- setRequestData(_data);
+ setRequestData(std::move(_data));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 18:53:14 +0000