From ccf2b4dd9d41b39167379669f035b45d656e3633 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 5 Jan 2018 19:46:41 +0900 Subject: jobs: expect application/json by default; set query in constructor body; properly convert numbers to strings in query The query should be set in constructor body because there's no reason to pass non-required parameters into the query. As for numbers to strings conversion - there was an attempt to use QJsonValue(a).toString() for that. That doesn't work; QJsonValue does not turn numbers to strings. --- jobs/generated/administrative_contact.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'jobs/generated/administrative_contact.cpp') diff --git a/jobs/generated/administrative_contact.cpp b/jobs/generated/administrative_contact.cpp index 584c447f..479bee52 100644 --- a/jobs/generated/administrative_contact.cpp +++ b/jobs/generated/administrative_contact.cpp @@ -44,10 +44,10 @@ class GetAccount3PIDsJob::Private GetAccount3PIDsJob::GetAccount3PIDsJob() : BaseJob(HttpVerb::Get, "GetAccount3PIDsJob", - basePath % "/account/3pid", - Query { } - ), d(new Private) -{ } + basePath % "/account/3pid") + , d(new Private) +{ +} GetAccount3PIDsJob::~GetAccount3PIDsJob() = default; @@ -94,22 +94,17 @@ namespace QMatrixClient Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind) : BaseJob(HttpVerb::Post, "Post3PIDsJob", - basePath % "/account/3pid", - Query { } - ) + basePath % "/account/3pid") { QJsonObject _data; _data.insert("three_pid_creds", toJson(threePidCreds)); _data.insert("bind", toJson(bind)); setRequestData(_data); - - addExpectedContentType("application/json"); } RequestTokenTo3PIDJob::RequestTokenTo3PIDJob() : BaseJob(HttpVerb::Post, "RequestTokenTo3PIDJob", - basePath % "/account/3pid/email/requestToken", - Query { }, Data { }, false - ) -{ } + basePath % "/account/3pid/email/requestToken", false) +{ +} -- cgit v1.2.3