From c28211698b8f9b82cafc0f9d9457e40c6c17632a Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sun, 20 Aug 2017 18:56:58 +0900 Subject: Added files to (eventually) generate *Job classes automatically KitsuneRal/api-generator project is a place where all the heavy lifting will (eventually) be implemented. This commit marks a point when the generated files at least compile (whether they work is not tested yet). Return values are so far entirely ignored. --- CMakeLists.txt | 4 ++- jobs/apigen.yaml | 54 ++++++++++++++++++++++++++++ jobs/converters.h | 88 ++++++++++++++++++++++++++++++++++++++++++++++ jobs/preamble.mustache | 18 ++++++++++ jobs/{{base}}.cpp.mustache | 75 +++++++++++++++++++++++++++++++++++++++ jobs/{{base}}.h.mustache | 65 ++++++++++++++++++++++++++++++++++ 6 files changed, 303 insertions(+), 1 deletion(-) create mode 100644 jobs/apigen.yaml create mode 100644 jobs/converters.h create mode 100644 jobs/preamble.mustache create mode 100644 jobs/{{base}}.cpp.mustache create mode 100644 jobs/{{base}}.h.mustache diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a345e06..4bf47f71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,9 @@ set(libqmatrixclient_SRCS set(example_SRCS examples/qmc-example.cpp) -add_library(qmatrixclient ${libqmatrixclient_SRCS}) +file (STRINGS jobs/generated/apifiles.txt libqmatrixclient_job_SRCS REGEX "\\.cpp$") + +add_library(qmatrixclient ${libqmatrixclient_SRCS} ${libqmatrixclient_job_SRCS}) set_property(TARGET qmatrixclient PROPERTY VERSION "0.0.0") set_property(TARGET qmatrixclient PROPERTY SOVERSION 0 ) diff --git a/jobs/apigen.yaml b/jobs/apigen.yaml new file mode 100644 index 00000000..7ae1de81 --- /dev/null +++ b/jobs/apigen.yaml @@ -0,0 +1,54 @@ +env: + preamble: preamble.mustache + copyrightName: Kitsune Ral + copyrightEmail: + imports: { set: } + returnFile?: { bool: false } + +templates: +- "{{base}}.h.mustache" +- "{{base}}.cpp.mustache" + +outFilesList: apifiles.txt + +# Structure: +# swaggerType: +# OR +# swaggerType: +# - swaggerFormat: +# - /swaggerFormatRegEx/: +# - //: # default, if the format doesn't mach anything above +# WHERE +# targetTypeSpec = targetType OR +# { type: targetType, imports: , } +types: + integer: + - int64: qint64 + - int32: qint32 + - //: int + number: + - float: float + - double: double + boolean: bool + string: + - /byte|binary/: { type: QByteArray, imports: } + - date: + type: QDate + avoidCopy?: true + imports: + - dateTime: + type: QDateTime + avoidCopy?: true + imports: + - //: { type: QString, imports: } + file: + type: QByteArray + imports: + returnFile?: true + name: data + "[]": { type: "QVector<{{type}}>", imports: } + "{}": + type: "QHash" + imports: [ , ] + +operations: \ No newline at end of file diff --git a/jobs/converters.h b/jobs/converters.h new file mode 100644 index 00000000..b52cfaa2 --- /dev/null +++ b/jobs/converters.h @@ -0,0 +1,88 @@ +/****************************************************************************** +* Copyright (C) 2017 Kitsune Ral +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#pragma once + +#include +#include +#include + +namespace QMatrixClient +{ + template + inline QJsonValue toJson(T val) + { + return QJsonValue(val); + } + + template + inline QJsonValue toJson(const QVector& vals) + { + QJsonArray ar; + std::copy(vals.begin(), vals.end(), std::back_inserter(ar)); + return ar; + } + + inline QJsonValue toJson(const QStringList& strings) + { + return QJsonArray::fromStringList(strings); + } + + template + inline T fromJson(const QJsonValue& jv) + { + return QVariant(jv).value(); + } + + template <> + inline int fromJson(const QJsonValue& jv) + { + return jv.toInt(); + } + + template <> + inline qint64 fromJson(const QJsonValue& jv) + { + return static_cast(jv.toDouble()); + } + + template <> + inline double fromJson(const QJsonValue& jv) + { + return jv.toDouble(); + } + + template <> + inline QString fromJson(const QJsonValue& jv) + { + return jv.toString(); + } + + template <> + inline QDateTime fromJson(const QJsonValue& jv) + { + return QDateTime::fromMSecsSinceEpoch(fromJson(jv), Qt::UTC); + } + + template <> + inline QDate fromJson(const QJsonValue& jv) + { + return QDateTime::fromMSecsSinceEpoch( + fromJson(jv), Qt::UTC).date(); + } +} // namespace QMatrixClient \ No newline at end of file diff --git a/jobs/preamble.mustache b/jobs/preamble.mustache new file mode 100644 index 00000000..f14d58d2 --- /dev/null +++ b/jobs/preamble.mustache @@ -0,0 +1,18 @@ +/****************************************************************************** +* Copyright (C) 2016-2017 {{copyrightName}} {{copyrightEmail}} +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache new file mode 100644 index 00000000..05c865b3 --- /dev/null +++ b/jobs/{{base}}.cpp.mustache @@ -0,0 +1,75 @@ +{{#@filePartial}}preamble{{/@filePartial}} + +#include "{{filenameBase}}.h" + +{{#operations}} +#include "../converters.h" + +#include + +using namespace QMatrixClient; + + {{#returns?}} +class {{#@cap}}{{operationId}}{{/@cap}}Job::Private +{ + public: + {{#returns}} + {{type}} {{name}}; + {{/returns}} +}; + {{/returns?}} + + {{#operation}} +{{#@cap}}{{operationId}}{{/@cap}}Job::{{#@cap}}{{operationId}}{{/@cap}}Job(const ConnectionData* connection{{#allParams}}, {{!}} + {{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}} + {{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}} + {{/allParams}}) + : BaseJob(connection, HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{#@cap}}{{operationId}}{{/@cap}}Job" + , {{#pathParts}}{{part}}{{#hasMore}} % {{/hasMore}}{{/pathParts}} + , Query { {{#queryParams}} + { "{{baseName}}", toJson({{paramName}}).toString() }{{#hasMore}}, {{/hasMore}} + {{/queryParams}} } + , Data { {{#bodyParams}} + { "{{baseName}}", toJson({{paramName}}) }{{#hasMore}}, {{/hasMore}} + {{/bodyParams}} } + {{#skipAuth}}, false{{/skipAuth}} + ){{#returns?}}, d(new Private){{/returns?}} +{ } + {{/operation}} + + {{#returns?}} +{{className}}Job::~{{className}}Job() +{ + delete d; +} + + {{#returns}} +{{type}} {{className}}Job::{{name}}() const +{ + return d->{{name}}; +} + {{/returns}} + + {{#returnFile?}} +BaseJob::Status {{className}}Job::parseReply(QByteArray data) +{ + {{#returns}}{{name}}{{/returns}} = data; + return Success; +} + {{/returnFile?}} + {{^returnFile?}} +BaseJob::Status {{className}}Job::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + {{#returns}} + {{#required?}} + if (!json.contains("{{name}}") + return { JsonParseError, "{{name}} not found in the response" }; + {{/required?}} + d->{{name}} = fromJson<{{type}}>(json.value("{{name}}")); + {{/returns}} + return Success; +} + {{/returnFile?}} + {{/returns?}} +{{/operations}} diff --git a/jobs/{{base}}.h.mustache b/jobs/{{base}}.h.mustache new file mode 100644 index 00000000..6fb9caef --- /dev/null +++ b/jobs/{{base}}.h.mustache @@ -0,0 +1,65 @@ +{{#@filePartial}}preamble{{/@filePartial}} + +#pragma once + +{{#operations}} +#include "../basejob.h" +{{/operations}} + +{{#imports}} +#include {{.}} +{{/imports}} + +{{#models}} +#include {{! FIXME: This should probably go inside imports }} +{{/models}} + +namespace QMatrixClient +{ +{{#models}} + // Data structures + {{#model}} + struct {{classname}} + { + {{#vars}} + {{datatype}} {{name}}; + {{/vars}} + operator QJsonValue() const { return {}; } + }; + {{/model}} +{{/models}} +{{#operations}} + // Operations + {{#operation}} + class {{#@cap}}{{operationId}}{{/@cap}}Job : public BaseJob + { + public: + {{#@cap}}{{operationId}}{{/@cap}}Job(const ConnectionData* connection + {{#allParams}} + , {{!}} + {{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}} + {{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}} + {{/allParams}}); + {{#returns?}} + virtual {{className}}Job(); + + {{#returns}} + {{type}} {{name}}() const; + {{/returns}} + + protected: + {{#returnFile?}} + Status parseReply(QByteArray data) override; + {{/returnFile?}} + {{^returnFile}} + Status parseJson(const JsonDocument& data) override; + {{/returnFile}} + + private: + class Private; + Private* d; + {{/returns?}} + }; + {{/operation}} +{{/operations}} +} // namespace QMatrixClient -- cgit v1.2.3 From 206976c56013067593f006d621fd4f34475d5ce0 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 1 Sep 2017 19:43:45 +0900 Subject: Added (so far unused) preprocessing section to apigen.yaml --- jobs/apigen.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jobs/apigen.yaml b/jobs/apigen.yaml index 7ae1de81..8bb61d39 100644 --- a/jobs/apigen.yaml +++ b/jobs/apigen.yaml @@ -1,3 +1,7 @@ +preprocess: + "%CLIENT_RELEASE_LABEL%": r0 + "%CLIENT_MAJOR_VERSION%": r0 + env: preamble: preamble.mustache copyrightName: Kitsune Ral -- cgit v1.2.3 From f72923d2d82ca463bba22e8c97f225f54113ed68 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sun, 3 Sep 2017 17:53:46 +0900 Subject: CMakeLists: add_custom_target(update-api), aux_source_directory to load files list - cmake --target update-api can be used to update the api files - aux_source_directory() is used to enumerate generated files instead of apifiles.txt (we wouldn't be able to rerun CMake on the changed files list anyway). --- CMakeLists.txt | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bf47f71..257c5ee5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,9 +83,21 @@ set(libqmatrixclient_SRCS jobs/logoutjob.cpp ) -set(example_SRCS examples/qmc-example.cpp) +if (MATRIX_DOC_PATH AND APIGEN_PATH) + add_custom_target(update-api + ${APIGEN_PATH} --config jobs/apigen.yaml --out jobs/generated + ${MATRIX_DOC_PATH}/api/client-server + content-repo.yaml- cas_login_redirect.yaml- cas_login_ticket.yaml- + old_sync.yaml- room_initial_sync.yaml- + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + SOURCES jobs/apigen.yaml jobs/{{base}}.h.mustache jobs/{{base}}.cpp.mustache + VERBATIM + ) +endif() -file (STRINGS jobs/generated/apifiles.txt libqmatrixclient_job_SRCS REGEX "\\.cpp$") +aux_source_directory(jobs/generated libqmatrixclient_job_SRCS) + +set(example_SRCS examples/qmc-example.cpp) add_library(qmatrixclient ${libqmatrixclient_SRCS} ${libqmatrixclient_job_SRCS}) set_property(TARGET qmatrixclient PROPERTY VERSION "0.0.0") -- cgit v1.2.3 From 8ebadee2e44a05c8329c934005249bd7eabcb88d Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sun, 3 Sep 2017 18:31:20 +0900 Subject: Try to introduce api-generator to Travis CI --- .travis.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24a182cf..394282ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,24 @@ language: cpp + matrix: include: - - os: linux - dist: trusty - compiler: gcc - - os: linux - dist: trusty - compiler: clang + - { os: linux, dist: trusty, compiler: gcc } + - { os: linux, dist: trusty, compiler: clang } - os: osx + install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; else sudo apt-get update -qq; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install qt5; export PATH="$PATH:/usr/local/opt/qt/bin"; else sudo apt-get install -y qt5-default; fi + - git clone https://github.com/matrix.org/matrix-doc + - git clone https://github.com/KitsuneRal/api-generator + - cd api-generator && mkdir build && cd build && cmake .. && cmake --target all + +before_script: - mkdir build && cd build - - cmake .. -script: - - cmake --build . --target all + - cmake -DMATRIX_DOC_PATH="matrix-doc" -DAPIGEN_PATH="api-generator/build/api-generator" .. + +script: cmake --build . --target all + notifications: webhooks: urls: -- cgit v1.2.3 From 7b22c356aca065acb04d1c4fa96d878bf6b36757 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sun, 3 Sep 2017 18:34:46 +0900 Subject: Travis CI: build in containers, use newer compilers api-generator only builds on newer compilers (GCC 5, Clang 3.8). Qt version is unchanged. --- .travis.yml | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 394282ef..99e78096 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,38 @@ language: cpp +addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.8 + packages: + - g++-5 + - clang-3.8 + - qt5-default + matrix: include: - - { os: linux, dist: trusty, compiler: gcc } - - { os: linux, dist: trusty, compiler: clang } - - os: osx + - os: linux + env: [ ENV_EVAL="CC=gcc-5 && CXX=g++-5" ] + - os: linux + env: [ ENV_EVAL="CC=clang-3.8 && CXX=clang++-3.8" ] + - os: osx + env: [ ENV_EVAL="brew update && brew install qt5 && CMAKE_PREFIX_PATH=/usr/local/opt/qt" ] install: - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; else sudo apt-get update -qq; fi - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install qt5; export PATH="$PATH:/usr/local/opt/qt/bin"; else sudo apt-get install -y qt5-default; fi - - git clone https://github.com/matrix.org/matrix-doc - - git clone https://github.com/KitsuneRal/api-generator - - cd api-generator && mkdir build && cd build && cmake .. && cmake --target all +- eval "${ENV_EVAL}" +- git clone https://github.com/matrix-org/matrix-doc.git +- git clone --recursive https://github.com/KitsuneRal/api-generator.git +- pushd api-generator +- cmake -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} . +- cmake --build . +- popd before_script: - - mkdir build && cd build - - cmake -DMATRIX_DOC_PATH="matrix-doc" -DAPIGEN_PATH="api-generator/build/api-generator" .. +- mkdir build && cd build +- cmake -DMATRIX_DOC_PATH="matrix-doc" -DAPIGEN_PATH="api-generator/api-generator" -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} .. -script: cmake --build . --target all +script: cmake --build . notifications: webhooks: -- cgit v1.2.3 From fd4ee6b9eb083d25f701cede70922d7f54643cad Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 4 Sep 2017 13:19:57 +0900 Subject: Generate job files on every Travis build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 99e78096..ae016c88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ install: before_script: - mkdir build && cd build - cmake -DMATRIX_DOC_PATH="matrix-doc" -DAPIGEN_PATH="api-generator/api-generator" -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} .. +- cmake --build . --target update-api script: cmake --build . -- cgit v1.2.3 From cb56a6aa547307e33caf43173f628ea855a4366d Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 4 Sep 2017 13:28:28 +0900 Subject: Use QMatrixClient's fork of matrix-doc in the meantime Because only the fork contains operationId's yet. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ae016c88..b8917ef1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: install: - eval "${ENV_EVAL}" -- git clone https://github.com/matrix-org/matrix-doc.git +- git clone https://github.com/QMatrixClient/matrix-doc.git - git clone --recursive https://github.com/KitsuneRal/api-generator.git - pushd api-generator - cmake -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} . -- cgit v1.2.3 From c5ed011aa13d08d62e999fc6b5ff142a2bc07421 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 7 Sep 2017 15:35:43 +0900 Subject: Actually use the types map in apigen.yaml --- jobs/apigen.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/jobs/apigen.yaml b/jobs/apigen.yaml index 8bb61d39..ba699b12 100644 --- a/jobs/apigen.yaml +++ b/jobs/apigen.yaml @@ -32,10 +32,11 @@ types: - //: int number: - float: float - - double: double + - //: double boolean: bool string: - - /byte|binary/: { type: QByteArray, imports: } + - byte: &QByteArray { type: QByteArray, imports: } + - binary: *QByteArray - date: type: QDate avoidCopy?: true @@ -48,11 +49,8 @@ types: file: type: QByteArray imports: - returnFile?: true - name: data - "[]": { type: "QVector<{{type}}>", imports: } - "{}": - type: "QHash" - imports: [ , ] + "returnFile?": true + object: { type: QJsonObject, "avoidCopy?": true, imports: } + array: { type: "QVector<{{1}}>", "avoidCopy?": true, imports: } operations: \ No newline at end of file -- cgit v1.2.3 From e3ae4840e3082cbd30b4f699ef142787187ef688 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 30 May 2017 08:56:59 +0900 Subject: Connection: Room and User factories are std::functions now Instead of createUser() and createRoom() virtual functions, use std::function<> to store predefined lambdas that would create respective descendants from User and Room, respectively. No more need QuaternionConnection just for the sake of creating a QuaternionRoom. --- connection.cpp | 16 ++++++---------- connection.h | 29 +++++++++++++++++++---------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/connection.cpp b/connection.cpp index 7920125d..2c9ee88a 100644 --- a/connection.cpp +++ b/connection.cpp @@ -238,7 +238,7 @@ User* Connection::user(const QString& userId) { if( d->userMap.contains(userId) ) return d->userMap.value(userId); - User* user = createUser(userId); + auto* user = createUser(this, userId); d->userMap.insert(userId, user); return user; } @@ -297,7 +297,7 @@ Room* Connection::provideRoom(const QString& id) return d->roomMap.value(id); // Not yet in the map, create a new one. - Room* room = createRoom(id); + auto* room = createRoom(this, id); if (room) { d->roomMap.insert( id, room ); @@ -309,15 +309,11 @@ Room* Connection::provideRoom(const QString& id) return room; } -User* Connection::createUser(const QString& userId) -{ - return new User(userId, this); -} +std::function Connection::createRoom = + [](Connection* c, const QString& id) { return new Room(c, id); }; -Room* Connection::createRoom(const QString& roomId) -{ - return new Room(this, roomId); -} +std::function Connection::createUser = + [](Connection* c, const QString& id) { return new User(id, c); }; QByteArray Connection::generateTxnId() { diff --git a/connection.h b/connection.h index 0b8500b9..4b0413e3 100644 --- a/connection.h +++ b/connection.h @@ -22,6 +22,8 @@ #include #include +#include + namespace QMatrixClient { class Room; @@ -96,6 +98,20 @@ namespace QMatrixClient */ Q_INVOKABLE QByteArray generateTxnId(); + template + static void setRoomType() + { + createRoom = + [](Connection* c, const QString& id) { return new T(c, id); }; + } + + template + static void setUserType() + { + createUser = + [](Connection* c, const QString& id) { return new T(id, c); }; + } + signals: void resolved(); void connected(); @@ -130,18 +146,11 @@ namespace QMatrixClient */ Room* provideRoom(const QString& roomId); - /** - * makes it possible for derived classes to have its own User class - */ - virtual User* createUser(const QString& userId); - - /** - * makes it possible for derived classes to have its own Room class - */ - virtual Room* createRoom(const QString& roomId); - private: class Private; Private* d; + + static std::function createRoom; + static std::function createUser; }; } // namespace QMatrixClient -- cgit v1.2.3 From c87b4d9dcaacd932cbb7e4a9dca00c55b6338eef Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 8 Sep 2017 18:36:44 +0900 Subject: Better toJson for container objects The previous version couldn't deal with containers of objects that have no implicit conversion to QJsonValue. The current one can. --- jobs/converters.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jobs/converters.h b/jobs/converters.h index b52cfaa2..376dfeab 100644 --- a/jobs/converters.h +++ b/jobs/converters.h @@ -34,7 +34,8 @@ namespace QMatrixClient inline QJsonValue toJson(const QVector& vals) { QJsonArray ar; - std::copy(vals.begin(), vals.end(), std::back_inserter(ar)); + for (const auto& v: vals) + ar.push_back(toJson(v)); return ar; } -- cgit v1.2.3 From 9852ef0b8aa1033328b313f6f78232f5670f00df Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 8 Sep 2017 22:39:42 +0900 Subject: Prepend basePath to produce endpoint paths correctly --- jobs/{{base}}.cpp.mustache | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index 05c865b3..c9b0eb5e 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -19,13 +19,14 @@ class {{#@cap}}{{operationId}}{{/@cap}}Job::Private }; {{/returns?}} +static const auto basePath = QStringLiteral("{{basePathWithoutHost}}"); + {{#operation}} {{#@cap}}{{operationId}}{{/@cap}}Job::{{#@cap}}{{operationId}}{{/@cap}}Job(const ConnectionData* connection{{#allParams}}, {{!}} - {{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}} - {{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}} + {{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}}{{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}} {{/allParams}}) : BaseJob(connection, HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{#@cap}}{{operationId}}{{/@cap}}Job" - , {{#pathParts}}{{part}}{{#hasMore}} % {{/hasMore}}{{/pathParts}} + , basePath{{#pathParts}} % {{part}}{{/pathParts}} , Query { {{#queryParams}} { "{{baseName}}", toJson({{paramName}}).toString() }{{#hasMore}}, {{/hasMore}} {{/queryParams}} } -- cgit v1.2.3 From 788e4f0af51d415053061f303b290a01633bb6c8 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 9 Sep 2017 20:02:15 +0900 Subject: apigen.yaml: cleanup Commented out parts that aren't used yet; moved the whole 'env:' section down below (because it's used by Printer rather than Analyzer or Translator). --- jobs/apigen.yaml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/jobs/apigen.yaml b/jobs/apigen.yaml index ba699b12..69662a5d 100644 --- a/jobs/apigen.yaml +++ b/jobs/apigen.yaml @@ -2,19 +2,6 @@ preprocess: "%CLIENT_RELEASE_LABEL%": r0 "%CLIENT_MAJOR_VERSION%": r0 -env: - preamble: preamble.mustache - copyrightName: Kitsune Ral - copyrightEmail: - imports: { set: } - returnFile?: { bool: false } - -templates: -- "{{base}}.h.mustache" -- "{{base}}.cpp.mustache" - -outFilesList: apifiles.txt - # Structure: # swaggerType: # OR @@ -53,4 +40,18 @@ types: object: { type: QJsonObject, "avoidCopy?": true, imports: } array: { type: "QVector<{{1}}>", "avoidCopy?": true, imports: } -operations: \ No newline at end of file +#operations: + +env: +# preamble: preamble.mustache + copyrightName: Kitsune Ral + copyrightEmail: +# imports: { set: } +# returnFile?: { bool: false } + +templates: +- "{{base}}.h.mustache" +- "{{base}}.cpp.mustache" + +#outFilesList: apifiles.txt + -- cgit v1.2.3 From 1c86ff91b5db9bd6757e8149df462d4247fef90c Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 9 Sep 2017 20:14:08 +0900 Subject: First files made by api-generator Actual usage will some with the next commit. --- jobs/generated/inviting.cpp | 37 +++++++++++++++++++++++++++++++++++++ jobs/generated/inviting.h | 42 ++++++++++++++++++++++++++++++++++++++++++ jobs/generated/kicking.cpp | 41 +++++++++++++++++++++++++++++++++++++++++ jobs/generated/kicking.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+) create mode 100644 jobs/generated/inviting.cpp create mode 100644 jobs/generated/inviting.h create mode 100644 jobs/generated/kicking.cpp create mode 100644 jobs/generated/kicking.h diff --git a/jobs/generated/inviting.cpp b/jobs/generated/inviting.cpp new file mode 100644 index 00000000..e5e7f410 --- /dev/null +++ b/jobs/generated/inviting.cpp @@ -0,0 +1,37 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "inviting.h" + + +#include "../converters.h" + +#include + +using namespace QMatrixClient; + + + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + + +InviteUserJob::InviteUserJob(const ConnectionData* connection, + QString roomId + , + QString user_id + ) + : BaseJob(connection, HttpVerb::Post, "InviteUserJob" + , basePath % "/rooms/" % roomId % "/invite" + , Query { } + , Data { + { "user_id", toJson(user_id) } + } + + ) +{ } + + + + diff --git a/jobs/generated/inviting.h b/jobs/generated/inviting.h new file mode 100644 index 00000000..af5a426d --- /dev/null +++ b/jobs/generated/inviting.h @@ -0,0 +1,42 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + + +#include "../basejob.h" + + + +#include + + + + +namespace QMatrixClient +{ + + + // Operations + + /** + + */ + class InviteUserJob : public BaseJob + { + public: + InviteUserJob(const ConnectionData* connection + + , + QString roomId + + , + QString user_id + ); + + }; + + +} // namespace QMatrixClient diff --git a/jobs/generated/kicking.cpp b/jobs/generated/kicking.cpp new file mode 100644 index 00000000..726f6fb0 --- /dev/null +++ b/jobs/generated/kicking.cpp @@ -0,0 +1,41 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "kicking.h" + + +#include "../converters.h" + +#include + +using namespace QMatrixClient; + + + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + + +KickJob::KickJob(const ConnectionData* connection, + QString roomId + , + QString user_id + , + QString reason + ) + : BaseJob(connection, HttpVerb::Post, "KickJob" + , basePath % "/rooms/" % roomId % "/kick" + , Query { } + , Data { + { "user_id", toJson(user_id) }, + + { "reason", toJson(reason) } + } + + ) +{ } + + + + diff --git a/jobs/generated/kicking.h b/jobs/generated/kicking.h new file mode 100644 index 00000000..7b183b08 --- /dev/null +++ b/jobs/generated/kicking.h @@ -0,0 +1,45 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + + +#include "../basejob.h" + + + +#include + + + + +namespace QMatrixClient +{ + + + // Operations + + /** + + */ + class KickJob : public BaseJob + { + public: + KickJob(const ConnectionData* connection + + , + QString roomId + + , + QString user_id + + , + QString reason + ); + + }; + + +} // namespace QMatrixClient -- cgit v1.2.3 From 442470d4fcc565d54086caecdb07e9a046b26333 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 9 Sep 2017 20:17:42 +0900 Subject: Kicking, inviting, exposing rooms in Invite state Kicking and inviting use generated job classes. Rooms in Invite state are stored separately in the hash from those in Join/Leave state because The Spec says so. For clients, this means that the same room may appear twice in the rooms map if it's been left and then the user was again invited to it. The code in Quaternion that properly processes this will arrive shortly. --- connection.cpp | 69 ++++++++++++++++++++++++++++++++++---------------------- connection.h | 18 +++++++++++---- jobs/syncjob.cpp | 5 ++-- jobs/syncjob.h | 1 - room.cpp | 23 +++++++++++++++---- room.h | 5 +++- 6 files changed, 80 insertions(+), 41 deletions(-) diff --git a/connection.cpp b/connection.cpp index 2c9ee88a..5d8a42e3 100644 --- a/connection.cpp +++ b/connection.cpp @@ -50,7 +50,11 @@ class Connection::Private Connection* q; ConnectionData* data; - QHash roomMap; + // A complex key below is a pair of room name and whether its + // state is Invited. The spec mandates to keep Invited room state + // separately so we should, e.g., keep objects for Invite and + // Leave state of the same room. + QHash, Room*> roomMap; QHash userMap; QString username; QString password; @@ -160,7 +164,7 @@ void Connection::sync(int timeout) d->data->setLastEvent(job->nextBatch()); for( auto&& roomData: job->takeRoomData() ) { - if ( auto* r = provideRoom(roomData.roomId) ) + if ( auto* r = provideRoom(roomData.roomId, roomData.joinState) ) r->updateData(std::move(roomData)); } d->syncJob = nullptr; @@ -197,20 +201,12 @@ PostReceiptJob* Connection::postReceipt(Room* room, RoomEvent* event) const JoinRoomJob* Connection::joinRoom(const QString& roomAlias) { - auto job = callApi(roomAlias); - connect( job, &BaseJob::success, [=] () { - if ( Room* r = provideRoom(job->roomId()) ) - emit joinedRoom(r); - }); - return job; + return callApi(roomAlias); } void Connection::leaveRoom(Room* room) { - auto job = callApi(room->id()); - connect( job, &BaseJob::success, [=] () { - emit leftRoom(room); - }); + callApi(room->id()); } RoomMessagesJob* Connection::getMessages(Room* room, const QString& from) const @@ -275,7 +271,7 @@ int Connection::millisToReconnect() const return d->syncJob ? d->syncJob->millisToRetry() : 0; } -QHash< QString, Room* > Connection::roomMap() const +const QHash< QPair, Room* >& Connection::roomMap() const { return d->roomMap; } @@ -285,36 +281,55 @@ const ConnectionData* Connection::connectionData() const return d->data; } -Room* Connection::provideRoom(const QString& id) +Room* Connection::provideRoom(const QString& id, JoinState joinState) { + // TODO: This whole function is a strong case for a RoomManager class. if (id.isEmpty()) { qCDebug(MAIN) << "Connection::provideRoom() with empty id, doing nothing"; return nullptr; } - if (d->roomMap.contains(id)) - return d->roomMap.value(id); - - // Not yet in the map, create a new one. - auto* room = createRoom(this, id); - if (room) + const auto roomKey = qMakePair(id, joinState == JoinState::Invite); + auto* room = d->roomMap.value(roomKey, nullptr); + if (!room) { - d->roomMap.insert( id, room ); + room = createRoom(this, id, joinState); + if (!room) + { + qCritical() << "Failed to create a room!!!" << id; + return nullptr; + } + qCDebug(MAIN) << "Created Room" << id << ", invited:" << roomKey.second; + + d->roomMap.insert(roomKey, room); emit newRoom(room); - } else { - qCritical() << "Failed to create a room!!!" << id; + } + else if (room->joinState() != joinState) + { + room->setJoinState(joinState); + if (joinState == JoinState::Leave) + emit leftRoom(room); + else if (joinState == JoinState::Join) + emit joinedRoom(room); + } + + if (joinState != JoinState::Invite && d->roomMap.contains({id, true})) + { + // Preempt the Invite room after it's been acted upon (joined or left). + qCDebug(MAIN) << "Deleting invited state"; + delete d->roomMap.take({id, true}); } return room; } -std::function Connection::createRoom = - [](Connection* c, const QString& id) { return new Room(c, id); }; +Connection::room_factory_t Connection::createRoom = + [](Connection* c, const QString& id, JoinState joinState) + { return new Room(c, id, joinState); }; -std::function Connection::createUser = +Connection::user_factory_t Connection::createUser = [](Connection* c, const QString& id) { return new User(id, c); }; - QByteArray Connection::generateTxnId() { return d->data->generateTxnId(); diff --git a/connection.h b/connection.h index 4b0413e3..b118ffb0 100644 --- a/connection.h +++ b/connection.h @@ -18,6 +18,8 @@ #pragma once +#include "joinstate.h" + #include #include #include @@ -41,11 +43,16 @@ namespace QMatrixClient class Connection: public QObject { Q_OBJECT public: + using room_factory_t = + std::function; + using user_factory_t = + std::function; + explicit Connection(const QUrl& server, QObject* parent = nullptr); Connection(); virtual ~Connection(); - QHash roomMap() const; + const QHash, Room*>& roomMap() const; Q_INVOKABLE virtual void resolveServer(const QString& domain); Q_INVOKABLE virtual void connectToServer(const QString& user, @@ -102,7 +109,8 @@ namespace QMatrixClient static void setRoomType() { createRoom = - [](Connection* c, const QString& id) { return new T(c, id); }; + [](Connection* c, const QString& id, JoinState joinState) + { return new T(c, id, joinState); }; } template @@ -144,13 +152,13 @@ namespace QMatrixClient * @return a pointer to a Room object with the specified id; nullptr * if roomId is empty if createRoom() failed to create a Room object. */ - Room* provideRoom(const QString& roomId); + Room* provideRoom(const QString& roomId, JoinState joinState); private: class Private; Private* d; - static std::function createRoom; - static std::function createUser; + static room_factory_t createRoom; + static user_factory_t createUser; }; } // namespace QMatrixClient diff --git a/jobs/syncjob.cpp b/jobs/syncjob.cpp index 29ddc2e6..38cfcb2a 100644 --- a/jobs/syncjob.cpp +++ b/jobs/syncjob.cpp @@ -99,15 +99,14 @@ SyncRoomData::SyncRoomData(const QString& roomId_, JoinState joinState_, const QJsonObject& room_) : roomId(roomId_) , joinState(joinState_) - , state("state") + , state(joinState == JoinState::Invite ? "invite_state" : "state") , timeline("timeline") , ephemeral("ephemeral") , accountData("account_data") - , inviteState("invite_state") { switch (joinState) { case JoinState::Invite: - inviteState.fromJson(room_); + state.fromJson(room_); break; case JoinState::Join: state.fromJson(room_); diff --git a/jobs/syncjob.h b/jobs/syncjob.h index 07824e23..57a87c9f 100644 --- a/jobs/syncjob.h +++ b/jobs/syncjob.h @@ -51,7 +51,6 @@ namespace QMatrixClient Batch timeline; Batch ephemeral; Batch accountData; - Batch inviteState; bool timelineLimited; QString timelinePrevBatch; diff --git a/room.cpp b/room.cpp index 547b74c4..78e5b80d 100644 --- a/room.cpp +++ b/room.cpp @@ -18,6 +18,9 @@ #include "room.h" +#include "jobs/generated/kicking.h" +#include "jobs/generated/inviting.h" + #include #include @@ -48,9 +51,9 @@ class Room::Private typedef QMultiHash members_map_t; typedef std::pair rev_iter_pair_t; - Private(Connection* c, QString id_) + Private(Connection* c, QString id_, JoinState initialJoinState) : q(nullptr), connection(c), id(std::move(id_)) - , joinState(JoinState::Join), unreadMessages(false) + , joinState(initialJoinState), unreadMessages(false) , highlightCount(0), notificationCount(0), roomMessagesJob(nullptr) { } @@ -134,8 +137,8 @@ class Room::Private } }; -Room::Room(Connection* connection, QString id) - : QObject(connection), d(new Private(connection, id)) +Room::Room(Connection* connection, QString id, JoinState initialJoinState) + : QObject(connection), d(new Private(connection, id, initialJoinState)) { // See "Accessing the Public Class" section in // https://marcmutz.wordpress.com/translated-articles/pimp-my-pimpl-%E2%80%94-reloaded/ @@ -194,6 +197,8 @@ void Room::setJoinState(JoinState state) if( state == oldState ) return; d->joinState = state; + qCDebug(MAIN) << "Room" << id() << "changed state: " + << int(oldState) << "->" << int(state); emit joinStateChanged(oldState, state); } @@ -601,11 +606,21 @@ void Room::Private::getPreviousContent(int limit) } } +void Room::inviteToRoom(const QString& memberId) const +{ + connection()->callApi(id(), memberId); +} + void Room::leaveRoom() const { connection()->callApi(id()); } +void Room::kickMember(const QString& memberId, const QString& reason) const +{ + connection()->callApi(id(), memberId, reason); +} + void Room::Private::dropDuplicateEvents(RoomEvents* events) const { // Collect all duplicate events at the end of the container diff --git a/room.h b/room.h index 23a1412d..9465a960 100644 --- a/room.h +++ b/room.h @@ -77,7 +77,7 @@ namespace QMatrixClient using Timeline = std::deque; using rev_iter_t = Timeline::const_reverse_iterator; - Room(Connection* connection, QString id); + Room(Connection* connection, QString id, JoinState initialJoinState); virtual ~Room(); Connection* connection() const; @@ -154,7 +154,10 @@ namespace QMatrixClient void getPreviousContent(int limit = 10); + void inviteToRoom(const QString& memberId) const; void leaveRoom() const; + void kickMember(const QString& memberId, const QString& reason) const; + void userRenamed(User* user, QString oldName); /** Mark all messages in the room as read */ -- cgit v1.2.3 From 715ebcfc5c33ff83cc8f185b6e14cfbba01c637b Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 9 Sep 2017 20:19:01 +0900 Subject: preamble.mustache now only mentions that the file is generated --- jobs/preamble.mustache | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/jobs/preamble.mustache b/jobs/preamble.mustache index f14d58d2..3ba87d61 100644 --- a/jobs/preamble.mustache +++ b/jobs/preamble.mustache @@ -1,18 +1,3 @@ /****************************************************************************** -* Copyright (C) 2016-2017 {{copyrightName}} {{copyrightEmail}} -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2.1 of the License, or (at your option) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ -- cgit v1.2.3 From b2c9daabc2e8b89e1108211d8c9badf1bac66640 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 2 Oct 2017 12:16:36 +0900 Subject: All jobs: Drop ConnectionData parameter from the constructor Having to pass ConnectionData to each and every job class was nothing but boilerplate since the very beginning. Removing it required to prepend BaseJob::start() with ConnectionData-setting code, and to provide a way to alter the request configuration depending on the (late-coming) ConnectionData object. This is a new responsibility of BaseJob::start(); the previous BaseJob::start() contents have moved to BaseJob::sendRequest() (which is now invoked on retries, instead of start()). --- connection.h | 8 ++++++-- jobs/basejob.cpp | 38 ++++++++++++++++++++++++++------------ jobs/basejob.h | 12 +++++++----- jobs/checkauthmethods.cpp | 6 +++--- jobs/checkauthmethods.h | 2 +- jobs/generated/inviting.cpp | 18 +++++------------- jobs/generated/inviting.h | 10 +--------- jobs/generated/kicking.cpp | 13 ++----------- jobs/generated/kicking.h | 12 +----------- jobs/joinroomjob.cpp | 4 ++-- jobs/joinroomjob.h | 2 +- jobs/leaveroomjob.cpp | 4 ++-- jobs/leaveroomjob.h | 2 +- jobs/logoutjob.cpp | 4 ++-- jobs/logoutjob.h | 2 +- jobs/mediathumbnailjob.cpp | 11 ++++++----- jobs/mediathumbnailjob.h | 10 +++++----- jobs/passwordlogin.cpp | 10 +++++----- jobs/passwordlogin.h | 9 ++++----- jobs/postreceiptjob.cpp | 8 ++++---- jobs/postreceiptjob.h | 3 +-- jobs/roommessagesjob.cpp | 10 ++++------ jobs/roommessagesjob.h | 6 +++--- jobs/sendeventjob.cpp | 12 ++++++++---- jobs/sendeventjob.h | 16 ++++++++-------- jobs/setroomstatejob.h | 11 +++++------ jobs/syncjob.cpp | 8 ++++---- jobs/syncjob.h | 21 +++++++++++---------- 28 files changed, 129 insertions(+), 143 deletions(-) diff --git a/connection.h b/connection.h index 4ca6fbc5..213bf26f 100644 --- a/connection.h +++ b/connection.h @@ -72,6 +72,9 @@ namespace QMatrixClient Q_INVOKABLE void sync(int timeout = -1); Q_INVOKABLE void stopSync(); + + // Old API that will be abolished any time soon. DO NOT USE. + /** @deprecated Use callApi() or Room::postMessage() instead */ Q_INVOKABLE virtual void postMessage(Room* room, const QString& type, const QString& message) const; @@ -82,6 +85,7 @@ namespace QMatrixClient Q_INVOKABLE virtual JoinRoomJob* joinRoom(const QString& roomAlias); /** @deprecated Use callApi() or Room::leaveRoom() instead */ Q_INVOKABLE virtual void leaveRoom( Room* room ); + /** @deprecated User callApi() or Room::getPreviousContent() instead */ Q_INVOKABLE virtual RoomMessagesJob* getMessages(Room* room, const QString& from) const; /** @deprecated Use callApi() instead */ @@ -142,8 +146,8 @@ namespace QMatrixClient template JobT* callApi(JobArgTs... jobArgs) const { - auto job = new JobT(connectionData(), jobArgs...); - job->start(); + auto job = new JobT(jobArgs...); + job->start(connectionData()); return job; } diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp index ea1a7158..240192d9 100644 --- a/jobs/basejob.cpp +++ b/jobs/basejob.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +//#include #include @@ -45,16 +45,15 @@ class BaseJob::Private public: // Using an idiom from clang-tidy: // http://clang.llvm.org/extra/clang-tidy/checks/modernize-pass-by-value.html - Private(const ConnectionData* c, HttpVerb v, - QString endpoint, QUrlQuery q, Data data, bool nt) - : connection(c), verb(v), apiEndpoint(std::move(endpoint)) + Private(HttpVerb v, QString endpoint, QUrlQuery q, Data data, bool nt) + : verb(v), apiEndpoint(std::move(endpoint)) , requestQuery(std::move(q)), requestData(std::move(data)) , needsToken(nt) { } void sendRequest(); - const ConnectionData* connection; + const ConnectionData* connection = nullptr; // Contents for the network request HttpVerb verb; @@ -80,16 +79,15 @@ inline QDebug operator<<(QDebug dbg, const BaseJob* j) return dbg << j->objectName(); } -BaseJob::BaseJob(const ConnectionData* connection, HttpVerb verb, - const QString& name, const QString& endpoint, +BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, const Query& query, const Data& data, bool needsToken) - : d(new Private(connection, verb, endpoint, query, data, needsToken)) + : d(new Private(verb, endpoint, query, data, needsToken)) { setObjectName(name); d->timer.setSingleShot(true); connect (&d->timer, &QTimer::timeout, this, &BaseJob::timeout); d->retryTimer.setSingleShot(true); - connect (&d->retryTimer, &QTimer::timeout, this, &BaseJob::start); + connect (&d->retryTimer, &QTimer::timeout, this, &BaseJob::sendRequest); } BaseJob::~BaseJob() @@ -98,9 +96,14 @@ BaseJob::~BaseJob() qCDebug(d->logCat) << this << "destroyed"; } -const ConnectionData* BaseJob::connection() const +const QString& BaseJob::apiEndpoint() const { - return d->connection; + return d->apiEndpoint; +} + +void BaseJob::setApiEndpoint(const QString& apiEndpoint) +{ + d->apiEndpoint = apiEndpoint; } const QUrlQuery& BaseJob::query() const @@ -155,7 +158,18 @@ void BaseJob::Private::sendRequest() } } -void BaseJob::start() +void BaseJob::beforeStart(const ConnectionData* connData) +{ +} + +void BaseJob::start(const ConnectionData* connData) +{ + d->connection = connData; + beforeStart(connData); + sendRequest(); +} + +void BaseJob::sendRequest() { emit aboutToStart(); d->retryTimer.stop(); // In case we were counting down at the moment diff --git a/jobs/basejob.h b/jobs/basejob.h index b8cc9511..2f7bd9cd 100644 --- a/jobs/basejob.h +++ b/jobs/basejob.h @@ -118,8 +118,7 @@ namespace QMatrixClient using duration_t = int; // milliseconds public: - BaseJob(const ConnectionData* connection, HttpVerb verb, - const QString& name, const QString& endpoint, + BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, const Query& query = {}, const Data& data = {}, bool needsToken = true); @@ -135,7 +134,7 @@ namespace QMatrixClient Q_INVOKABLE duration_t millisToRetry() const; public slots: - void start(); + void start(const ConnectionData* connData); /** * Abandons the result of this job, arrived or unarrived. @@ -205,13 +204,15 @@ namespace QMatrixClient void failure(BaseJob*); protected: - const ConnectionData* connection() const; - + const QString& apiEndpoint() const; + void setApiEndpoint(const QString& apiEndpoint); const QUrlQuery& query() const; void setRequestQuery(const QUrlQuery& query); const Data& requestData() const; void setRequestData(const Data& data); + virtual void beforeStart(const ConnectionData* connData); + /** * Used by gotReply() to check the received reply for general * issues such as network errors or access denial. @@ -260,6 +261,7 @@ namespace QMatrixClient void sslErrors(const QList& errors); private slots: + void sendRequest(); void gotReply(); private: diff --git a/jobs/checkauthmethods.cpp b/jobs/checkauthmethods.cpp index 95b9a8f2..117def89 100644 --- a/jobs/checkauthmethods.cpp +++ b/jobs/checkauthmethods.cpp @@ -29,9 +29,9 @@ class CheckAuthMethods::Private QString session; }; -CheckAuthMethods::CheckAuthMethods(const ConnectionData* connection) - : BaseJob(connection, HttpVerb::Get, "CheckAuthMethods", - "_matrix/client/r0/login", Query(), Data(), false) +CheckAuthMethods::CheckAuthMethods() + : BaseJob(HttpVerb::Get, "CheckAuthMethods", + QStringLiteral("_matrix/client/r0/login"), Query(), Data(), false) , d(new Private) { } diff --git a/jobs/checkauthmethods.h b/jobs/checkauthmethods.h index 7d7dc40f..647f3db6 100644 --- a/jobs/checkauthmethods.h +++ b/jobs/checkauthmethods.h @@ -25,7 +25,7 @@ namespace QMatrixClient class CheckAuthMethods : public BaseJob { public: - CheckAuthMethods(const ConnectionData* connection); + CheckAuthMethods(); virtual ~CheckAuthMethods(); QString session(); diff --git a/jobs/generated/inviting.cpp b/jobs/generated/inviting.cpp index e5e7f410..1e0c29a3 100644 --- a/jobs/generated/inviting.cpp +++ b/jobs/generated/inviting.cpp @@ -16,19 +16,11 @@ using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -InviteUserJob::InviteUserJob(const ConnectionData* connection, - QString roomId - , - QString user_id - ) - : BaseJob(connection, HttpVerb::Post, "InviteUserJob" - , basePath % "/rooms/" % roomId % "/invite" - , Query { } - , Data { - { "user_id", toJson(user_id) } - } - +InviteUserJob::InviteUserJob(QString roomId, QString user_id) + : BaseJob(HttpVerb::Post, "InviteUserJob", + basePath % "/rooms/" % roomId % "/invite", + Query {}, + Data { { "user_id", toJson(user_id) } } ) { } diff --git a/jobs/generated/inviting.h b/jobs/generated/inviting.h index af5a426d..84cce06e 100644 --- a/jobs/generated/inviting.h +++ b/jobs/generated/inviting.h @@ -27,15 +27,7 @@ namespace QMatrixClient class InviteUserJob : public BaseJob { public: - InviteUserJob(const ConnectionData* connection - - , - QString roomId - - , - QString user_id - ); - + InviteUserJob(QString roomId, QString user_id); }; diff --git a/jobs/generated/kicking.cpp b/jobs/generated/kicking.cpp index 726f6fb0..4f9d6580 100644 --- a/jobs/generated/kicking.cpp +++ b/jobs/generated/kicking.cpp @@ -16,23 +16,14 @@ using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -KickJob::KickJob(const ConnectionData* connection, - QString roomId - , - QString user_id - , - QString reason - ) - : BaseJob(connection, HttpVerb::Post, "KickJob" +KickJob::KickJob(QString roomId, QString user_id, QString reason) + : BaseJob(HttpVerb::Post, "KickJob" , basePath % "/rooms/" % roomId % "/kick" , Query { } , Data { { "user_id", toJson(user_id) }, - { "reason", toJson(reason) } } - ) { } diff --git a/jobs/generated/kicking.h b/jobs/generated/kicking.h index 7b183b08..a746db8b 100644 --- a/jobs/generated/kicking.h +++ b/jobs/generated/kicking.h @@ -27,17 +27,7 @@ namespace QMatrixClient class KickJob : public BaseJob { public: - KickJob(const ConnectionData* connection - - , - QString roomId - - , - QString user_id - - , - QString reason - ); + KickJob(QString roomId, QString user_id, QString reason); }; diff --git a/jobs/joinroomjob.cpp b/jobs/joinroomjob.cpp index 6278c18b..d465dd42 100644 --- a/jobs/joinroomjob.cpp +++ b/jobs/joinroomjob.cpp @@ -27,8 +27,8 @@ class JoinRoomJob::Private QString roomId; }; -JoinRoomJob::JoinRoomJob(const ConnectionData* data, const QString& roomAlias) - : BaseJob(data, HttpVerb::Post, "JoinRoomJob", +JoinRoomJob::JoinRoomJob(const QString& roomAlias) + : BaseJob(HttpVerb::Post, "JoinRoomJob", QString("_matrix/client/r0/join/%1").arg(roomAlias)) , d(new Private) { diff --git a/jobs/joinroomjob.h b/jobs/joinroomjob.h index 7cf90fd5..f3ba216f 100644 --- a/jobs/joinroomjob.h +++ b/jobs/joinroomjob.h @@ -25,7 +25,7 @@ namespace QMatrixClient class JoinRoomJob: public BaseJob { public: - JoinRoomJob(const ConnectionData* data, const QString& roomAlias); + explicit JoinRoomJob(const QString& roomAlias); virtual ~JoinRoomJob(); QString roomId(); diff --git a/jobs/leaveroomjob.cpp b/jobs/leaveroomjob.cpp index f73919ac..54e7f307 100644 --- a/jobs/leaveroomjob.cpp +++ b/jobs/leaveroomjob.cpp @@ -20,7 +20,7 @@ using namespace QMatrixClient; -LeaveRoomJob::LeaveRoomJob(const ConnectionData* data, const QString& roomId) - : BaseJob(data, HttpVerb::Post, "LeaveRoomJob", +LeaveRoomJob::LeaveRoomJob(const QString& roomId) + : BaseJob(HttpVerb::Post, "LeaveRoomJob", QStringLiteral("_matrix/client/r0/rooms/%1/leave").arg(roomId)) { } diff --git a/jobs/leaveroomjob.h b/jobs/leaveroomjob.h index 70883b68..9224c1c8 100644 --- a/jobs/leaveroomjob.h +++ b/jobs/leaveroomjob.h @@ -25,6 +25,6 @@ namespace QMatrixClient class LeaveRoomJob: public BaseJob { public: - LeaveRoomJob(const ConnectionData* data, const QString& roomId); + explicit LeaveRoomJob(const QString& roomId); }; } // namespace QMatrixClient diff --git a/jobs/logoutjob.cpp b/jobs/logoutjob.cpp index 84e88760..5ea5cf4d 100644 --- a/jobs/logoutjob.cpp +++ b/jobs/logoutjob.cpp @@ -20,7 +20,7 @@ using namespace QMatrixClient; -LogoutJob::LogoutJob(const ConnectionData* connection) - : BaseJob(connection, HttpVerb::Post, "LogoutJob", "/_matrix/client/r0/logout") +LogoutJob::LogoutJob() + : BaseJob(HttpVerb::Post, "LogoutJob", "/_matrix/client/r0/logout") { } diff --git a/jobs/logoutjob.h b/jobs/logoutjob.h index 780719e4..e1b988dc 100644 --- a/jobs/logoutjob.h +++ b/jobs/logoutjob.h @@ -25,6 +25,6 @@ namespace QMatrixClient class LogoutJob: public BaseJob { public: - explicit LogoutJob(const ConnectionData* connection); + LogoutJob(); }; } diff --git a/jobs/mediathumbnailjob.cpp b/jobs/mediathumbnailjob.cpp index 9579f6b2..5945493a 100644 --- a/jobs/mediathumbnailjob.cpp +++ b/jobs/mediathumbnailjob.cpp @@ -23,10 +23,11 @@ using namespace QMatrixClient; -MediaThumbnailJob::MediaThumbnailJob(const ConnectionData* data, QUrl url, QSize requestedSize, +MediaThumbnailJob::MediaThumbnailJob(QUrl url, QSize requestedSize, ThumbnailType thumbnailType) - : BaseJob(data, HttpVerb::Get, "MediaThumbnailJob", - QString("/_matrix/media/v1/thumbnail/%1%2").arg(url.host(), url.path()), + : BaseJob(HttpVerb::Get, "MediaThumbnailJob", + QStringLiteral("/_matrix/media/v1/thumbnail/%1%2") + .arg(url.host(), url.path()), Query( { { "width", QString::number(requestedSize.width()) } , { "height", QString::number(requestedSize.height()) } @@ -35,12 +36,12 @@ MediaThumbnailJob::MediaThumbnailJob(const ConnectionData* data, QUrl url, QSize })) { } -QPixmap MediaThumbnailJob::thumbnail() +QPixmap MediaThumbnailJob::thumbnail() const { return pixmap; } -QPixmap MediaThumbnailJob::scaledThumbnail(QSize toSize) +QPixmap MediaThumbnailJob::scaledThumbnail(QSize toSize) const { return pixmap.scaled(toSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); } diff --git a/jobs/mediathumbnailjob.h b/jobs/mediathumbnailjob.h index 186da829..292e7f14 100644 --- a/jobs/mediathumbnailjob.h +++ b/jobs/mediathumbnailjob.h @@ -29,11 +29,11 @@ namespace QMatrixClient class MediaThumbnailJob: public BaseJob { public: - MediaThumbnailJob(const ConnectionData* data, QUrl url, QSize requestedSize, - ThumbnailType thumbnailType=ThumbnailType::Scale); + MediaThumbnailJob(QUrl url, QSize requestedSize, + ThumbnailType thumbnailType = ThumbnailType::Scale); - QPixmap thumbnail(); - QPixmap scaledThumbnail(QSize toSize); + QPixmap thumbnail() const; + QPixmap scaledThumbnail(QSize toSize) const; protected: Status parseReply(QByteArray data) override; @@ -41,4 +41,4 @@ namespace QMatrixClient private: QPixmap pixmap; }; -} +} // namespace QMatrixClient diff --git a/jobs/passwordlogin.cpp b/jobs/passwordlogin.cpp index 09108215..9af025e6 100644 --- a/jobs/passwordlogin.cpp +++ b/jobs/passwordlogin.cpp @@ -28,8 +28,8 @@ class PasswordLogin::Private QString returned_token; }; -PasswordLogin::PasswordLogin(const ConnectionData* connection, QString user, QString password) - : BaseJob(connection, HttpVerb::Post, "PasswordLogin" +PasswordLogin::PasswordLogin(QString user, QString password) + : BaseJob(HttpVerb::Post, "PasswordLogin" , "_matrix/client/r0/login" , Query() , Data( @@ -48,17 +48,17 @@ PasswordLogin::~PasswordLogin() delete d; } -QString PasswordLogin::token() +QString PasswordLogin::token() const { return d->returned_token; } -QString PasswordLogin::id() +QString PasswordLogin::id() const { return d->returned_id; } -QString PasswordLogin::server() +QString PasswordLogin::server() const { return d->returned_server; } diff --git a/jobs/passwordlogin.h b/jobs/passwordlogin.h index 6b7db0b3..fb8777a3 100644 --- a/jobs/passwordlogin.h +++ b/jobs/passwordlogin.h @@ -25,13 +25,12 @@ namespace QMatrixClient class PasswordLogin : public BaseJob { public: - PasswordLogin(const ConnectionData* connection, - QString user, QString password); + PasswordLogin(QString user, QString password); virtual ~PasswordLogin(); - QString token(); - QString id(); - QString server(); + QString token() const; + QString id() const; + QString server() const; protected: Status parseJson(const QJsonDocument& data) override; diff --git a/jobs/postreceiptjob.cpp b/jobs/postreceiptjob.cpp index 00926de6..4572d74c 100644 --- a/jobs/postreceiptjob.cpp +++ b/jobs/postreceiptjob.cpp @@ -20,8 +20,8 @@ using namespace QMatrixClient; -PostReceiptJob::PostReceiptJob(const ConnectionData* connection, - const QString& roomId, const QString& eventId) - : BaseJob(connection, HttpVerb::Post, "PostReceiptJob", - QString("/_matrix/client/r0/rooms/%1/receipt/m.read/%2").arg(roomId, eventId)) +PostReceiptJob::PostReceiptJob(const QString& roomId, const QString& eventId) + : BaseJob(HttpVerb::Post, "PostReceiptJob", + QStringLiteral("/_matrix/client/r0/rooms/%1/receipt/m.read/%2") + .arg(roomId, eventId)) { } diff --git a/jobs/postreceiptjob.h b/jobs/postreceiptjob.h index 1c84f411..23df7c05 100644 --- a/jobs/postreceiptjob.h +++ b/jobs/postreceiptjob.h @@ -25,7 +25,6 @@ namespace QMatrixClient class PostReceiptJob: public BaseJob { public: - PostReceiptJob(const ConnectionData* connection, const QString& roomId, - const QString& eventId); + PostReceiptJob(const QString& roomId, const QString& eventId); }; } diff --git a/jobs/roommessagesjob.cpp b/jobs/roommessagesjob.cpp index 3e603a50..078c692a 100644 --- a/jobs/roommessagesjob.cpp +++ b/jobs/roommessagesjob.cpp @@ -18,8 +18,6 @@ #include "roommessagesjob.h" -#include "util.h" - using namespace QMatrixClient; class RoomMessagesJob::Private @@ -29,9 +27,9 @@ class RoomMessagesJob::Private QString end; }; -RoomMessagesJob::RoomMessagesJob(const ConnectionData* data, const QString& roomId, - const QString& from, int limit, FetchDirection dir) - : BaseJob(data, HttpVerb::Get, "RoomMessagesJob", +RoomMessagesJob::RoomMessagesJob(const QString& roomId, const QString& from, + int limit, FetchDirection dir) + : BaseJob(HttpVerb::Get, "RoomMessagesJob", QString("/_matrix/client/r0/rooms/%1/messages").arg(roomId), Query( { { "from", from } @@ -53,7 +51,7 @@ RoomEvents RoomMessagesJob::releaseEvents() return d->events.release(); } -QString RoomMessagesJob::end() +QString RoomMessagesJob::end() const { return d->end; } diff --git a/jobs/roommessagesjob.h b/jobs/roommessagesjob.h index a029c27c..9680d52c 100644 --- a/jobs/roommessagesjob.h +++ b/jobs/roommessagesjob.h @@ -29,13 +29,13 @@ namespace QMatrixClient class RoomMessagesJob: public BaseJob { public: - RoomMessagesJob(const ConnectionData* data, const QString& roomId, - const QString& from, int limit = 10, + RoomMessagesJob(const QString& roomId, const QString& from, + int limit = 10, FetchDirection dir = FetchDirection::Backward); virtual ~RoomMessagesJob(); RoomEvents releaseEvents(); - QString end(); + QString end() const; protected: Status parseJson(const QJsonDocument& data) override; diff --git a/jobs/sendeventjob.cpp b/jobs/sendeventjob.cpp index f3c95fe8..7e33e089 100644 --- a/jobs/sendeventjob.cpp +++ b/jobs/sendeventjob.cpp @@ -22,13 +22,17 @@ using namespace QMatrixClient; -SendEventJob::SendEventJob(const ConnectionData* connection, - const QString& roomId, const QString& type, +SendEventJob::SendEventJob(const QString& roomId, const QString& type, const QString& plainText) - : SendEventJob(connection, roomId, - new RoomMessageEvent(plainText, type)) + : SendEventJob(roomId, new RoomMessageEvent(plainText, type)) { } +void SendEventJob::beforeStart(const ConnectionData* connData) +{ + BaseJob::beforeStart(connData); + setApiEndpoint(apiEndpoint() + connData->generateTxnId()); +} + BaseJob::Status SendEventJob::parseJson(const QJsonDocument& data) { _eventId = data.object().value("event_id").toString(); diff --git a/jobs/sendeventjob.h b/jobs/sendeventjob.h index 42948cc2..7b10b3d4 100644 --- a/jobs/sendeventjob.h +++ b/jobs/sendeventjob.h @@ -29,12 +29,10 @@ namespace QMatrixClient public: /** Constructs a job that sends an arbitrary room event */ template - SendEventJob(const ConnectionData* connection, const QString& roomId, - const EvT* event) - : BaseJob(connection, HttpVerb::Put, "SendEventJob", - QStringLiteral("_matrix/client/r0/rooms/%1/send/%2/%3") - .arg(roomId, EvT::TypeId, - connection->generateTxnId()), + SendEventJob(const QString& roomId, const EvT* event) + : BaseJob(HttpVerb::Put, QStringLiteral("SendEventJob"), + QStringLiteral("_matrix/client/r0/rooms/%1/send/%2/") + .arg(roomId, EvT::TypeId), // See also beforeStart() Query(), Data(event->toJson())) { } @@ -43,8 +41,8 @@ namespace QMatrixClient * Constructs a plain text message job (for compatibility with * the old PostMessageJob API). */ - SendEventJob(const ConnectionData* connection, const QString& roomId, - const QString& type, const QString& plainText); + SendEventJob(const QString& roomId, const QString& type, + const QString& plainText); QString eventId() const { return _eventId; } @@ -53,5 +51,7 @@ namespace QMatrixClient private: QString _eventId; + + void beforeStart(const ConnectionData* connData) override; }; } // namespace QMatrixClient diff --git a/jobs/setroomstatejob.h b/jobs/setroomstatejob.h index 1c72f31c..ddc271b9 100644 --- a/jobs/setroomstatejob.h +++ b/jobs/setroomstatejob.h @@ -32,9 +32,9 @@ namespace QMatrixClient * with a state key. */ template - SetRoomStateJob(const ConnectionData* connection, const QString& roomId, - const EvT* event, const QString& stateKey) - : BaseJob(connection, HttpVerb::Put, "SetRoomStateJob", + SetRoomStateJob(const QString& roomId, const QString& stateKey, + const EvT* event) + : BaseJob(HttpVerb::Put, "SetRoomStateJob", QStringLiteral("_matrix/client/r0/rooms/%1/state/%2/%3") .arg(roomId, EvT::TypeId, stateKey), Query(), @@ -45,9 +45,8 @@ namespace QMatrixClient * without a state key. */ template - SetRoomStateJob(const ConnectionData* connection, const QString& roomId, - const EvT* event) - : BaseJob(connection, HttpVerb::Put, "SetRoomStateJob", + SetRoomStateJob(const QString& roomId, const EvT* event) + : BaseJob(HttpVerb::Put, "SetRoomStateJob", QStringLiteral("_matrix/client/r0/rooms/%1/state/%2") .arg(roomId, EvT::TypeId), Query(), diff --git a/jobs/syncjob.cpp b/jobs/syncjob.cpp index f679e6f4..6d37db5c 100644 --- a/jobs/syncjob.cpp +++ b/jobs/syncjob.cpp @@ -24,10 +24,10 @@ using namespace QMatrixClient; static size_t jobId = 0; -SyncJob::SyncJob(const ConnectionData* connection, const QString& since, - const QString& filter, int timeout, const QString& presence) - : BaseJob(connection, HttpVerb::Get, QString("SyncJob-%1").arg(++jobId), - "_matrix/client/r0/sync") +SyncJob::SyncJob(const QString& since, const QString& filter, int timeout, + const QString& presence) + : BaseJob(HttpVerb::Get, QStringLiteral("SyncJob-%1").arg(++jobId), + QStringLiteral("_matrix/client/r0/sync")) { setLoggingCategory(SYNCJOB); QUrlQuery query; diff --git a/jobs/syncjob.h b/jobs/syncjob.h index 6697a265..b1db914d 100644 --- a/jobs/syncjob.h +++ b/jobs/syncjob.h @@ -68,21 +68,22 @@ namespace QMatrixClient // QVector cannot work with non-copiable objects, std::vector can. using SyncDataList = std::vector; - class SyncData { - public: - BaseJob::Status parseJson(const QJsonDocument &data); - SyncDataList&& takeRoomData(); - QString nextBatch() const; - - private: - QString nextBatch_; - SyncDataList roomData; + class SyncData + { + public: + BaseJob::Status parseJson(const QJsonDocument &data); + SyncDataList&& takeRoomData(); + QString nextBatch() const; + + private: + QString nextBatch_; + SyncDataList roomData; }; class SyncJob: public BaseJob { public: - explicit SyncJob(const ConnectionData* connection, const QString& since = {}, + explicit SyncJob(const QString& since = {}, const QString& filter = {}, int timeout = -1, const QString& presence = {}); -- cgit v1.2.3 From ab33516eb9aed5db5decb572cb30a83971f4c51e Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 2 Oct 2017 14:31:51 +0900 Subject: Drop ConnectionData parameter from {{template}} files too; less blanks --- jobs/generated/inviting.cpp | 14 +++++----- jobs/generated/inviting.h | 11 +------- jobs/generated/kicking.cpp | 20 ++++++-------- jobs/generated/kicking.h | 12 +-------- jobs/{{base}}.cpp.mustache | 63 ++++++++++++++++++--------------------------- jobs/{{base}}.h.mustache | 46 +++++++++------------------------ 6 files changed, 53 insertions(+), 113 deletions(-) diff --git a/jobs/generated/inviting.cpp b/jobs/generated/inviting.cpp index 1e0c29a3..164a2b2b 100644 --- a/jobs/generated/inviting.cpp +++ b/jobs/generated/inviting.cpp @@ -5,25 +5,23 @@ #include "inviting.h" - #include "../converters.h" #include using namespace QMatrixClient; - - static const auto basePath = QStringLiteral("/_matrix/client/r0"); InviteUserJob::InviteUserJob(QString roomId, QString user_id) : BaseJob(HttpVerb::Post, "InviteUserJob", - basePath % "/rooms/" % roomId % "/invite", - Query {}, - Data { { "user_id", toJson(user_id) } } + basePath % "/rooms/" % roomId % "/invite", + Query { }, + Data { + { "user_id", toJson(user_id) } + } ) { } - - + diff --git a/jobs/generated/inviting.h b/jobs/generated/inviting.h index 84cce06e..8cfc9118 100644 --- a/jobs/generated/inviting.h +++ b/jobs/generated/inviting.h @@ -5,30 +5,21 @@ #pragma once - #include "../basejob.h" - - #include - - namespace QMatrixClient { - // Operations - /** - - */ class InviteUserJob : public BaseJob { public: InviteUserJob(QString roomId, QString user_id); + }; - } // namespace QMatrixClient diff --git a/jobs/generated/kicking.cpp b/jobs/generated/kicking.cpp index 4f9d6580..3e2ef5be 100644 --- a/jobs/generated/kicking.cpp +++ b/jobs/generated/kicking.cpp @@ -5,28 +5,24 @@ #include "kicking.h" - #include "../converters.h" #include using namespace QMatrixClient; - - static const auto basePath = QStringLiteral("/_matrix/client/r0"); KickJob::KickJob(QString roomId, QString user_id, QString reason) - : BaseJob(HttpVerb::Post, "KickJob" - , basePath % "/rooms/" % roomId % "/kick" - , Query { } - , Data { - { "user_id", toJson(user_id) }, - { "reason", toJson(reason) } - } + : BaseJob(HttpVerb::Post, "KickJob", + basePath % "/rooms/" % roomId % "/kick", + Query { }, + Data { + { "user_id", toJson(user_id) }, + { "reason", toJson(reason) } + } ) { } - - + diff --git a/jobs/generated/kicking.h b/jobs/generated/kicking.h index a746db8b..6ef19fcd 100644 --- a/jobs/generated/kicking.h +++ b/jobs/generated/kicking.h @@ -5,31 +5,21 @@ #pragma once - #include "../basejob.h" - - #include - - namespace QMatrixClient { - // Operations - /** - - */ class KickJob : public BaseJob { public: KickJob(QString roomId, QString user_id, QString reason); - + }; - } // namespace QMatrixClient diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index c9b0eb5e..0d01e6dd 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -1,76 +1,63 @@ {{#@filePartial}}preamble{{/@filePartial}} #include "{{filenameBase}}.h" - {{#operations}} #include "../converters.h" #include using namespace QMatrixClient; - - {{#returns?}} +{{# returns?}} class {{#@cap}}{{operationId}}{{/@cap}}Job::Private { public: - {{#returns}} - {{type}} {{name}}; - {{/returns}} + {{#returns}}{{type}} {{name}};{{/returns}} }; - {{/returns?}} - +{{/ returns?}} static const auto basePath = QStringLiteral("{{basePathWithoutHost}}"); - - {{#operation}} -{{#@cap}}{{operationId}}{{/@cap}}Job::{{#@cap}}{{operationId}}{{/@cap}}Job(const ConnectionData* connection{{#allParams}}, {{!}} - {{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}}{{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}} - {{/allParams}}) - : BaseJob(connection, HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{#@cap}}{{operationId}}{{/@cap}}Job" - , basePath{{#pathParts}} % {{part}}{{/pathParts}} - , Query { {{#queryParams}} - { "{{baseName}}", toJson({{paramName}}).toString() }{{#hasMore}}, {{/hasMore}} - {{/queryParams}} } - , Data { {{#bodyParams}} - { "{{baseName}}", toJson({{paramName}}) }{{#hasMore}}, {{/hasMore}} - {{/bodyParams}} } - {{#skipAuth}}, false{{/skipAuth}} +{{# operation}} +{{#@cap}}{{operationId}}{{/@cap}}Job::{{#@cap}}{{operationId}}{{/@cap}}Job({{#allParams}}{{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}}{{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) + : BaseJob(HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{#@cap}}{{operationId}}{{/@cap}}Job", + basePath{{#pathParts}} % {{part}}{{/pathParts}}, + Query {{^queryParams}}{ }{{/queryParams}}{{#queryParams?}}{ + {{#queryParams}}{ "{{baseName}}", toJson({{paramName}}).toString() }{{#hasMore}}, + {{/hasMore}}{{/queryParams}} + }{{/queryParams?}}, + Data {{^bodyParams}}{ }{{/bodyParams}}{{#bodyParams?}}{ + {{#bodyParams}}{ "{{baseName}}", toJson({{paramName}}) }{{#hasMore}}, + {{/hasMore}}{{/bodyParams}} + }{{/bodyParams?}}{{#skipAuth}}, false{{/skipAuth}} ){{#returns?}}, d(new Private){{/returns?}} { } - {{/operation}} - - {{#returns?}} +{{/ operation}} +{{# returns?}} {{className}}Job::~{{className}}Job() { delete d; } - - {{#returns}} +{{# returns}} {{type}} {{className}}Job::{{name}}() const { return d->{{name}}; } - {{/returns}} - - {{#returnFile?}} +{{/ returns}} +{{# returnFile?}} BaseJob::Status {{className}}Job::parseReply(QByteArray data) { {{#returns}}{{name}}{{/returns}} = data; return Success; } - {{/returnFile?}} - {{^returnFile?}} +{{/ returnFile?}}{{^returnFile?}} BaseJob::Status {{className}}Job::parseJson(const QJsonDocument& data) { auto json = data.object(); {{#returns}} - {{#required?}} - if (!json.contains("{{name}}") - return { JsonParseError, "{{name}} not found in the response" }; - {{/required?}} + {{#required?}}if (!json.contains("{{name}}") + return { JsonParseError, "{{name}} not found in the response" };{{/required?}} d->{{name}} = fromJson<{{type}}>(json.value("{{name}}")); {{/returns}} return Success; } - {{/returnFile?}} - {{/returns?}} +{{/ returnFile?}} +{{/ returns?}} {{/operations}} diff --git a/jobs/{{base}}.h.mustache b/jobs/{{base}}.h.mustache index 6fb9caef..e19cf03d 100644 --- a/jobs/{{base}}.h.mustache +++ b/jobs/{{base}}.h.mustache @@ -2,22 +2,14 @@ #pragma once -{{#operations}} -#include "../basejob.h" -{{/operations}} - +{{#operations}}#include "../basejob.h"{{/operations}} {{#imports}} #include {{.}} {{/imports}} - -{{#models}} -#include {{! FIXME: This should probably go inside imports }} -{{/models}} - +{{#models}}#include {{/models}}{{! FIXME: This should probably go inside imports }} namespace QMatrixClient { -{{#models}} - // Data structures +{{#models}} // Data structures {{#model}} struct {{classname}} { @@ -25,41 +17,27 @@ namespace QMatrixClient {{datatype}} {{name}}; {{/vars}} operator QJsonValue() const { return {}; } - }; - {{/model}} + };{{/model}} {{/models}} -{{#operations}} - // Operations +{{#operations}} // Operations {{#operation}} class {{#@cap}}{{operationId}}{{/@cap}}Job : public BaseJob { public: - {{#@cap}}{{operationId}}{{/@cap}}Job(const ConnectionData* connection - {{#allParams}} - , {{!}} - {{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}} - {{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}} - {{/allParams}}); - {{#returns?}} + {{#@cap}}{{operationId}}{{/@cap}}Job({{#allParams}}{{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}}{{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); + {{#returns?}} virtual {{className}}Job(); - {{#returns}} - {{type}} {{name}}() const; - {{/returns}} + {{#returns}}{{type}} {{name}}() const;{{/returns}} protected: - {{#returnFile?}} - Status parseReply(QByteArray data) override; - {{/returnFile?}} - {{^returnFile}} - Status parseJson(const JsonDocument& data) override; - {{/returnFile}} + {{#returnFile?}}Status parseReply(QByteArray data) override;{{/returnFile?}} + {{^returnFile}}Status parseJson(const JsonDocument& data) override;{{/returnFile}} private: class Private; Private* d; - {{/returns?}} - }; - {{/operation}} + {{/returns?}} + };{{/operation}} {{/operations}} } // namespace QMatrixClient -- cgit v1.2.3 From ce1bbe88509715c9a35bb7aeeb5f20f0d4918ec4 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 2 Oct 2017 20:07:59 +0900 Subject: api-generator has been renamed to gtad --- .travis.yml | 6 +++--- CMakeLists.txt | 13 ++++++++----- jobs/apigen.yaml | 57 -------------------------------------------------------- jobs/gtad.yaml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 65 deletions(-) delete mode 100644 jobs/apigen.yaml create mode 100644 jobs/gtad.yaml diff --git a/.travis.yml b/.travis.yml index b8917ef1..2abf0e2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,15 +22,15 @@ matrix: install: - eval "${ENV_EVAL}" - git clone https://github.com/QMatrixClient/matrix-doc.git -- git clone --recursive https://github.com/KitsuneRal/api-generator.git -- pushd api-generator +- git clone --recursive https://github.com/KitsuneRal/gtad.git +- pushd gtad - cmake -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} . - cmake --build . - popd before_script: - mkdir build && cd build -- cmake -DMATRIX_DOC_PATH="matrix-doc" -DAPIGEN_PATH="api-generator/api-generator" -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} .. +- cmake -DMATRIX_DOC_PATH="matrix-doc" -DGTAD_PATH="gtad/gtad" -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} .. - cmake --build . --target update-api script: cmake --build . diff --git a/CMakeLists.txt b/CMakeLists.txt index f4358521..44f63c79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,11 @@ if (CMAKE_BUILD_TYPE) endif(CMAKE_BUILD_TYPE) message( STATUS "Using compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" ) message( STATUS "Using Qt ${Qt5_VERSION} at ${Qt5_Prefix}" ) +if (MATRIX_DOC_PATH AND GTAD_PATH) + message( STATUS "Generating API stubs enabled" ) + message( STATUS " Using GTAD at ${GTAD_PATH}" ) + message( STATUS " Using CS API files at ${MATRIX_DOC_PATH}/api/client-server" ) +endif () message( STATUS "=============================================================================" ) message( STATUS ) @@ -84,16 +89,14 @@ set(libqmatrixclient_SRCS jobs/logoutjob.cpp ) -aux_source_directory(jobs/generated libqmatrixclient_job_SRCS) - -if (MATRIX_DOC_PATH AND APIGEN_PATH) +if (MATRIX_DOC_PATH AND GTAD_PATH) add_custom_target(update-api - ${APIGEN_PATH} --config jobs/apigen.yaml --out jobs/generated + ${GTAD_PATH} --config jobs/gtad.yaml --out jobs/generated ${MATRIX_DOC_PATH}/api/client-server content-repo.yaml- cas_login_redirect.yaml- cas_login_ticket.yaml- old_sync.yaml- room_initial_sync.yaml- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - SOURCES jobs/apigen.yaml jobs/{{base}}.h.mustache jobs/{{base}}.cpp.mustache + SOURCES jobs/gtad.yaml jobs/{{base}}.h.mustache jobs/{{base}}.cpp.mustache VERBATIM ) endif() diff --git a/jobs/apigen.yaml b/jobs/apigen.yaml deleted file mode 100644 index 69662a5d..00000000 --- a/jobs/apigen.yaml +++ /dev/null @@ -1,57 +0,0 @@ -preprocess: - "%CLIENT_RELEASE_LABEL%": r0 - "%CLIENT_MAJOR_VERSION%": r0 - -# Structure: -# swaggerType: -# OR -# swaggerType: -# - swaggerFormat: -# - /swaggerFormatRegEx/: -# - //: # default, if the format doesn't mach anything above -# WHERE -# targetTypeSpec = targetType OR -# { type: targetType, imports: , } -types: - integer: - - int64: qint64 - - int32: qint32 - - //: int - number: - - float: float - - //: double - boolean: bool - string: - - byte: &QByteArray { type: QByteArray, imports: } - - binary: *QByteArray - - date: - type: QDate - avoidCopy?: true - imports: - - dateTime: - type: QDateTime - avoidCopy?: true - imports: - - //: { type: QString, imports: } - file: - type: QByteArray - imports: - "returnFile?": true - object: { type: QJsonObject, "avoidCopy?": true, imports: } - array: { type: "QVector<{{1}}>", "avoidCopy?": true, imports: } - -#operations: - -env: -# preamble: preamble.mustache - copyrightName: Kitsune Ral - copyrightEmail: -# imports: { set: } -# returnFile?: { bool: false } - -templates: -- "{{base}}.h.mustache" -- "{{base}}.cpp.mustache" - -#outFilesList: apifiles.txt - diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml new file mode 100644 index 00000000..69662a5d --- /dev/null +++ b/jobs/gtad.yaml @@ -0,0 +1,57 @@ +preprocess: + "%CLIENT_RELEASE_LABEL%": r0 + "%CLIENT_MAJOR_VERSION%": r0 + +# Structure: +# swaggerType: +# OR +# swaggerType: +# - swaggerFormat: +# - /swaggerFormatRegEx/: +# - //: # default, if the format doesn't mach anything above +# WHERE +# targetTypeSpec = targetType OR +# { type: targetType, imports: , } +types: + integer: + - int64: qint64 + - int32: qint32 + - //: int + number: + - float: float + - //: double + boolean: bool + string: + - byte: &QByteArray { type: QByteArray, imports: } + - binary: *QByteArray + - date: + type: QDate + avoidCopy?: true + imports: + - dateTime: + type: QDateTime + avoidCopy?: true + imports: + - //: { type: QString, imports: } + file: + type: QByteArray + imports: + "returnFile?": true + object: { type: QJsonObject, "avoidCopy?": true, imports: } + array: { type: "QVector<{{1}}>", "avoidCopy?": true, imports: } + +#operations: + +env: +# preamble: preamble.mustache + copyrightName: Kitsune Ral + copyrightEmail: +# imports: { set: } +# returnFile?: { bool: false } + +templates: +- "{{base}}.h.mustache" +- "{{base}}.cpp.mustache" + +#outFilesList: apifiles.txt + -- cgit v1.2.3 From dd093699ba8a5634962cc7a2d5afffa303b0dcb1 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 10 Oct 2017 12:19:31 +0900 Subject: Extend the number of types supported by fromJson<>() Template function cannot have partial specializations, and we need to deserialise QVector<> objects. So fromJson<>() is now a wrapper around FromJson<> template class that does all the dispatching stuff in its operator(). --- jobs/converters.h | 88 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 28 deletions(-) diff --git a/jobs/converters.h b/jobs/converters.h index f9ab0269..f6e850c6 100644 --- a/jobs/converters.h +++ b/jobs/converters.h @@ -18,10 +18,9 @@ #pragma once -#include -#include +#include +#include // Includes #include -#include namespace QMatrixClient { @@ -45,45 +44,78 @@ namespace QMatrixClient return QJsonArray::fromStringList(strings); } + template + struct FromJson + { + T operator()(QJsonValue jv) const { return static_cast(jv); } + }; + template inline T fromJson(const QJsonValue& jv) { - return QVariant(jv).value(); + return FromJson()(jv); } - template <> - inline int fromJson(const QJsonValue& jv) + template <> struct FromJson { - return jv.toInt(); - } + bool operator()(QJsonValue jv) const { return jv.toBool(); } + }; - template <> - inline qint64 fromJson(const QJsonValue& jv) + template <> struct FromJson { - return static_cast(jv.toDouble()); - } + int operator()(QJsonValue jv) const { return jv.toInt(); } + }; - template <> - inline double fromJson(const QJsonValue& jv) + template <> struct FromJson { - return jv.toDouble(); - } + double operator()(QJsonValue jv) const { return jv.toDouble(); } + }; - template <> - inline QString fromJson(const QJsonValue& jv) + template <> struct FromJson { - return jv.toString(); - } + qint64 operator()(QJsonValue jv) const { return qint64(jv.toDouble()); } + }; - template <> - inline QDateTime fromJson(const QJsonValue& jv) + template <> struct FromJson { - return QDateTime::fromMSecsSinceEpoch(fromJson(jv), Qt::UTC); - } + QString operator()(QJsonValue jv) const { return jv.toString(); } + }; - template <> - inline QDate fromJson(const QJsonValue& jv) + template <> struct FromJson { - return fromJson(jv).date(); - } + QDateTime operator()(QJsonValue jv) const + { + return QDateTime::fromMSecsSinceEpoch(fromJson(jv), Qt::UTC); + } + }; + + template <> struct FromJson + { + QDate operator()(QJsonValue jv) const + { + return fromJson(jv).date(); + } + }; + + template <> struct FromJson + { + QJsonObject operator()(QJsonValue jv) const { return jv.toObject(); } + }; + + template <> struct FromJson + { + QJsonArray operator()(QJsonValue jv) const { return jv.toArray(); } + }; + + template struct FromJson> + { + QVector operator()(QJsonValue jv) const + { + const auto jsonArray = jv.toArray(); + QVector vect; vect.resize(jsonArray.size()); + std::transform(jsonArray.begin(), jsonArray.end(), + vect.begin(), FromJson()); + return vect; + } + }; } // namespace QMatrixClient -- cgit v1.2.3 From 7726249de84b829bf066638ab96c2785f3a32427 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 10 Oct 2017 12:20:16 +0900 Subject: Protect against identifiers hitting on C/C++ reserved words --- jobs/gtad.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml index 69662a5d..d09de66c 100644 --- a/jobs/gtad.yaml +++ b/jobs/gtad.yaml @@ -1,6 +1,8 @@ preprocess: "%CLIENT_RELEASE_LABEL%": r0 "%CLIENT_MAJOR_VERSION%": r0 + "unsigned:": "unsigned_:" + "default:": "default_:" # Structure: # swaggerType: -- cgit v1.2.3 From 13d1943710025d6a9dd6011b67c083ac9b00aa75 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 10 Oct 2017 16:35:00 +0900 Subject: Jobs with non-trivial results are generated properly This addresses the last bullet in KitsuneRal/gtad#10, completing the implementation. --- jobs/generated/inviting.cpp | 5 +-- jobs/generated/inviting.h | 6 ++-- jobs/generated/kicking.cpp | 5 +-- jobs/generated/kicking.h | 6 ++-- jobs/{{base}}.cpp.mustache | 80 ++++++++++++++++++++++++++------------------- jobs/{{base}}.h.mustache | 44 +++++++++++++------------ 6 files changed, 78 insertions(+), 68 deletions(-) diff --git a/jobs/generated/inviting.cpp b/jobs/generated/inviting.cpp index 164a2b2b..95ba658d 100644 --- a/jobs/generated/inviting.cpp +++ b/jobs/generated/inviting.cpp @@ -5,8 +5,7 @@ #include "inviting.h" -#include "../converters.h" - +#include "jobs/converters.h" #include using namespace QMatrixClient; @@ -23,5 +22,3 @@ InviteUserJob::InviteUserJob(QString roomId, QString user_id) ) { } - - diff --git a/jobs/generated/inviting.h b/jobs/generated/inviting.h index 8cfc9118..ac0fd5fa 100644 --- a/jobs/generated/inviting.h +++ b/jobs/generated/inviting.h @@ -14,12 +14,12 @@ namespace QMatrixClient { // Operations - + class InviteUserJob : public BaseJob { public: - InviteUserJob(QString roomId, QString user_id); - + explicit InviteUserJob(QString roomId, QString user_id); + }; } // namespace QMatrixClient diff --git a/jobs/generated/kicking.cpp b/jobs/generated/kicking.cpp index 3e2ef5be..2e6797d6 100644 --- a/jobs/generated/kicking.cpp +++ b/jobs/generated/kicking.cpp @@ -5,8 +5,7 @@ #include "kicking.h" -#include "../converters.h" - +#include "jobs/converters.h" #include using namespace QMatrixClient; @@ -24,5 +23,3 @@ KickJob::KickJob(QString roomId, QString user_id, QString reason) ) { } - - diff --git a/jobs/generated/kicking.h b/jobs/generated/kicking.h index 6ef19fcd..658193d5 100644 --- a/jobs/generated/kicking.h +++ b/jobs/generated/kicking.h @@ -14,12 +14,12 @@ namespace QMatrixClient { // Operations - + class KickJob : public BaseJob { public: - KickJob(QString roomId, QString user_id, QString reason); - + explicit KickJob(QString roomId, QString user_id, QString reason = {}); + }; } // namespace QMatrixClient diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index 0d01e6dd..beab77df 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -1,23 +1,40 @@ {{#@filePartial}}preamble{{/@filePartial}} #include "{{filenameBase}}.h" -{{#operations}} -#include "../converters.h" -#include +{{^models}}#include "jobs/converters.h"{{/models}} +{{#operations}}#include {{/operations}} using namespace QMatrixClient; -{{# returns?}} -class {{#@cap}}{{operationId}}{{/@cap}}Job::Private +{{#models}}{{#model}} +{{classname}}::operator QJsonValue() const +{ + QJsonObject o; + {{#vars}}o.insert("{{name}}", toJson({{name}})); + {{/vars}} + return o; +} + +{{classname}} FromJson<{{classname}}>::operator()(QJsonValue jv) +{ + QJsonObject o = jv.toObject(); + {{classname}} result; + {{#vars}}result.{{name}} = fromJson<{{datatype}}>(o.value("{{name}}")); + {{/vars}} + return result; +} +{{/model}}{{/models}}{{#operations}} +static const auto basePath = QStringLiteral("{{basePathWithoutHost}}"); +{{# operation}}{{#responses}}{{#normalResponse?}}{{#properties?}} +class {{camelCaseOperationId}}Job::Private { public: - {{#returns}}{{type}} {{name}};{{/returns}} + {{#properties}}{{dataType}} {{paramName}}; + {{/properties}} }; -{{/ returns?}} -static const auto basePath = QStringLiteral("{{basePathWithoutHost}}"); -{{# operation}} -{{#@cap}}{{operationId}}{{/@cap}}Job::{{#@cap}}{{operationId}}{{/@cap}}Job({{#allParams}}{{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}}{{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) - : BaseJob(HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{#@cap}}{{operationId}}{{/@cap}}Job", +{{/ properties?}}{{/normalResponse?}}{{/responses}} +{{camelCaseOperationId}}Job::{{camelCaseOperationId}}Job({{#allParams}}{{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}}{{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) + : BaseJob(HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{camelCaseOperationId}}Job", basePath{{#pathParts}} % {{part}}{{/pathParts}}, Query {{^queryParams}}{ }{{/queryParams}}{{#queryParams?}}{ {{#queryParams}}{ "{{baseName}}", toJson({{paramName}}).toString() }{{#hasMore}}, @@ -27,37 +44,32 @@ static const auto basePath = QStringLiteral("{{basePathWithoutHost}}"); {{#bodyParams}}{ "{{baseName}}", toJson({{paramName}}) }{{#hasMore}}, {{/hasMore}}{{/bodyParams}} }{{/bodyParams?}}{{#skipAuth}}, false{{/skipAuth}} - ){{#returns?}}, d(new Private){{/returns?}} + ){{#responses}}{{#normalResponse?}}{{#properties?}}, d(new Private){{/properties?}}{{/normalResponse?}}{{/responses}} { } -{{/ operation}} -{{# returns?}} -{{className}}Job::~{{className}}Job() +{{# responses}}{{#normalResponse?}}{{#properties?}} +{{camelCaseOperationId}}Job::~{{camelCaseOperationId}}Job() { delete d; } -{{# returns}} -{{type}} {{className}}Job::{{name}}() const +{{# properties}} +{{dataType}} {{camelCaseOperationId}}Job::{{paramName}}() const { - return d->{{name}}; + return d->{{paramName}}; } -{{/ returns}} -{{# returnFile?}} -BaseJob::Status {{className}}Job::parseReply(QByteArray data) +{{/ properties}}{{#returnFile?}} +BaseJob::Status {{camelCaseOperationId}}Job::parseReply(QByteArray data) { - {{#returns}}{{name}}{{/returns}} = data; + {{#properties}}{{paramName}}{{/properties}} = data; return Success; -} -{{/ returnFile?}}{{^returnFile?}} -BaseJob::Status {{className}}Job::parseJson(const QJsonDocument& data) +}{{/ returnFile?}}{{^returnFile?}} +BaseJob::Status {{camelCaseOperationId}}Job::parseJson(const QJsonDocument& data) { auto json = data.object(); - {{#returns}} - {{#required?}}if (!json.contains("{{name}}") - return { JsonParseError, "{{name}} not found in the response" };{{/required?}} - d->{{name}} = fromJson<{{type}}>(json.value("{{name}}")); - {{/returns}} + {{# properties}}{{#required?}}if (!json.contains("{{paramName}}")) + return { JsonParseError, + "The key '{{paramName}}' not found in the response" };{{/required?}} + d->{{paramName}} = fromJson<{{dataType}}>(json.value("{{paramName}}")); +{{/ properties}} return Success; -} -{{/ returnFile?}} -{{/ returns?}} -{{/operations}} +}{{/ returnFile?}} +{{/properties?}}{{/normalResponse?}}{{/responses}}{{/operation}}{{/operations}} diff --git a/jobs/{{base}}.h.mustache b/jobs/{{base}}.h.mustache index e19cf03d..08372b77 100644 --- a/jobs/{{base}}.h.mustache +++ b/jobs/{{base}}.h.mustache @@ -2,42 +2,46 @@ #pragma once -{{#operations}}#include "../basejob.h"{{/operations}} -{{#imports}} -#include {{.}} +{{#operations}}#include "../basejob.h" +{{/operations}} +{{#imports}}#include {{.}} {{/imports}} -{{#models}}#include {{/models}}{{! FIXME: This should probably go inside imports }} +{{#models}}#include "jobs/converters.h" +{{/models}} namespace QMatrixClient { {{#models}} // Data structures - {{#model}} +{{# model}} struct {{classname}} { - {{#vars}} - {{datatype}} {{name}}; + {{#vars}}{{datatype}} {{name}}; {{/vars}} - operator QJsonValue() const { return {}; } - };{{/model}} + operator QJsonValue() const; + }; + + template <> struct FromJson<{{classname}}> + { + {{classname}} operator()(QJsonValue jv); + }; +{{/ model}} {{/models}} {{#operations}} // Operations - {{#operation}} - class {{#@cap}}{{operationId}}{{/@cap}}Job : public BaseJob +{{# operation}} + class {{camelCaseOperationId}}Job : public BaseJob { public: - {{#@cap}}{{operationId}}{{/@cap}}Job({{#allParams}}{{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}}{{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); - {{#returns?}} - virtual {{className}}Job(); - - {{#returns}}{{type}} {{name}}() const;{{/returns}} + explicit {{camelCaseOperationId}}Job({{#allParams}}{{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}}{{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}}{{^required?}} = {{defaultValue}}{{^defaultValue}}{}{{/defaultValue}}{{/required?}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); +{{# responses}}{{#normalResponse?}}{{#properties?}} + virtual ~{{camelCaseOperationId}}Job(); + {{#properties}}{{dataType}} {{paramName}}() const; + {{/properties}} protected: + {{^returnFile}}Status parseJson(const QJsonDocument& data) override;{{/returnFile}} {{#returnFile?}}Status parseReply(QByteArray data) override;{{/returnFile?}} - {{^returnFile}}Status parseJson(const JsonDocument& data) override;{{/returnFile}} - private: class Private; - Private* d; - {{/returns?}} + Private* d;{{/properties?}}{{/normalResponse?}}{{/responses}} };{{/operation}} {{/operations}} } // namespace QMatrixClient -- cgit v1.2.3 From e7df1390b98cb6a4b0cae1558c331a8e79d71f95 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 12 Oct 2017 16:08:18 +0200 Subject: {{templates}} polishing --- jobs/{{base}}.cpp.mustache | 2 +- jobs/{{base}}.h.mustache | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index beab77df..45668d4c 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -52,7 +52,7 @@ class {{camelCaseOperationId}}Job::Private delete d; } {{# properties}} -{{dataType}} {{camelCaseOperationId}}Job::{{paramName}}() const +const {{dataType}}& {{camelCaseOperationId}}Job::{{paramName}}() const { return d->{{paramName}}; } diff --git a/jobs/{{base}}.h.mustache b/jobs/{{base}}.h.mustache index 08372b77..ad8a2f1f 100644 --- a/jobs/{{base}}.h.mustache +++ b/jobs/{{base}}.h.mustache @@ -32,9 +32,9 @@ namespace QMatrixClient public: explicit {{camelCaseOperationId}}Job({{#allParams}}{{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}}{{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}}{{^required?}} = {{defaultValue}}{{^defaultValue}}{}{{/defaultValue}}{{/required?}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); {{# responses}}{{#normalResponse?}}{{#properties?}} - virtual ~{{camelCaseOperationId}}Job(); + ~{{camelCaseOperationId}}Job() override; - {{#properties}}{{dataType}} {{paramName}}() const; + {{#properties}}const {{dataType}}& {{paramName}}() const; {{/properties}} protected: {{^returnFile}}Status parseJson(const QJsonDocument& data) override;{{/returnFile}} -- cgit v1.2.3 From 8800690c691dc9534fdb0f2d902862f816704d50 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 13 Oct 2017 00:02:46 +0200 Subject: Support banning and unbanning Closes #38. Also rearranged #includes --- jobs/generated/banning.cpp | 35 +++++++++++++++++++++++++++++++++++ jobs/generated/banning.h | 31 +++++++++++++++++++++++++++++++ room.cpp | 31 ++++++++++++++++++++----------- room.h | 5 ++++- 4 files changed, 90 insertions(+), 12 deletions(-) create mode 100644 jobs/generated/banning.cpp create mode 100644 jobs/generated/banning.h diff --git a/jobs/generated/banning.cpp b/jobs/generated/banning.cpp new file mode 100644 index 00000000..9fc5810a --- /dev/null +++ b/jobs/generated/banning.cpp @@ -0,0 +1,35 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "banning.h" + +#include "jobs/converters.h" +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +BanJob::BanJob(QString roomId, QString user_id, QString reason) + : BaseJob(HttpVerb::Post, "BanJob", + basePath % "/rooms/" % roomId % "/ban", + Query { }, + Data { + { "user_id", toJson(user_id) }, + { "reason", toJson(reason) } + } + ) +{ } + +UnbanJob::UnbanJob(QString roomId, QString user_id) + : BaseJob(HttpVerb::Post, "UnbanJob", + basePath % "/rooms/" % roomId % "/unban", + Query { }, + Data { + { "user_id", toJson(user_id) } + } + ) +{ } + diff --git a/jobs/generated/banning.h b/jobs/generated/banning.h new file mode 100644 index 00000000..b9d5b8db --- /dev/null +++ b/jobs/generated/banning.h @@ -0,0 +1,31 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + +#include "../basejob.h" + +#include + + +namespace QMatrixClient +{ + + // Operations + + class BanJob : public BaseJob + { + public: + explicit BanJob(QString roomId, QString user_id, QString reason = {}); + + }; + class UnbanJob : public BaseJob + { + public: + explicit UnbanJob(QString roomId, QString user_id); + + }; + +} // namespace QMatrixClient diff --git a/room.cpp b/room.cpp index 05b16b65..79168d85 100644 --- a/room.cpp +++ b/room.cpp @@ -20,17 +20,8 @@ #include "jobs/generated/kicking.h" #include "jobs/generated/inviting.h" - -#include - -#include -#include // for efficient string concats (operator%) -#include -#include - -#include "connection.h" -#include "state.h" -#include "user.h" +#include "jobs/generated/banning.h" +#include "jobs/setroomstatejob.h" #include "events/roomnameevent.h" #include "events/roomaliasesevent.h" #include "events/roomcanonicalaliasevent.h" @@ -42,6 +33,14 @@ #include "jobs/roommessagesjob.h" #include "jobs/postreceiptjob.h" #include "jobs/leaveroomjob.h" +#include "connection.h" +#include "user.h" + +#include +#include // for efficient string concats (operator%) +#include + +#include using namespace QMatrixClient; @@ -639,6 +638,16 @@ void Room::kickMember(const QString& memberId, const QString& reason) const connection()->callApi(id(), memberId, reason); } +void Room::ban(const QString& userId, const QString& reason) const +{ + connection()->callApi(id(), userId, reason); +} + +void Room::unban(const QString& userId) const +{ + connection()->callApi(id(), userId); +} + void Room::Private::dropDuplicateEvents(RoomEvents* events) const { // Collect all duplicate events at the end of the container diff --git a/room.h b/room.h index 455ef6cc..d62d160f 100644 --- a/room.h +++ b/room.h @@ -159,7 +159,10 @@ namespace QMatrixClient void inviteToRoom(const QString& memberId) const; void leaveRoom() const; - void kickMember(const QString& memberId, const QString& reason) const; + void kickMember(const QString& memberId, + const QString& reason = {}) const; + void ban(const QString& userId, const QString& reason = {}) const; + void unban(const QString& userId) const; void userRenamed(User* user, QString oldName); -- cgit v1.2.3 From 878248db6122952998b390cf8ff4591c3f144474 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 19 Oct 2017 11:24:15 +0900 Subject: Be more friendly to IDE, list the API files --- CMakeLists.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1d72131..d359214e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,6 +88,12 @@ set(libqmatrixclient_SRCS jobs/mediathumbnailjob.cpp ) +set(API_DEF_PATH ${MATRIX_DOC_PATH}/api/client-server/) +file(GLOB_RECURSE API_DEFS RELATIVE ${PROJECT_SOURCE_DIR} + ${API_DEF_PATH}/*.yaml + ${API_DEF_PATH}/definitions/*.yaml + ${MATRIX_DOC_PATH}/event-schemas/schema/* +) if (MATRIX_DOC_PATH AND GTAD_PATH) add_custom_target(update-api ${GTAD_PATH} --config jobs/gtad.yaml --out jobs/generated @@ -95,7 +101,9 @@ if (MATRIX_DOC_PATH AND GTAD_PATH) content-repo.yaml- cas_login_redirect.yaml- cas_login_ticket.yaml- old_sync.yaml- room_initial_sync.yaml- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - SOURCES jobs/gtad.yaml jobs/{{base}}.h.mustache jobs/{{base}}.cpp.mustache + SOURCES jobs/gtad.yaml + jobs/{{base}}.h.mustache jobs/{{base}}.cpp.mustache + ${API_DEFS} VERBATIM ) endif() -- cgit v1.2.3 From 55e0375851c439c97fc353c61d7c8b2b19485082 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 19 Oct 2017 19:23:10 +0900 Subject: Generated jobs: Don't dump empty strings to body parameters This is important for (soon to be added) LoginJob, since the server is sensitive to getting an (even empty) entity for "medium" as opposed to omitting it entirely. This cannot be addressed on the spec level; on the other hand, removing empty parameters from the payload reduces useless bytes getting on the wire. --- jobs/generated/banning.cpp | 25 ++++++++++++++----------- jobs/generated/inviting.cpp | 11 ++++++----- jobs/generated/kicking.cpp | 14 ++++++++------ jobs/generated/leaving.cpp | 6 ++---- jobs/generated/logout.cpp | 3 +-- jobs/generated/profile.cpp | 33 +++++++++++++++++---------------- jobs/gtad.yaml | 7 +++++-- jobs/{{base}}.cpp.mustache | 13 +++++++------ 8 files changed, 60 insertions(+), 52 deletions(-) diff --git a/jobs/generated/banning.cpp b/jobs/generated/banning.cpp index 9fc5810a..7efc2a85 100644 --- a/jobs/generated/banning.cpp +++ b/jobs/generated/banning.cpp @@ -15,21 +15,24 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); BanJob::BanJob(QString roomId, QString user_id, QString reason) : BaseJob(HttpVerb::Post, "BanJob", basePath % "/rooms/" % roomId % "/ban", - Query { }, - Data { - { "user_id", toJson(user_id) }, - { "reason", toJson(reason) } - } + Query { } ) -{ } +{ + Data _data; + _data.insert("user_id", toJson(user_id)); + if (!reason.isEmpty()) + _data.insert("reason", toJson(reason)); + setRequestData(_data); +} UnbanJob::UnbanJob(QString roomId, QString user_id) : BaseJob(HttpVerb::Post, "UnbanJob", basePath % "/rooms/" % roomId % "/unban", - Query { }, - Data { - { "user_id", toJson(user_id) } - } + Query { } ) -{ } +{ + Data _data; + _data.insert("user_id", toJson(user_id)); + setRequestData(_data); +} diff --git a/jobs/generated/inviting.cpp b/jobs/generated/inviting.cpp index 95ba658d..91760e57 100644 --- a/jobs/generated/inviting.cpp +++ b/jobs/generated/inviting.cpp @@ -15,10 +15,11 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); InviteUserJob::InviteUserJob(QString roomId, QString user_id) : BaseJob(HttpVerb::Post, "InviteUserJob", basePath % "/rooms/" % roomId % "/invite", - Query { }, - Data { - { "user_id", toJson(user_id) } - } + Query { } ) -{ } +{ + Data _data; + _data.insert("user_id", toJson(user_id)); + setRequestData(_data); +} diff --git a/jobs/generated/kicking.cpp b/jobs/generated/kicking.cpp index 2e6797d6..1a544c39 100644 --- a/jobs/generated/kicking.cpp +++ b/jobs/generated/kicking.cpp @@ -15,11 +15,13 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); KickJob::KickJob(QString roomId, QString user_id, QString reason) : BaseJob(HttpVerb::Post, "KickJob", basePath % "/rooms/" % roomId % "/kick", - Query { }, - Data { - { "user_id", toJson(user_id) }, - { "reason", toJson(reason) } - } + Query { } ) -{ } +{ + Data _data; + _data.insert("user_id", toJson(user_id)); + if (!reason.isEmpty()) + _data.insert("reason", toJson(reason)); + setRequestData(_data); +} diff --git a/jobs/generated/leaving.cpp b/jobs/generated/leaving.cpp index 7fed347b..a86714ac 100644 --- a/jobs/generated/leaving.cpp +++ b/jobs/generated/leaving.cpp @@ -15,16 +15,14 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); LeaveRoomJob::LeaveRoomJob(QString roomId) : BaseJob(HttpVerb::Post, "LeaveRoomJob", basePath % "/rooms/" % roomId % "/leave", - Query { }, - Data { } + Query { } ) { } ForgetRoomJob::ForgetRoomJob(QString roomId) : BaseJob(HttpVerb::Post, "ForgetRoomJob", basePath % "/rooms/" % roomId % "/forget", - Query { }, - Data { } + Query { } ) { } diff --git a/jobs/generated/logout.cpp b/jobs/generated/logout.cpp index b750efe2..b807012a 100644 --- a/jobs/generated/logout.cpp +++ b/jobs/generated/logout.cpp @@ -15,8 +15,7 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); LogoutJob::LogoutJob() : BaseJob(HttpVerb::Post, "LogoutJob", basePath % "/logout", - Query { }, - Data { } + Query { } ) { } diff --git a/jobs/generated/profile.cpp b/jobs/generated/profile.cpp index 9d20a480..7ef0577b 100644 --- a/jobs/generated/profile.cpp +++ b/jobs/generated/profile.cpp @@ -15,12 +15,14 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); SetDisplayNameJob::SetDisplayNameJob(QString userId, QString displayname) : BaseJob(HttpVerb::Put, "SetDisplayNameJob", basePath % "/profile/" % userId % "/displayname", - Query { }, - Data { - { "displayname", toJson(displayname) } - } + Query { } ) -{ } +{ + Data _data; + if (!displayname.isEmpty()) + _data.insert("displayname", toJson(displayname)); + setRequestData(_data); +} class GetDisplayNameJob::Private { @@ -32,8 +34,7 @@ class GetDisplayNameJob::Private GetDisplayNameJob::GetDisplayNameJob(QString userId) : BaseJob(HttpVerb::Get, "GetDisplayNameJob", basePath % "/profile/" % userId % "/displayname", - Query { }, - Data { } + Query { }, Data { }, false ), d(new Private) { } @@ -59,12 +60,14 @@ BaseJob::Status GetDisplayNameJob::parseJson(const QJsonDocument& data) SetAvatarUrlJob::SetAvatarUrlJob(QString userId, QString avatar_url) : BaseJob(HttpVerb::Put, "SetAvatarUrlJob", basePath % "/profile/" % userId % "/avatar_url", - Query { }, - Data { - { "avatar_url", toJson(avatar_url) } - } + Query { } ) -{ } +{ + Data _data; + if (!avatar_url.isEmpty()) + _data.insert("avatar_url", toJson(avatar_url)); + setRequestData(_data); +} class GetAvatarUrlJob::Private { @@ -76,8 +79,7 @@ class GetAvatarUrlJob::Private GetAvatarUrlJob::GetAvatarUrlJob(QString userId) : BaseJob(HttpVerb::Get, "GetAvatarUrlJob", basePath % "/profile/" % userId % "/avatar_url", - Query { }, - Data { } + Query { }, Data { }, false ), d(new Private) { } @@ -111,8 +113,7 @@ class GetUserProfileJob::Private GetUserProfileJob::GetUserProfileJob(QString userId) : BaseJob(HttpVerb::Get, "GetUserProfileJob", basePath % "/profile/" % userId, - Query { }, - Data { } + Query { }, Data { }, false ), d(new Private) { } diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml index d09de66c..4877aeb5 100644 --- a/jobs/gtad.yaml +++ b/jobs/gtad.yaml @@ -24,7 +24,10 @@ types: - //: double boolean: bool string: - - byte: &QByteArray { type: QByteArray, imports: } + - byte: &QByteArray + type: QByteArray + string?: true + imports: - binary: *QByteArray - date: type: QDate @@ -34,7 +37,7 @@ types: type: QDateTime avoidCopy?: true imports: - - //: { type: QString, imports: } + - //: { type: QString, "string?": true, imports: } file: type: QByteArray imports: diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index 45668d4c..f3a6dc59 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -39,13 +39,14 @@ class {{camelCaseOperationId}}Job::Private Query {{^queryParams}}{ }{{/queryParams}}{{#queryParams?}}{ {{#queryParams}}{ "{{baseName}}", toJson({{paramName}}).toString() }{{#hasMore}}, {{/hasMore}}{{/queryParams}} - }{{/queryParams?}}, - Data {{^bodyParams}}{ }{{/bodyParams}}{{#bodyParams?}}{ - {{#bodyParams}}{ "{{baseName}}", toJson({{paramName}}) }{{#hasMore}}, - {{/hasMore}}{{/bodyParams}} - }{{/bodyParams?}}{{#skipAuth}}, false{{/skipAuth}} + }{{/queryParams?}}{{#skipAuth}}, Data { }, false{{/skipAuth}} ){{#responses}}{{#normalResponse?}}{{#properties?}}, d(new Private){{/properties?}}{{/normalResponse?}}{{/responses}} -{ } +{{#bodyParams?}}{ + Data _data;{{#bodyParams}} +{{^required?}}{{#string?}} if (!{{paramName}}.isEmpty()) + {{/string?}}{{/required?}} _data.insert("{{baseName}}", toJson({{paramName}}));{{/bodyParams}} + setRequestData(_data); +}{{/bodyParams?}}{{^bodyParams?}}{ }{{/bodyParams?}} {{# responses}}{{#normalResponse?}}{{#properties?}} {{camelCaseOperationId}}Job::~{{camelCaseOperationId}}Job() { -- cgit v1.2.3 From e4fabf6e618b5045efec2629cb5d7b5bf73677e8 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 19 Oct 2017 19:26:49 +0900 Subject: Don't log renames This causes enormous traffic in the logs upon every startup when main.debug logs are on. --- user.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/user.cpp b/user.cpp index 171d6d6c..aa1aa447 100644 --- a/user.cpp +++ b/user.cpp @@ -85,8 +85,6 @@ void User::updateName(const QString& newName) const auto oldName = name(); if (d->name != newName) { - qCDebug(MAIN) << "Renaming" << id() - << "from" << oldName << "to" << newName; d->name = newName; emit nameChanged(this, oldName); } -- cgit v1.2.3 From ba620ee07989aff134fec6b5d6f058cab3377ecc Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 19 Oct 2017 19:36:10 +0900 Subject: Introduce device_id and initial_device_name support; switch to generated LoginJob This is _almost_ a backwards-compatible change, except that connect*() and other relevant methods in Connection are no more virtual (that wasn't much useful anyway). Otherwise it's a matter of passing initial_device_name to connectToServer(), saving device_id (along with access_token) from the result of LoginJob and then passing device_id (along with access_token, again) to connectWithToken() upon the next run. --- connection.cpp | 50 ++++++++++++--------------- connection.h | 29 +++++++++------- connectiondata.cpp | 12 +++++++ connectiondata.h | 2 ++ examples/qmc-example.cpp | 2 +- jobs/generated/login.cpp | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ jobs/generated/login.h | 38 +++++++++++++++++++++ settings.cpp | 29 +++++++++++----- settings.h | 13 ++++--- 9 files changed, 209 insertions(+), 55 deletions(-) create mode 100644 jobs/generated/login.cpp create mode 100644 jobs/generated/login.h diff --git a/connection.cpp b/connection.cpp index 84a52149..427118c9 100644 --- a/connection.cpp +++ b/connection.cpp @@ -21,8 +21,8 @@ #include "user.h" #include "events/event.h" #include "room.h" +#include "jobs/generated/login.h" #include "jobs/generated/logout.h" -#include "jobs/passwordlogin.h" #include "jobs/sendeventjob.h" #include "jobs/postreceiptjob.h" #include "jobs/joinroomjob.h" @@ -61,8 +61,6 @@ class Connection::Private // Leave state of the same room. QHash, Room*> roomMap; QHash userMap; - QString username; - QString password; QString userId; SyncJob* syncJob; @@ -113,42 +111,33 @@ void Connection::resolveServer(const QString& domain) }); } -void Connection::connectToServer(const QString& user, const QString& password) +void Connection::connectToServer(const QString& user, const QString& password, + const QString& initialDeviceName, + const QString& deviceId) { - auto loginJob = callApi(user, password); - connect( loginJob, &PasswordLogin::success, [=] () { - connectWithToken(loginJob->id(), loginJob->token()); + auto loginJob = callApi(QStringLiteral("m.login.password"), user, + /*medium*/ "", /*address*/ "", password, /*token*/ "", + deviceId, initialDeviceName); + connect( loginJob, &BaseJob::success, [=] () { + connectWithToken(loginJob->user_id(), loginJob->access_token(), + loginJob->device_id()); }); - connect( loginJob, &PasswordLogin::failure, [=] () { + connect( loginJob, &BaseJob::failure, [=] () { emit loginError(loginJob->errorString()); }); - d->username = user; // to be able to reconnect - d->password = password; } -void Connection::connectWithToken(const QString& userId, const QString& token) +void Connection::connectWithToken(const QString& userId, + const QString& accessToken, const QString& deviceId) { d->userId = userId; - d->data->setToken(token); - qCDebug(MAIN) << "Accessing" << d->data->baseUrl() - << "by user" << userId - << "with the following access token:"; - qCDebug(MAIN) << token; + d->data->setToken(accessToken); + d->data->setDeviceId(deviceId); + qCDebug(MAIN) << "Using server" << d->data->baseUrl() << "by user" << userId + << "from device" << deviceId; emit connected(); } -void Connection::reconnect() -{ - auto loginJob = callApi(d->username, d->password); - connect( loginJob, &PasswordLogin::success, [=] () { - d->userId = loginJob->id(); - emit reconnected(); - }); - connect( loginJob, &PasswordLogin::failure, [=] () { - emit loginError(loginJob->errorString()); - }); -} - void Connection::logout() { auto job = callApi(); @@ -301,6 +290,11 @@ QString Connection::userId() const return d->userId; } +const QString& Connection::deviceId() const +{ + return d->data->deviceId(); +} + QString Connection::token() const { return accessToken(); diff --git a/connection.h b/connection.h index b7d049f1..2a107b43 100644 --- a/connection.h +++ b/connection.h @@ -61,19 +61,6 @@ namespace QMatrixClient QHash, Room*> roomMap() const; - Q_INVOKABLE virtual void resolveServer(const QString& domain); - Q_INVOKABLE virtual void connectToServer(const QString& user, - const QString& password); - Q_INVOKABLE virtual void connectWithToken(const QString& userId, - const QString& token); - Q_INVOKABLE virtual void reconnect(); - /** @deprecated Use stopSync() instead */ - Q_INVOKABLE virtual void disconnectFromServer() { stopSync(); } - Q_INVOKABLE virtual void logout(); - - Q_INVOKABLE void sync(int timeout = -1); - Q_INVOKABLE void stopSync(); - // Old API that will be abolished any time soon. DO NOT USE. /** @deprecated Use callApi() or Room::postMessage() instead */ @@ -113,6 +100,7 @@ namespace QMatrixClient Q_INVOKABLE User* user(const QString& userId); Q_INVOKABLE User* user(); Q_INVOKABLE QString userId() const; + Q_INVOKABLE const QString& deviceId() const; /** @deprecated Use accessToken() instead. */ Q_INVOKABLE QString token() const; Q_INVOKABLE QString accessToken() const; @@ -185,6 +173,21 @@ namespace QMatrixClient [](Connection* c, const QString& id) { return new T(id, c); }; } + public slots: + void resolveServer(const QString& domain); + void connectToServer(const QString& user, const QString& password, + const QString& initialDeviceName, + const QString& deviceId = {}); + void connectWithToken(const QString& userId, const QString& accessToken, + const QString& deviceId); + + /** @deprecated Use stopSync() instead */ + void disconnectFromServer() { stopSync(); } + void logout(); + + void sync(int timeout = -1); + void stopSync(); + signals: void resolved(); void connected(); diff --git a/connectiondata.cpp b/connectiondata.cpp index 6f15577e..9b9b6e04 100644 --- a/connectiondata.cpp +++ b/connectiondata.cpp @@ -35,6 +35,7 @@ struct ConnectionData::Private QUrl baseUrl; QString accessToken; QString lastEvent; + QString deviceId; mutable unsigned int txnCounter = 0; const qint64 id = QDateTime::currentMSecsSinceEpoch(); @@ -83,6 +84,17 @@ void ConnectionData::setPort(int port) qCDebug(MAIN) << "updated baseUrl to" << d->baseUrl; } +const QString& ConnectionData::deviceId() const +{ + return d->deviceId; +} + +void ConnectionData::setDeviceId(const QString& deviceId) +{ + d->deviceId = deviceId; + qCDebug(MAIN) << "updated deviceId to" << d->deviceId; +} + QString ConnectionData::lastEvent() const { return d->lastEvent; diff --git a/connectiondata.h b/connectiondata.h index 7b0097d6..52a7461c 100644 --- a/connectiondata.h +++ b/connectiondata.h @@ -32,11 +32,13 @@ namespace QMatrixClient QString accessToken() const; QUrl baseUrl() const; + const QString& deviceId() const; QNetworkAccessManager* nam() const; void setToken( QString accessToken ); void setHost( QString host ); void setPort( int port ); + void setDeviceId(const QString& deviceId); QString lastEvent() const; void setLastEvent( QString identifier ); diff --git a/examples/qmc-example.cpp b/examples/qmc-example.cpp index a6da6aba..dc0c94e4 100644 --- a/examples/qmc-example.cpp +++ b/examples/qmc-example.cpp @@ -35,7 +35,7 @@ int main(int argc, char* argv[]) return -1; auto conn = new Connection(QUrl("https://matrix.org")); - conn->connectToServer(argv[1], argv[2]); + conn->connectToServer(argv[1], argv[2], "QMatrixClient example application"); QObject::connect(conn, &Connection::connected, [=] { cout << "Connected" << endl; conn->sync(); diff --git a/jobs/generated/login.cpp b/jobs/generated/login.cpp new file mode 100644 index 00000000..6e8294e7 --- /dev/null +++ b/jobs/generated/login.cpp @@ -0,0 +1,89 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "login.h" + +#include "jobs/converters.h" +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class LoginJob::Private +{ + public: + QString user_id; + QString access_token; + QString home_server; + QString device_id; + +}; + +LoginJob::LoginJob(QString type, QString user, QString medium, QString address, QString password, QString token, QString device_id, QString initial_device_display_name) + : BaseJob(HttpVerb::Post, "LoginJob", + basePath % "/login", + Query { }, Data { }, false + ), d(new Private) +{ + Data _data; + _data.insert("type", toJson(type)); + if (!user.isEmpty()) + _data.insert("user", toJson(user)); + if (!medium.isEmpty()) + _data.insert("medium", toJson(medium)); + if (!address.isEmpty()) + _data.insert("address", toJson(address)); + if (!password.isEmpty()) + _data.insert("password", toJson(password)); + if (!token.isEmpty()) + _data.insert("token", toJson(token)); + if (!device_id.isEmpty()) + _data.insert("device_id", toJson(device_id)); + if (!initial_device_display_name.isEmpty()) + _data.insert("initial_device_display_name", toJson(initial_device_display_name)); + setRequestData(_data); +} + +LoginJob::~LoginJob() +{ + delete d; +} + +const QString& LoginJob::user_id() const +{ + return d->user_id; +} + +const QString& LoginJob::access_token() const +{ + return d->access_token; +} + +const QString& LoginJob::home_server() const +{ + return d->home_server; +} + +const QString& LoginJob::device_id() const +{ + return d->device_id; +} + +BaseJob::Status LoginJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + + d->user_id = fromJson(json.value("user_id")); + + d->access_token = fromJson(json.value("access_token")); + + d->home_server = fromJson(json.value("home_server")); + + d->device_id = fromJson(json.value("device_id")); + + return Success; +} + diff --git a/jobs/generated/login.h b/jobs/generated/login.h new file mode 100644 index 00000000..dc89206d --- /dev/null +++ b/jobs/generated/login.h @@ -0,0 +1,38 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + +#include "../basejob.h" + +#include + + +namespace QMatrixClient +{ + + // Operations + + class LoginJob : public BaseJob + { + public: + explicit LoginJob(QString type, QString user = {}, QString medium = {}, QString address = {}, QString password = {}, QString token = {}, QString device_id = {}, QString initial_device_display_name = {}); + + ~LoginJob() override; + + const QString& user_id() const; + const QString& access_token() const; + const QString& home_server() const; + const QString& device_id() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + Private* d; + }; + +} // namespace QMatrixClient diff --git a/settings.cpp b/settings.cpp index fbcd845f..3a5f4d26 100644 --- a/settings.cpp +++ b/settings.cpp @@ -5,9 +5,6 @@ using namespace QMatrixClient; -Settings::~Settings() -{ } - void Settings::setValue(const QString& key, const QVariant& value) { // qCDebug() << "Setting" << key << "to" << value; @@ -19,9 +16,6 @@ QVariant Settings::value(const QString& key, const QVariant& defaultValue) const return QSettings::value(key, defaultValue); } -SettingsGroup::~SettingsGroup() -{ } - void SettingsGroup::setValue(const QString& key, const QVariant& value) { Settings::setValue(groupPath + "/" + key, value); @@ -58,9 +52,6 @@ void SettingsGroup::remove(const QString& key) Settings::remove(fullKey); } -AccountSettings::~AccountSettings() -{ } - bool AccountSettings::keepLoggedIn() const { return value("keep_logged_in", false).toBool(); @@ -86,6 +77,26 @@ QString AccountSettings::userId() const return group().section('/', -1); } +QString AccountSettings::deviceId() const +{ + return value("device_id").toString(); +} + +void AccountSettings::setDeviceId(const QString& deviceId) +{ + setValue("device_id", deviceId); +} + +QString AccountSettings::deviceName() const +{ + return value("device_name").toString(); +} + +void AccountSettings::setDeviceName(const QString& deviceName) +{ + setValue("device_name", deviceName); +} + QString AccountSettings::accessToken() const { return value("access_token").toString(); diff --git a/settings.h b/settings.h index eab0679a..a6c0420e 100644 --- a/settings.h +++ b/settings.h @@ -36,7 +36,6 @@ namespace QMatrixClient #else using QSettings::QSettings; #endif - virtual ~Settings(); Q_INVOKABLE void setValue(const QString &key, const QVariant &value); @@ -52,7 +51,6 @@ namespace QMatrixClient : Settings(qsettingsArgs...) , groupPath(path) { } - virtual ~SettingsGroup(); Q_INVOKABLE bool contains(const QString& key) const; Q_INVOKABLE QVariant value(const QString &key, @@ -72,6 +70,8 @@ namespace QMatrixClient { Q_OBJECT Q_PROPERTY(QString userId READ userId) + Q_PROPERTY(QString deviceId READ deviceId WRITE setDeviceId) + Q_PROPERTY(QString deviceName READ deviceName WRITE setDeviceName) Q_PROPERTY(QUrl homeserver READ homeserver WRITE setHomeserver) Q_PROPERTY(bool keepLoggedIn READ keepLoggedIn WRITE setKeepLoggedIn) Q_PROPERTY(QString accessToken READ accessToken WRITE setAccessToken) @@ -80,10 +80,15 @@ namespace QMatrixClient explicit AccountSettings(const QString& accountId, ArgTs... qsettingsArgs) : SettingsGroup("Accounts/" + accountId, qsettingsArgs...) { } - virtual ~AccountSettings(); QString userId() const; + QString deviceId() const; + void setDeviceId(const QString& deviceId); + + QString deviceName() const; + void setDeviceName(const QString& deviceName); + QUrl homeserver() const; void setHomeserver(const QUrl& url); @@ -94,4 +99,4 @@ namespace QMatrixClient void setAccessToken(const QString& accessToken); Q_INVOKABLE void clearAccessToken(); }; -} +} // namespace QMatrixClient -- cgit v1.2.3 From 94e6636d8225a0561ed7df3fa8081c5b0183610c Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 24 Oct 2017 08:38:51 +0900 Subject: Support inheritance in data structures --- jobs/{{base}}.h.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/{{base}}.h.mustache b/jobs/{{base}}.h.mustache index ad8a2f1f..65c79e24 100644 --- a/jobs/{{base}}.h.mustache +++ b/jobs/{{base}}.h.mustache @@ -12,7 +12,7 @@ namespace QMatrixClient { {{#models}} // Data structures {{# model}} - struct {{classname}} + struct {{classname}}{{#parents?}} : {{#parents}}{{.}}{{#last?}}, {{/last?}}{{/parents}}{{/parents?}} { {{#vars}}{{datatype}} {{name}}; {{/vars}} -- cgit v1.2.3 From bcdede472add732c49c95564034c8cfa1c38c725 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 30 Nov 2017 03:36:29 +0900 Subject: Generated jobs: Apply naming convention to parameters It's now camelCase everywhere, even if The Spec uses snake_case (it is not consistent in that respect). --- connection.cpp | 4 ++-- jobs/generated/banning.cpp | 8 ++++---- jobs/generated/banning.h | 4 ++-- jobs/generated/inviting.cpp | 4 ++-- jobs/generated/inviting.h | 2 +- jobs/generated/kicking.cpp | 4 ++-- jobs/generated/kicking.h | 2 +- jobs/generated/login.cpp | 42 +++++++++++++++++++++--------------------- jobs/generated/login.h | 10 +++++----- jobs/generated/profile.cpp | 22 +++++++++++----------- jobs/generated/profile.h | 6 +++--- jobs/{{base}}.cpp.mustache | 6 +++--- jobs/{{base}}.h.mustache | 2 +- 13 files changed, 58 insertions(+), 58 deletions(-) diff --git a/connection.cpp b/connection.cpp index d2641353..8630f976 100644 --- a/connection.cpp +++ b/connection.cpp @@ -165,8 +165,8 @@ void Connection::doConnectToServer(const QString& user, const QString& password, deviceId, initialDeviceName); connect(loginJob, &BaseJob::success, this, [=] { - d->connectWithToken(loginJob->user_id(), loginJob->access_token(), - loginJob->device_id()); + d->connectWithToken(loginJob->userId(), loginJob->accessToken(), + loginJob->deviceId()); }); connect(loginJob, &BaseJob::failure, this, [=] { diff --git a/jobs/generated/banning.cpp b/jobs/generated/banning.cpp index ebb4c96c..67b0e8a1 100644 --- a/jobs/generated/banning.cpp +++ b/jobs/generated/banning.cpp @@ -12,27 +12,27 @@ using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -BanJob::BanJob(QString roomId, QString user_id, QString reason) +BanJob::BanJob(QString roomId, QString userId, QString reason) : BaseJob(HttpVerb::Post, "BanJob", basePath % "/rooms/" % roomId % "/ban", Query { } ) { Data _data; - _data.insert("user_id", toJson(user_id)); + _data.insert("user_id", toJson(userId)); if (!reason.isEmpty()) _data.insert("reason", toJson(reason)); setRequestData(_data); } -UnbanJob::UnbanJob(QString roomId, QString user_id) +UnbanJob::UnbanJob(QString roomId, QString userId) : BaseJob(HttpVerb::Post, "UnbanJob", basePath % "/rooms/" % roomId % "/unban", Query { } ) { Data _data; - _data.insert("user_id", toJson(user_id)); + _data.insert("user_id", toJson(userId)); setRequestData(_data); } diff --git a/jobs/generated/banning.h b/jobs/generated/banning.h index b9d5b8db..e225a6ef 100644 --- a/jobs/generated/banning.h +++ b/jobs/generated/banning.h @@ -18,13 +18,13 @@ namespace QMatrixClient class BanJob : public BaseJob { public: - explicit BanJob(QString roomId, QString user_id, QString reason = {}); + explicit BanJob(QString roomId, QString userId, QString reason = {}); }; class UnbanJob : public BaseJob { public: - explicit UnbanJob(QString roomId, QString user_id); + explicit UnbanJob(QString roomId, QString userId); }; diff --git a/jobs/generated/inviting.cpp b/jobs/generated/inviting.cpp index 73c73076..e72bf734 100644 --- a/jobs/generated/inviting.cpp +++ b/jobs/generated/inviting.cpp @@ -12,14 +12,14 @@ using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -InviteUserJob::InviteUserJob(QString roomId, QString user_id) +InviteUserJob::InviteUserJob(QString roomId, QString userId) : BaseJob(HttpVerb::Post, "InviteUserJob", basePath % "/rooms/" % roomId % "/invite", Query { } ) { Data _data; - _data.insert("user_id", toJson(user_id)); + _data.insert("user_id", toJson(userId)); setRequestData(_data); } diff --git a/jobs/generated/inviting.h b/jobs/generated/inviting.h index ac0fd5fa..e4b61beb 100644 --- a/jobs/generated/inviting.h +++ b/jobs/generated/inviting.h @@ -18,7 +18,7 @@ namespace QMatrixClient class InviteUserJob : public BaseJob { public: - explicit InviteUserJob(QString roomId, QString user_id); + explicit InviteUserJob(QString roomId, QString userId); }; diff --git a/jobs/generated/kicking.cpp b/jobs/generated/kicking.cpp index 28d51d05..a0719aa2 100644 --- a/jobs/generated/kicking.cpp +++ b/jobs/generated/kicking.cpp @@ -12,14 +12,14 @@ using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -KickJob::KickJob(QString roomId, QString user_id, QString reason) +KickJob::KickJob(QString roomId, QString userId, QString reason) : BaseJob(HttpVerb::Post, "KickJob", basePath % "/rooms/" % roomId % "/kick", Query { } ) { Data _data; - _data.insert("user_id", toJson(user_id)); + _data.insert("user_id", toJson(userId)); if (!reason.isEmpty()) _data.insert("reason", toJson(reason)); setRequestData(_data); diff --git a/jobs/generated/kicking.h b/jobs/generated/kicking.h index 658193d5..e7daada8 100644 --- a/jobs/generated/kicking.h +++ b/jobs/generated/kicking.h @@ -18,7 +18,7 @@ namespace QMatrixClient class KickJob : public BaseJob { public: - explicit KickJob(QString roomId, QString user_id, QString reason = {}); + explicit KickJob(QString roomId, QString userId, QString reason = {}); }; diff --git a/jobs/generated/login.cpp b/jobs/generated/login.cpp index 0c57c684..7bd905ee 100644 --- a/jobs/generated/login.cpp +++ b/jobs/generated/login.cpp @@ -15,14 +15,14 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); class LoginJob::Private { public: - QString user_id; - QString access_token; - QString home_server; - QString device_id; + QString userId; + QString accessToken; + QString homeServer; + QString deviceId; }; -LoginJob::LoginJob(QString type, QString user, QString medium, QString address, QString password, QString token, QString device_id, QString initial_device_display_name) +LoginJob::LoginJob(QString type, QString user, QString medium, QString address, QString password, QString token, QString deviceId, QString initialDeviceDisplayName) : BaseJob(HttpVerb::Post, "LoginJob", basePath % "/login", Query { }, Data { }, false @@ -40,10 +40,10 @@ LoginJob::LoginJob(QString type, QString user, QString medium, QString address, _data.insert("password", toJson(password)); if (!token.isEmpty()) _data.insert("token", toJson(token)); - if (!device_id.isEmpty()) - _data.insert("device_id", toJson(device_id)); - if (!initial_device_display_name.isEmpty()) - _data.insert("initial_device_display_name", toJson(initial_device_display_name)); + if (!deviceId.isEmpty()) + _data.insert("device_id", toJson(deviceId)); + if (!initialDeviceDisplayName.isEmpty()) + _data.insert("initial_device_display_name", toJson(initialDeviceDisplayName)); setRequestData(_data); } @@ -52,37 +52,37 @@ LoginJob::~LoginJob() delete d; } -const QString& LoginJob::user_id() const +const QString& LoginJob::userId() const { - return d->user_id; + return d->userId; } -const QString& LoginJob::access_token() const +const QString& LoginJob::accessToken() const { - return d->access_token; + return d->accessToken; } -const QString& LoginJob::home_server() const +const QString& LoginJob::homeServer() const { - return d->home_server; + return d->homeServer; } -const QString& LoginJob::device_id() const +const QString& LoginJob::deviceId() const { - return d->device_id; + return d->deviceId; } BaseJob::Status LoginJob::parseJson(const QJsonDocument& data) { auto json = data.object(); - d->user_id = fromJson(json.value("user_id")); + d->userId = fromJson(json.value("user_id")); - d->access_token = fromJson(json.value("access_token")); + d->accessToken = fromJson(json.value("access_token")); - d->home_server = fromJson(json.value("home_server")); + d->homeServer = fromJson(json.value("home_server")); - d->device_id = fromJson(json.value("device_id")); + d->deviceId = fromJson(json.value("device_id")); return Success; } diff --git a/jobs/generated/login.h b/jobs/generated/login.h index dc89206d..8fcca09a 100644 --- a/jobs/generated/login.h +++ b/jobs/generated/login.h @@ -18,14 +18,14 @@ namespace QMatrixClient class LoginJob : public BaseJob { public: - explicit LoginJob(QString type, QString user = {}, QString medium = {}, QString address = {}, QString password = {}, QString token = {}, QString device_id = {}, QString initial_device_display_name = {}); + explicit LoginJob(QString type, QString user = {}, QString medium = {}, QString address = {}, QString password = {}, QString token = {}, QString deviceId = {}, QString initialDeviceDisplayName = {}); ~LoginJob() override; - const QString& user_id() const; - const QString& access_token() const; - const QString& home_server() const; - const QString& device_id() const; + const QString& userId() const; + const QString& accessToken() const; + const QString& homeServer() const; + const QString& deviceId() const; protected: Status parseJson(const QJsonDocument& data) override; diff --git a/jobs/generated/profile.cpp b/jobs/generated/profile.cpp index f24db15a..f682ad31 100644 --- a/jobs/generated/profile.cpp +++ b/jobs/generated/profile.cpp @@ -57,22 +57,22 @@ BaseJob::Status GetDisplayNameJob::parseJson(const QJsonDocument& data) return Success; } -SetAvatarUrlJob::SetAvatarUrlJob(QString userId, QString avatar_url) +SetAvatarUrlJob::SetAvatarUrlJob(QString userId, QString avatarUrl) : BaseJob(HttpVerb::Put, "SetAvatarUrlJob", basePath % "/profile/" % userId % "/avatar_url", Query { } ) { Data _data; - if (!avatar_url.isEmpty()) - _data.insert("avatar_url", toJson(avatar_url)); + if (!avatarUrl.isEmpty()) + _data.insert("avatar_url", toJson(avatarUrl)); setRequestData(_data); } class GetAvatarUrlJob::Private { public: - QString avatar_url; + QString avatarUrl; }; @@ -88,16 +88,16 @@ GetAvatarUrlJob::~GetAvatarUrlJob() delete d; } -const QString& GetAvatarUrlJob::avatar_url() const +const QString& GetAvatarUrlJob::avatarUrl() const { - return d->avatar_url; + return d->avatarUrl; } BaseJob::Status GetAvatarUrlJob::parseJson(const QJsonDocument& data) { auto json = data.object(); - d->avatar_url = fromJson(json.value("avatar_url")); + d->avatarUrl = fromJson(json.value("avatar_url")); return Success; } @@ -105,7 +105,7 @@ BaseJob::Status GetAvatarUrlJob::parseJson(const QJsonDocument& data) class GetUserProfileJob::Private { public: - QString avatar_url; + QString avatarUrl; QString displayname; }; @@ -122,9 +122,9 @@ GetUserProfileJob::~GetUserProfileJob() delete d; } -const QString& GetUserProfileJob::avatar_url() const +const QString& GetUserProfileJob::avatarUrl() const { - return d->avatar_url; + return d->avatarUrl; } const QString& GetUserProfileJob::displayname() const @@ -136,7 +136,7 @@ BaseJob::Status GetUserProfileJob::parseJson(const QJsonDocument& data) { auto json = data.object(); - d->avatar_url = fromJson(json.value("avatar_url")); + d->avatarUrl = fromJson(json.value("avatar_url")); d->displayname = fromJson(json.value("displayname")); diff --git a/jobs/generated/profile.h b/jobs/generated/profile.h index 8e2b195b..cd460ac3 100644 --- a/jobs/generated/profile.h +++ b/jobs/generated/profile.h @@ -40,7 +40,7 @@ namespace QMatrixClient class SetAvatarUrlJob : public BaseJob { public: - explicit SetAvatarUrlJob(QString userId, QString avatar_url = {}); + explicit SetAvatarUrlJob(QString userId, QString avatarUrl = {}); }; class GetAvatarUrlJob : public BaseJob @@ -50,7 +50,7 @@ namespace QMatrixClient ~GetAvatarUrlJob() override; - const QString& avatar_url() const; + const QString& avatarUrl() const; protected: Status parseJson(const QJsonDocument& data) override; @@ -66,7 +66,7 @@ namespace QMatrixClient ~GetUserProfileJob() override; - const QString& avatar_url() const; + const QString& avatarUrl() const; const QString& displayname() const; protected: diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index f3a6dc59..31b867fa 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -2,7 +2,7 @@ #include "{{filenameBase}}.h" -{{^models}}#include "jobs/converters.h"{{/models}} +{{^models}}#include "converters.h"{{/models}} {{#operations}}#include {{/operations}} using namespace QMatrixClient; @@ -35,7 +35,7 @@ class {{camelCaseOperationId}}Job::Private {{/ properties?}}{{/normalResponse?}}{{/responses}} {{camelCaseOperationId}}Job::{{camelCaseOperationId}}Job({{#allParams}}{{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}}{{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) : BaseJob(HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{camelCaseOperationId}}Job", - basePath{{#pathParts}} % {{part}}{{/pathParts}}, + basePath{{#pathParts}} % {{.}}{{/pathParts}}, Query {{^queryParams}}{ }{{/queryParams}}{{#queryParams?}}{ {{#queryParams}}{ "{{baseName}}", toJson({{paramName}}).toString() }{{#hasMore}}, {{/hasMore}}{{/queryParams}} @@ -69,7 +69,7 @@ BaseJob::Status {{camelCaseOperationId}}Job::parseJson(const QJsonDocument& data {{# properties}}{{#required?}}if (!json.contains("{{paramName}}")) return { JsonParseError, "The key '{{paramName}}' not found in the response" };{{/required?}} - d->{{paramName}} = fromJson<{{dataType}}>(json.value("{{paramName}}")); + d->{{paramName}} = fromJson<{{dataType}}>(json.value("{{baseName}}")); {{/ properties}} return Success; }{{/ returnFile?}} diff --git a/jobs/{{base}}.h.mustache b/jobs/{{base}}.h.mustache index 65c79e24..a751df9d 100644 --- a/jobs/{{base}}.h.mustache +++ b/jobs/{{base}}.h.mustache @@ -6,7 +6,7 @@ {{/operations}} {{#imports}}#include {{.}} {{/imports}} -{{#models}}#include "jobs/converters.h" +{{#models}}#include "converters.h" {{/models}} namespace QMatrixClient { -- cgit v1.2.3 From d01154a1899e216b04d6fd2ad3bb384715ca843b Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 30 Nov 2017 11:56:59 +0900 Subject: Connection: no more default to matrix.org; update HS URL from /login response --- connection.cpp | 8 ++++---- connection.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/connection.cpp b/connection.cpp index 8630f976..be4a712a 100644 --- a/connection.cpp +++ b/connection.cpp @@ -77,10 +77,9 @@ Connection::Connection(const QUrl& server, QObject* parent) d->q = this; // All d initialization should occur before this line } -Connection::Connection() - : Connection(QUrl("https://matrix.org")) -{ -} +Connection::Connection(QObject* parent) + : Connection({}, parent) +{ } Connection::~Connection() { @@ -165,6 +164,7 @@ void Connection::doConnectToServer(const QString& user, const QString& password, deviceId, initialDeviceName); connect(loginJob, &BaseJob::success, this, [=] { + setHomeserver(loginJob->homeServer()); d->connectWithToken(loginJob->userId(), loginJob->accessToken(), loginJob->deviceId()); }); diff --git a/connection.h b/connection.h index 256dbd5f..c67328a6 100644 --- a/connection.h +++ b/connection.h @@ -57,8 +57,8 @@ namespace QMatrixClient using user_factory_t = std::function; + explicit Connection(QObject* parent = nullptr); explicit Connection(const QUrl& server, QObject* parent = nullptr); - Connection(); virtual ~Connection(); QHash, Room*> roomMap() const; -- cgit v1.2.3 From f56edce1d27d71e5568506326468af411c78e731 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 6 Dec 2017 09:07:37 +0900 Subject: converters.h: support QByteArray --- converters.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/converters.h b/converters.h index 733c2c0e..5593ee24 100644 --- a/converters.h +++ b/converters.h @@ -44,6 +44,11 @@ namespace QMatrixClient return QJsonArray::fromStringList(strings); } + inline QJsonValue toJson(const QByteArray& bytes) + { + return QJsonValue(static_cast(bytes)); + } + template struct FromJson { @@ -133,4 +138,12 @@ namespace QMatrixClient template <> struct FromJson : FromJson> { }; + template <> struct FromJson + { + QByteArray operator()(QJsonValue jv) const + { + return fromJson(jv).toLatin1(); + } + }; + } // namespace QMatrixClient -- cgit v1.2.3 From e6a7ca28ce03ff1277430816dc5a41d503f93555 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 6 Dec 2017 09:10:50 +0900 Subject: Connection: undeprecate joinRoom() This is for the same reason as Connection::getThumbnail() - it's the only non-template (hence, supported by QML and Qt queued signal connections) way to invoke joining a room. --- connection.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connection.h b/connection.h index c67328a6..ecebb2e7 100644 --- a/connection.h +++ b/connection.h @@ -182,6 +182,8 @@ namespace QMatrixClient int requestedWidth, int requestedHeight) const; + virtual JoinRoomJob* joinRoom(const QString& roomAlias); + // Old API that will be abolished any time soon. DO NOT USE. /** @deprecated Use callApi() or Room::postMessage() instead */ @@ -190,8 +192,6 @@ namespace QMatrixClient /** @deprecated Use callApi() or Room::postReceipt() instead */ virtual PostReceiptJob* postReceipt(Room* room, RoomEvent* event) const; - /** @deprecated Use callApi() instead */ - virtual JoinRoomJob* joinRoom(const QString& roomAlias); /** @deprecated Use callApi() or Room::leaveRoom() instead */ virtual void leaveRoom( Room* room ); /** @deprecated User callApi() or Room::getPreviousContent() instead */ -- cgit v1.2.3 From ea2dcf5d6c9329a14b4e0039bd2dc45ac3fd89d8 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 6 Dec 2017 19:02:11 +0900 Subject: converters.h: Use perfect forwarding --- converters.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/converters.h b/converters.h index 5593ee24..9b78eb37 100644 --- a/converters.h +++ b/converters.h @@ -25,9 +25,9 @@ namespace QMatrixClient { template - inline QJsonValue toJson(T val) + inline QJsonValue toJson(T&& val) { - return QJsonValue(val); + return QJsonValue(std::forward(val)); } template -- cgit v1.2.3 From 905263ceb5e2e13b862bec0a64f6d84eca3c2e9d Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 6 Dec 2017 19:15:51 +0900 Subject: GTAD pre-0.4, with local data types and parametrised arrays; make avoidCopy? actually work Along with this: - avoid copying of QStrings (unneeded convenience in our case) - even less empty lines --- jobs/gtad.yaml | 35 +++++++++++++++------- jobs/{{base}}.cpp.mustache | 72 ++++++++++++++++++++++++++++++---------------- jobs/{{base}}.h.mustache | 50 ++++++++++++++++++++------------ 3 files changed, 105 insertions(+), 52 deletions(-) diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml index 4877aeb5..5f370ac5 100644 --- a/jobs/gtad.yaml +++ b/jobs/gtad.yaml @@ -1,8 +1,11 @@ preprocess: "%CLIENT_RELEASE_LABEL%": r0 "%CLIENT_MAJOR_VERSION%": r0 - "unsigned:": "unsigned_:" - "default:": "default_:" + # FIXME: the below only fixes C++ compilation but not actual work - the code + # will try to reach out for wrong values in JSON payloads + "signed:": "signedData:" + "unsigned:": "unsignedData:" + "default:": "isDefault:" # Structure: # swaggerType: @@ -29,25 +32,37 @@ types: string?: true imports: - binary: *QByteArray - - date: - type: QDate - avoidCopy?: true - imports: + - date: { type: QDate, "avoidCopy?": true, imports: } - dateTime: type: QDateTime avoidCopy?: true imports: - - //: { type: QString, "string?": true, imports: } + - //: + type: QString + string?: true + avoidCopy?: true + imports: file: type: QByteArray imports: - "returnFile?": true - object: { type: QJsonObject, "avoidCopy?": true, imports: } - array: { type: "QVector<{{1}}>", "avoidCopy?": true, imports: } + returnFile?: true + object: + type: QJsonObject + avoidCopy?: true + imports: + array: + - /.+/: + type: "QVector<{{1}}>" + avoidCopy?: true + imports: + - //: { type: QJsonArray, "avoidCopy?": true, imports: } #operations: env: + _typeRenderer: "{{#scope}}{{scopeCamelCase}}Job::{{/scope}}{{name}}" + maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}" + qualifiedMaybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}" # preamble: preamble.mustache copyrightName: Kitsune Ral copyrightEmail: diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index 31b867fa..84bb2bea 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -2,43 +2,68 @@ #include "{{filenameBase}}.h" -{{^models}}#include "converters.h"{{/models}} -{{#operations}}#include {{/operations}} - +#include "converters.h" +{{#operations}} +#include +{{/operations}} using namespace QMatrixClient; -{{#models}}{{#model}} -{{classname}}::operator QJsonValue() const +{{#models.model}}{{^trivial?}} +{{qualifiedName}}::operator QJsonValue() const { QJsonObject o; - {{#vars}}o.insert("{{name}}", toJson({{name}})); + {{#vars}}o.insert("{{baseName}}", toJson({{nameCamelCase}})); {{/vars}} return o; } -{{classname}} FromJson<{{classname}}>::operator()(QJsonValue jv) +{{qualifiedName}} FromJson<{{qualifiedName}}>::operator()(QJsonValue jv) { QJsonObject o = jv.toObject(); - {{classname}} result; - {{#vars}}result.{{name}} = fromJson<{{datatype}}>(o.value("{{name}}")); + {{qualifiedName}} result; + {{#vars}}result.{{nameCamelCase}} = + fromJson<{{dataType.name}}>(o.value("{{baseName}}")); {{/vars}} return result; } -{{/model}}{{/models}}{{#operations}} +{{/trivial?}}{{/models.model}}{{#operations}} static const auto basePath = QStringLiteral("{{basePathWithoutHost}}"); -{{# operation}}{{#responses}}{{#normalResponse?}}{{#properties?}} +{{# operation}}{{#models.model}}{{^trivial?}} +{{qualifiedName}}::operator QJsonValue() const +{ + QJsonObject o; + {{#vars}}o.insert("{{baseName}}", toJson({{nameCamelCase}})); + {{/vars}} + return o; +} +namespace QMatrixClient +{ + template <> struct FromJson<{{qualifiedName}}> + { + {{qualifiedName}} operator()(QJsonValue jv) + { + QJsonObject o = jv.toObject(); + {{qualifiedName}} result; + {{#vars}}result.{{nameCamelCase}} = + fromJson<{{dataType.qualifiedName}}>(o.value("{{baseName}}")); + {{/vars}} + return result; + } + }; +} +{{/ trivial?}}{{/models.model}}{{#responses}}{{#normalResponse?}}{{#properties?}} class {{camelCaseOperationId}}Job::Private { public: - {{#properties}}{{dataType}} {{paramName}}; - {{/properties}} + {{#properties}}{{dataType.name}} {{paramName}};{{#@join}}{{!EOL except the last line}} + {{/@join}}{{/properties}} }; {{/ properties?}}{{/normalResponse?}}{{/responses}} -{{camelCaseOperationId}}Job::{{camelCaseOperationId}}Job({{#allParams}}{{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}}{{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) +{{camelCaseOperationId}}Job::{{camelCaseOperationId}}Job({{#allParams}}{{>maybeCrefType}} {{paramName}}{{#@join}}, {{/@join}}{{/allParams}}) : BaseJob(HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{camelCaseOperationId}}Job", - basePath{{#pathParts}} % {{.}}{{/pathParts}}, + basePath{{#pathParts}} % {{_}}{{/pathParts}}, Query {{^queryParams}}{ }{{/queryParams}}{{#queryParams?}}{ - {{#queryParams}}{ "{{baseName}}", toJson({{paramName}}).toString() }{{#hasMore}}, - {{/hasMore}}{{/queryParams}} + {{#queryParams}}{ "{{baseName}}", toJson({{paramName}}).toString() }{{#@join}}, + {{/@join}}{{/queryParams}} }{{/queryParams?}}{{#skipAuth}}, Data { }, false{{/skipAuth}} ){{#responses}}{{#normalResponse?}}{{#properties?}}, d(new Private){{/properties?}}{{/normalResponse?}}{{/responses}} {{#bodyParams?}}{ @@ -53,24 +78,23 @@ class {{camelCaseOperationId}}Job::Private delete d; } {{# properties}} -const {{dataType}}& {{camelCaseOperationId}}Job::{{paramName}}() const +{{>qualifiedMaybeCrefType}} {{camelCaseOperationId}}Job::{{paramName}}() const { return d->{{paramName}}; } {{/ properties}}{{#returnFile?}} BaseJob::Status {{camelCaseOperationId}}Job::parseReply(QByteArray data) { - {{#properties}}{{paramName}}{{/properties}} = data; + {{properties.nameCamelCase}} = data; return Success; }{{/ returnFile?}}{{^returnFile?}} BaseJob::Status {{camelCaseOperationId}}Job::parseJson(const QJsonDocument& data) { auto json = data.object(); - {{# properties}}{{#required?}}if (!json.contains("{{paramName}}")) + {{# properties}}{{#required?}}if (!json.contains("{{baseName}}")) return { JsonParseError, - "The key '{{paramName}}' not found in the response" };{{/required?}} - d->{{paramName}} = fromJson<{{dataType}}>(json.value("{{baseName}}")); -{{/ properties}} - return Success; + "The key '{{baseName}}' not found in the response" }; + {{/required?}}d->{{paramName}} = fromJson<{{dataType.name}}>(json.value("{{baseName}}")); + {{/ properties}}return Success; }{{/ returnFile?}} {{/properties?}}{{/normalResponse?}}{{/responses}}{{/operation}}{{/operations}} diff --git a/jobs/{{base}}.h.mustache b/jobs/{{base}}.h.mustache index a751df9d..f7124f97 100644 --- a/jobs/{{base}}.h.mustache +++ b/jobs/{{base}}.h.mustache @@ -4,37 +4,51 @@ {{#operations}}#include "../basejob.h" {{/operations}} -{{#imports}}#include {{.}} +{{#imports}}#include {{_}} {{/imports}} -{{#models}}#include "converters.h" -{{/models}} +{{#allModels}}#include "converters.h" +{{/allModels}} namespace QMatrixClient { {{#models}} // Data structures -{{# model}} - struct {{classname}}{{#parents?}} : {{#parents}}{{.}}{{#last?}}, {{/last?}}{{/parents}}{{/parents?}} +{{# model}}{{#trivial?}} + using {{name}} = {{parent.name}}; +{{/ trivial?}}{{^trivial?}} + struct {{name}}{{#parents?}} : {{#parents}}{{name}}{{#@join}}, {{/@join}}{{/parents}}{{/parents?}} { - {{#vars}}{{datatype}} {{name}}; + {{#vars}}{{dataType.name}} {{nameCamelCase}}; {{/vars}} operator QJsonValue() const; }; - template <> struct FromJson<{{classname}}> + template <> struct FromJson<{{name}}> { - {{classname}} operator()(QJsonValue jv); + {{name}} operator()(QJsonValue jv); }; -{{/ model}} -{{/models}} -{{#operations}} // Operations +{{/ trivial?}}{{/model}} +{{/models}}{{#operations}} // Operations {{# operation}} class {{camelCaseOperationId}}Job : public BaseJob { - public: - explicit {{camelCaseOperationId}}Job({{#allParams}}{{#avoidCopy?}}const {{dataType}}&{{/avoidCopy?}}{{^avoidCopy?}}{{dataType}}{{/avoidCopy?}} {{paramName}}{{^required?}} = {{defaultValue}}{{^defaultValue}}{}{{/defaultValue}}{{/required?}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); -{{# responses}}{{#normalResponse?}}{{#properties?}} + public:{{# models}} + // Inner data structures +{{# model}}{{#trivial?}} + using {{name}} = {{parent.name}}; +{{/ trivial?}}{{^trivial?}} + struct {{name}}{{#parents?}} : {{#parents}}{{name}}{{#@join}}, {{/@join}}{{/parents}}{{/parents?}} + { + {{#vars}}{{dataType.name}} {{nameCamelCase}}; + {{/vars}} + operator QJsonValue() const; + }; +{{/ trivial?}}{{/model}} + // End of inner data structures +{{/models}} + explicit {{camelCaseOperationId}}Job({{#allParams}}{{>maybeCrefType}} {{paramName}}{{^required?}} = {{defaultValue}}{{^defaultValue}}{}{{/defaultValue}}{{/required?}}{{#@join}}, {{/@join}}{{/allParams}});{{!skip EOL +}}{{# responses}}{{#normalResponse?}}{{#properties?}} ~{{camelCaseOperationId}}Job() override; - {{#properties}}const {{dataType}}& {{paramName}}() const; + {{#properties}}{{>maybeCrefType}} {{paramName}}() const; {{/properties}} protected: {{^returnFile}}Status parseJson(const QJsonDocument& data) override;{{/returnFile}} @@ -42,6 +56,6 @@ namespace QMatrixClient private: class Private; Private* d;{{/properties?}}{{/normalResponse?}}{{/responses}} - };{{/operation}} -{{/operations}} -} // namespace QMatrixClient + }; +{{/operation}}{{/operations}}{{!skip EOL +}}} // namespace QMatrixClient -- cgit v1.2.3 From 21952d689db64bfb11e1cd11a7da802b649f9ae8 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 6 Dec 2017 19:24:03 +0900 Subject: jobs/generated: don't rely on QString's COW; firmer formatting --- jobs/generated/banning.cpp | 5 +++-- jobs/generated/banning.h | 9 +++------ jobs/generated/inviting.cpp | 3 ++- jobs/generated/inviting.h | 5 +---- jobs/generated/kicking.cpp | 3 ++- jobs/generated/kicking.h | 5 +---- jobs/generated/leaving.cpp | 5 +++-- jobs/generated/leaving.h | 9 +++------ jobs/generated/login.cpp | 9 ++------- jobs/generated/login.h | 5 +---- jobs/generated/logout.cpp | 1 + jobs/generated/logout.h | 3 --- jobs/generated/profile.cpp | 21 ++++++--------------- jobs/generated/profile.h | 21 +++++++++------------ 14 files changed, 37 insertions(+), 67 deletions(-) diff --git a/jobs/generated/banning.cpp b/jobs/generated/banning.cpp index 67b0e8a1..61677da6 100644 --- a/jobs/generated/banning.cpp +++ b/jobs/generated/banning.cpp @@ -6,13 +6,14 @@ #include "banning.h" #include "converters.h" + #include using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -BanJob::BanJob(QString roomId, QString userId, QString reason) +BanJob::BanJob(const QString& roomId, const QString& userId, const QString& reason) : BaseJob(HttpVerb::Post, "BanJob", basePath % "/rooms/" % roomId % "/ban", Query { } @@ -25,7 +26,7 @@ BanJob::BanJob(QString roomId, QString userId, QString reason) setRequestData(_data); } -UnbanJob::UnbanJob(QString roomId, QString userId) +UnbanJob::UnbanJob(const QString& roomId, const QString& userId) : BaseJob(HttpVerb::Post, "UnbanJob", basePath % "/rooms/" % roomId % "/unban", Query { } diff --git a/jobs/generated/banning.h b/jobs/generated/banning.h index e225a6ef..6db096ee 100644 --- a/jobs/generated/banning.h +++ b/jobs/generated/banning.h @@ -12,20 +12,17 @@ namespace QMatrixClient { - // Operations class BanJob : public BaseJob { public: - explicit BanJob(QString roomId, QString userId, QString reason = {}); - + explicit BanJob(const QString& roomId, const QString& userId, const QString& reason = {}); }; + class UnbanJob : public BaseJob { public: - explicit UnbanJob(QString roomId, QString userId); - + explicit UnbanJob(const QString& roomId, const QString& userId); }; - } // namespace QMatrixClient diff --git a/jobs/generated/inviting.cpp b/jobs/generated/inviting.cpp index e72bf734..78c9a2f6 100644 --- a/jobs/generated/inviting.cpp +++ b/jobs/generated/inviting.cpp @@ -6,13 +6,14 @@ #include "inviting.h" #include "converters.h" + #include using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -InviteUserJob::InviteUserJob(QString roomId, QString userId) +InviteUserJob::InviteUserJob(const QString& roomId, const QString& userId) : BaseJob(HttpVerb::Post, "InviteUserJob", basePath % "/rooms/" % roomId % "/invite", Query { } diff --git a/jobs/generated/inviting.h b/jobs/generated/inviting.h index e4b61beb..225cb516 100644 --- a/jobs/generated/inviting.h +++ b/jobs/generated/inviting.h @@ -12,14 +12,11 @@ namespace QMatrixClient { - // Operations class InviteUserJob : public BaseJob { public: - explicit InviteUserJob(QString roomId, QString userId); - + explicit InviteUserJob(const QString& roomId, const QString& userId); }; - } // namespace QMatrixClient diff --git a/jobs/generated/kicking.cpp b/jobs/generated/kicking.cpp index a0719aa2..5d6f1a64 100644 --- a/jobs/generated/kicking.cpp +++ b/jobs/generated/kicking.cpp @@ -6,13 +6,14 @@ #include "kicking.h" #include "converters.h" + #include using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -KickJob::KickJob(QString roomId, QString userId, QString reason) +KickJob::KickJob(const QString& roomId, const QString& userId, const QString& reason) : BaseJob(HttpVerb::Post, "KickJob", basePath % "/rooms/" % roomId % "/kick", Query { } diff --git a/jobs/generated/kicking.h b/jobs/generated/kicking.h index e7daada8..7c834e45 100644 --- a/jobs/generated/kicking.h +++ b/jobs/generated/kicking.h @@ -12,14 +12,11 @@ namespace QMatrixClient { - // Operations class KickJob : public BaseJob { public: - explicit KickJob(QString roomId, QString userId, QString reason = {}); - + explicit KickJob(const QString& roomId, const QString& userId, const QString& reason = {}); }; - } // namespace QMatrixClient diff --git a/jobs/generated/leaving.cpp b/jobs/generated/leaving.cpp index 392f1ca8..2cf7fda3 100644 --- a/jobs/generated/leaving.cpp +++ b/jobs/generated/leaving.cpp @@ -6,20 +6,21 @@ #include "leaving.h" #include "converters.h" + #include using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -LeaveRoomJob::LeaveRoomJob(QString roomId) +LeaveRoomJob::LeaveRoomJob(const QString& roomId) : BaseJob(HttpVerb::Post, "LeaveRoomJob", basePath % "/rooms/" % roomId % "/leave", Query { } ) { } -ForgetRoomJob::ForgetRoomJob(QString roomId) +ForgetRoomJob::ForgetRoomJob(const QString& roomId) : BaseJob(HttpVerb::Post, "ForgetRoomJob", basePath % "/rooms/" % roomId % "/forget", Query { } diff --git a/jobs/generated/leaving.h b/jobs/generated/leaving.h index 96304084..28ba3d92 100644 --- a/jobs/generated/leaving.h +++ b/jobs/generated/leaving.h @@ -12,20 +12,17 @@ namespace QMatrixClient { - // Operations class LeaveRoomJob : public BaseJob { public: - explicit LeaveRoomJob(QString roomId); - + explicit LeaveRoomJob(const QString& roomId); }; + class ForgetRoomJob : public BaseJob { public: - explicit ForgetRoomJob(QString roomId); - + explicit ForgetRoomJob(const QString& roomId); }; - } // namespace QMatrixClient diff --git a/jobs/generated/login.cpp b/jobs/generated/login.cpp index 7bd905ee..892d0c81 100644 --- a/jobs/generated/login.cpp +++ b/jobs/generated/login.cpp @@ -6,6 +6,7 @@ #include "login.h" #include "converters.h" + #include using namespace QMatrixClient; @@ -19,10 +20,9 @@ class LoginJob::Private QString accessToken; QString homeServer; QString deviceId; - }; -LoginJob::LoginJob(QString type, QString user, QString medium, QString address, QString password, QString token, QString deviceId, QString initialDeviceDisplayName) +LoginJob::LoginJob(const QString& type, const QString& user, const QString& medium, const QString& address, const QString& password, const QString& token, const QString& deviceId, const QString& initialDeviceDisplayName) : BaseJob(HttpVerb::Post, "LoginJob", basePath % "/login", Query { }, Data { }, false @@ -75,15 +75,10 @@ const QString& LoginJob::deviceId() const BaseJob::Status LoginJob::parseJson(const QJsonDocument& data) { auto json = data.object(); - d->userId = fromJson(json.value("user_id")); - d->accessToken = fromJson(json.value("access_token")); - d->homeServer = fromJson(json.value("home_server")); - d->deviceId = fromJson(json.value("device_id")); - return Success; } diff --git a/jobs/generated/login.h b/jobs/generated/login.h index 8fcca09a..1c017877 100644 --- a/jobs/generated/login.h +++ b/jobs/generated/login.h @@ -12,14 +12,12 @@ namespace QMatrixClient { - // Operations class LoginJob : public BaseJob { public: - explicit LoginJob(QString type, QString user = {}, QString medium = {}, QString address = {}, QString password = {}, QString token = {}, QString deviceId = {}, QString initialDeviceDisplayName = {}); - + explicit LoginJob(const QString& type, const QString& user = {}, const QString& medium = {}, const QString& address = {}, const QString& password = {}, const QString& token = {}, const QString& deviceId = {}, const QString& initialDeviceDisplayName = {}); ~LoginJob() override; const QString& userId() const; @@ -34,5 +32,4 @@ namespace QMatrixClient class Private; Private* d; }; - } // namespace QMatrixClient diff --git a/jobs/generated/logout.cpp b/jobs/generated/logout.cpp index c2480ff9..c250bddf 100644 --- a/jobs/generated/logout.cpp +++ b/jobs/generated/logout.cpp @@ -6,6 +6,7 @@ #include "logout.h" #include "converters.h" + #include using namespace QMatrixClient; diff --git a/jobs/generated/logout.h b/jobs/generated/logout.h index 28e85d8f..ae9e54b8 100644 --- a/jobs/generated/logout.h +++ b/jobs/generated/logout.h @@ -11,14 +11,11 @@ namespace QMatrixClient { - // Operations class LogoutJob : public BaseJob { public: explicit LogoutJob(); - }; - } // namespace QMatrixClient diff --git a/jobs/generated/profile.cpp b/jobs/generated/profile.cpp index f682ad31..42a2350f 100644 --- a/jobs/generated/profile.cpp +++ b/jobs/generated/profile.cpp @@ -6,13 +6,14 @@ #include "profile.h" #include "converters.h" + #include using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -SetDisplayNameJob::SetDisplayNameJob(QString userId, QString displayname) +SetDisplayNameJob::SetDisplayNameJob(const QString& userId, const QString& displayname) : BaseJob(HttpVerb::Put, "SetDisplayNameJob", basePath % "/profile/" % userId % "/displayname", Query { } @@ -28,10 +29,9 @@ class GetDisplayNameJob::Private { public: QString displayname; - }; -GetDisplayNameJob::GetDisplayNameJob(QString userId) +GetDisplayNameJob::GetDisplayNameJob(const QString& userId) : BaseJob(HttpVerb::Get, "GetDisplayNameJob", basePath % "/profile/" % userId % "/displayname", Query { }, Data { }, false @@ -51,13 +51,11 @@ const QString& GetDisplayNameJob::displayname() const BaseJob::Status GetDisplayNameJob::parseJson(const QJsonDocument& data) { auto json = data.object(); - d->displayname = fromJson(json.value("displayname")); - return Success; } -SetAvatarUrlJob::SetAvatarUrlJob(QString userId, QString avatarUrl) +SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QString& avatarUrl) : BaseJob(HttpVerb::Put, "SetAvatarUrlJob", basePath % "/profile/" % userId % "/avatar_url", Query { } @@ -73,10 +71,9 @@ class GetAvatarUrlJob::Private { public: QString avatarUrl; - }; -GetAvatarUrlJob::GetAvatarUrlJob(QString userId) +GetAvatarUrlJob::GetAvatarUrlJob(const QString& userId) : BaseJob(HttpVerb::Get, "GetAvatarUrlJob", basePath % "/profile/" % userId % "/avatar_url", Query { }, Data { }, false @@ -96,9 +93,7 @@ const QString& GetAvatarUrlJob::avatarUrl() const BaseJob::Status GetAvatarUrlJob::parseJson(const QJsonDocument& data) { auto json = data.object(); - d->avatarUrl = fromJson(json.value("avatar_url")); - return Success; } @@ -107,10 +102,9 @@ class GetUserProfileJob::Private public: QString avatarUrl; QString displayname; - }; -GetUserProfileJob::GetUserProfileJob(QString userId) +GetUserProfileJob::GetUserProfileJob(const QString& userId) : BaseJob(HttpVerb::Get, "GetUserProfileJob", basePath % "/profile/" % userId, Query { }, Data { }, false @@ -135,11 +129,8 @@ const QString& GetUserProfileJob::displayname() const BaseJob::Status GetUserProfileJob::parseJson(const QJsonDocument& data) { auto json = data.object(); - d->avatarUrl = fromJson(json.value("avatar_url")); - d->displayname = fromJson(json.value("displayname")); - return Success; } diff --git a/jobs/generated/profile.h b/jobs/generated/profile.h index cd460ac3..30e858de 100644 --- a/jobs/generated/profile.h +++ b/jobs/generated/profile.h @@ -12,20 +12,18 @@ namespace QMatrixClient { - // Operations class SetDisplayNameJob : public BaseJob { public: - explicit SetDisplayNameJob(QString userId, QString displayname = {}); - + explicit SetDisplayNameJob(const QString& userId, const QString& displayname = {}); }; + class GetDisplayNameJob : public BaseJob { public: - explicit GetDisplayNameJob(QString userId); - + explicit GetDisplayNameJob(const QString& userId); ~GetDisplayNameJob() override; const QString& displayname() const; @@ -37,17 +35,17 @@ namespace QMatrixClient class Private; Private* d; }; + class SetAvatarUrlJob : public BaseJob { public: - explicit SetAvatarUrlJob(QString userId, QString avatarUrl = {}); - + explicit SetAvatarUrlJob(const QString& userId, const QString& avatarUrl = {}); }; + class GetAvatarUrlJob : public BaseJob { public: - explicit GetAvatarUrlJob(QString userId); - + explicit GetAvatarUrlJob(const QString& userId); ~GetAvatarUrlJob() override; const QString& avatarUrl() const; @@ -59,11 +57,11 @@ namespace QMatrixClient class Private; Private* d; }; + class GetUserProfileJob : public BaseJob { public: - explicit GetUserProfileJob(QString userId); - + explicit GetUserProfileJob(const QString& userId); ~GetUserProfileJob() override; const QString& avatarUrl() const; @@ -76,5 +74,4 @@ namespace QMatrixClient class Private; Private* d; }; - } // namespace QMatrixClient -- cgit v1.2.3 From e74de57832f684244d7da82fa743b63d459bf488 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 6 Dec 2017 21:21:27 +0900 Subject: Make BaseJob::Data consume QByteArray as well, not only QJsonObject This is needed to support cases of content-repo, where the request/response bodies are not JSON. --- jobs/basejob.h | 33 ++++++++++++++++++--------------- jobs/generated/banning.cpp | 4 ++-- jobs/generated/inviting.cpp | 2 +- jobs/generated/kicking.cpp | 2 +- jobs/generated/login.cpp | 2 +- jobs/generated/profile.cpp | 4 ++-- 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/jobs/basejob.h b/jobs/basejob.h index f8b367c6..66812774 100644 --- a/jobs/basejob.h +++ b/jobs/basejob.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -69,29 +70,31 @@ namespace QMatrixClient } }; /** - * A simple wrapper around QJsonObject that represents a JSON data - * section of an HTTP request to a Matrix server. Facilitates - * creation from a list of key-value string pairs and dumping of - * a resulting JSON to a QByteArray. + * A simple wrapper that represents the request body. + * Provides a unified interface to dump an unstructured byte stream + * as well as JSON (and possibly other structures in the future) to + * a QByteArray consumed by QNetworkAccessManager request methods. */ - class Data : public QJsonObject + class Data { public: - using QJsonObject::QJsonObject; Data() = default; - explicit Data(const QJsonObject& o) : QJsonObject(o) { } -#if (QT_VERSION < QT_VERSION_CHECK(5, 4, 0)) - // This method exists in QJsonObject of newer Qt versions - Data(const std::initializer_list< QPair >& l) + Data(const QByteArray& a) : _payload(a) { } + Data(const QJsonObject& jo) + : _payload(fromJson(QJsonDocument(jo))) { } + Data(const QJsonArray& ja) + : _payload(fromJson(QJsonDocument(ja))) { } + QByteArray serialize() const { - for (auto i: l) - insert(i.first, i.second); + return _payload; } -#endif - QByteArray serialize() const + + private: + static QByteArray fromJson(const QJsonDocument& jd) { - return QJsonDocument(*this).toJson(); + return jd.toJson(QJsonDocument::Compact); } + QByteArray _payload; }; /** diff --git a/jobs/generated/banning.cpp b/jobs/generated/banning.cpp index 61677da6..96f80ea8 100644 --- a/jobs/generated/banning.cpp +++ b/jobs/generated/banning.cpp @@ -19,7 +19,7 @@ BanJob::BanJob(const QString& roomId, const QString& userId, const QString& reas Query { } ) { - Data _data; + QJsonObject _data; _data.insert("user_id", toJson(userId)); if (!reason.isEmpty()) _data.insert("reason", toJson(reason)); @@ -32,7 +32,7 @@ UnbanJob::UnbanJob(const QString& roomId, const QString& userId) Query { } ) { - Data _data; + QJsonObject _data; _data.insert("user_id", toJson(userId)); setRequestData(_data); } diff --git a/jobs/generated/inviting.cpp b/jobs/generated/inviting.cpp index 78c9a2f6..5f89adf7 100644 --- a/jobs/generated/inviting.cpp +++ b/jobs/generated/inviting.cpp @@ -19,7 +19,7 @@ InviteUserJob::InviteUserJob(const QString& roomId, const QString& userId) Query { } ) { - Data _data; + QJsonObject _data; _data.insert("user_id", toJson(userId)); setRequestData(_data); } diff --git a/jobs/generated/kicking.cpp b/jobs/generated/kicking.cpp index 5d6f1a64..86dde629 100644 --- a/jobs/generated/kicking.cpp +++ b/jobs/generated/kicking.cpp @@ -19,7 +19,7 @@ KickJob::KickJob(const QString& roomId, const QString& userId, const QString& re Query { } ) { - Data _data; + QJsonObject _data; _data.insert("user_id", toJson(userId)); if (!reason.isEmpty()) _data.insert("reason", toJson(reason)); diff --git a/jobs/generated/login.cpp b/jobs/generated/login.cpp index 892d0c81..4c159517 100644 --- a/jobs/generated/login.cpp +++ b/jobs/generated/login.cpp @@ -28,7 +28,7 @@ LoginJob::LoginJob(const QString& type, const QString& user, const QString& medi Query { }, Data { }, false ), d(new Private) { - Data _data; + QJsonObject _data; _data.insert("type", toJson(type)); if (!user.isEmpty()) _data.insert("user", toJson(user)); diff --git a/jobs/generated/profile.cpp b/jobs/generated/profile.cpp index 42a2350f..6ec566f7 100644 --- a/jobs/generated/profile.cpp +++ b/jobs/generated/profile.cpp @@ -19,7 +19,7 @@ SetDisplayNameJob::SetDisplayNameJob(const QString& userId, const QString& displ Query { } ) { - Data _data; + QJsonObject _data; if (!displayname.isEmpty()) _data.insert("displayname", toJson(displayname)); setRequestData(_data); @@ -61,7 +61,7 @@ SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QString& avatarUrl Query { } ) { - Data _data; + QJsonObject _data; if (!avatarUrl.isEmpty()) _data.insert("avatar_url", toJson(avatarUrl)); setRequestData(_data); -- cgit v1.2.3 From f7e210bc04bdb45b05f3c75237001b8e51198242 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 6 Dec 2017 21:19:55 +0900 Subject: Use new GTAD features: avoid copying of custom schemas; inline body where appropriate Body inlining is needed in content-repo cases and also cases with freeform JSON in the body (such as the one of upcoming PostReceiptJob). --- jobs/gtad.yaml | 2 ++ jobs/{{base}}.cpp.mustache | 9 +++++---- jobs/{{base}}.h.mustache | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml index 5f370ac5..a19415a6 100644 --- a/jobs/gtad.yaml +++ b/jobs/gtad.yaml @@ -56,6 +56,8 @@ types: avoidCopy?: true imports: - //: { type: QJsonArray, "avoidCopy?": true, imports: } + schema: + avoidCopy?: true #operations: diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index 84bb2bea..b303c053 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -28,7 +28,7 @@ using namespace QMatrixClient; {{/trivial?}}{{/models.model}}{{#operations}} static const auto basePath = QStringLiteral("{{basePathWithoutHost}}"); {{# operation}}{{#models.model}}{{^trivial?}} -{{qualifiedName}}::operator QJsonValue() const +{{qualifiedName}}::operator QJsonObject() const { QJsonObject o; {{#vars}}o.insert("{{baseName}}", toJson({{nameCamelCase}})); @@ -49,7 +49,7 @@ namespace QMatrixClient return result; } }; -} +} // namespace QMatrixClient {{/ trivial?}}{{/models.model}}{{#responses}}{{#normalResponse?}}{{#properties?}} class {{camelCaseOperationId}}Job::Private { @@ -67,10 +67,11 @@ class {{camelCaseOperationId}}Job::Private }{{/queryParams?}}{{#skipAuth}}, Data { }, false{{/skipAuth}} ){{#responses}}{{#normalResponse?}}{{#properties?}}, d(new Private){{/properties?}}{{/normalResponse?}}{{/responses}} {{#bodyParams?}}{ - Data _data;{{#bodyParams}} +{{#inlineBody}} setRequestData(Data({{paramName}}));{{/inlineBody}}{{! +}}{{^inlineBody}} QJsonObject _data;{{#bodyParams}} {{^required?}}{{#string?}} if (!{{paramName}}.isEmpty()) {{/string?}}{{/required?}} _data.insert("{{baseName}}", toJson({{paramName}}));{{/bodyParams}} - setRequestData(_data); + setRequestData(_data);{{/inlineBody}} }{{/bodyParams?}}{{^bodyParams?}}{ }{{/bodyParams?}} {{# responses}}{{#normalResponse?}}{{#properties?}} {{camelCaseOperationId}}Job::~{{camelCaseOperationId}}Job() diff --git a/jobs/{{base}}.h.mustache b/jobs/{{base}}.h.mustache index f7124f97..76ae4f51 100644 --- a/jobs/{{base}}.h.mustache +++ b/jobs/{{base}}.h.mustache @@ -18,7 +18,7 @@ namespace QMatrixClient { {{#vars}}{{dataType.name}} {{nameCamelCase}}; {{/vars}} - operator QJsonValue() const; + operator QJsonObject() const; }; template <> struct FromJson<{{name}}> @@ -39,7 +39,7 @@ namespace QMatrixClient { {{#vars}}{{dataType.name}} {{nameCamelCase}}; {{/vars}} - operator QJsonValue() const; + operator QJsonObject() const; }; {{/ trivial?}}{{/model}} // End of inner data structures -- cgit v1.2.3 From 0c5a042104eaa6f8efb0dfc1c0eacca161d5787f Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 6 Dec 2017 21:29:07 +0900 Subject: GTAD: Enable content-repo stubs generation --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2be54cb0..a1e96368 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,7 @@ if (MATRIX_DOC_PATH AND GTAD_PATH) add_custom_target(update-api ${GTAD_PATH} --config jobs/gtad.yaml --out jobs/generated ${MATRIX_DOC_PATH}/api/client-server - content-repo.yaml- cas_login_redirect.yaml- cas_login_ticket.yaml- + cas_login_redirect.yaml- cas_login_ticket.yaml- old_sync.yaml- room_initial_sync.yaml- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} SOURCES jobs/gtad.yaml -- cgit v1.2.3 From b1dd0e7ea87842fb5ff9deb14beb3474136b06f3 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 7 Dec 2017 11:40:46 +0900 Subject: New generated jobs for: room directory, 3PIDs, redactions, typing notifications and others Closes #128 (the issue has the full list of jobs arriving herewith). --- jobs/generated/administrative_contact.cpp | 119 ++++++++++++++ jobs/generated/administrative_contact.h | 70 +++++++++ jobs/generated/directory.cpp | 71 +++++++++ jobs/generated/directory.h | 46 ++++++ jobs/generated/list_public_rooms.cpp | 253 ++++++++++++++++++++++++++++++ jobs/generated/list_public_rooms.h | 101 ++++++++++++ jobs/generated/receipts.cpp | 24 +++ jobs/generated/receipts.h | 23 +++ jobs/generated/redaction.cpp | 50 ++++++ jobs/generated/redaction.h | 32 ++++ jobs/generated/third_party_membership.cpp | 28 ++++ jobs/generated/third_party_membership.h | 22 +++ jobs/generated/typing.cpp | 27 ++++ jobs/generated/typing.h | 22 +++ jobs/generated/versions.cpp | 45 ++++++ jobs/generated/versions.h | 33 ++++ jobs/generated/whoami.cpp | 48 ++++++ jobs/generated/whoami.h | 32 ++++ 18 files changed, 1046 insertions(+) create mode 100644 jobs/generated/administrative_contact.cpp create mode 100644 jobs/generated/administrative_contact.h create mode 100644 jobs/generated/directory.cpp create mode 100644 jobs/generated/directory.h create mode 100644 jobs/generated/list_public_rooms.cpp create mode 100644 jobs/generated/list_public_rooms.h create mode 100644 jobs/generated/receipts.cpp create mode 100644 jobs/generated/receipts.h create mode 100644 jobs/generated/redaction.cpp create mode 100644 jobs/generated/redaction.h create mode 100644 jobs/generated/third_party_membership.cpp create mode 100644 jobs/generated/third_party_membership.h create mode 100644 jobs/generated/typing.cpp create mode 100644 jobs/generated/typing.h create mode 100644 jobs/generated/versions.cpp create mode 100644 jobs/generated/versions.h create mode 100644 jobs/generated/whoami.cpp create mode 100644 jobs/generated/whoami.h diff --git a/jobs/generated/administrative_contact.cpp b/jobs/generated/administrative_contact.cpp new file mode 100644 index 00000000..705c5d54 --- /dev/null +++ b/jobs/generated/administrative_contact.cpp @@ -0,0 +1,119 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "administrative_contact.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +GetAccount3PIDsJob::ThirdPartyIdentifier::operator QJsonObject() const +{ + QJsonObject o; + o.insert("medium", toJson(medium)); + o.insert("address", toJson(address)); + + return o; +} +namespace QMatrixClient +{ + template <> struct FromJson + { + GetAccount3PIDsJob::ThirdPartyIdentifier operator()(QJsonValue jv) + { + QJsonObject o = jv.toObject(); + GetAccount3PIDsJob::ThirdPartyIdentifier result; + result.medium = + fromJson(o.value("medium")); + result.address = + fromJson(o.value("address")); + + return result; + } + }; +} // namespace QMatrixClient + +class GetAccount3PIDsJob::Private +{ + public: + QVector threepids; +}; + +GetAccount3PIDsJob::GetAccount3PIDsJob() + : BaseJob(HttpVerb::Get, "GetAccount3PIDsJob", + basePath % "/account/3pid", + Query { } + ), d(new Private) +{ } + +GetAccount3PIDsJob::~GetAccount3PIDsJob() +{ + delete d; +} + +const QVector& GetAccount3PIDsJob::threepids() const +{ + return d->threepids; +} + +BaseJob::Status GetAccount3PIDsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->threepids = fromJson>(json.value("threepids")); + return Success; +} + +Post3PIDsJob::ThreePidCredentials::operator QJsonObject() const +{ + QJsonObject o; + o.insert("client_secret", toJson(clientSecret)); + o.insert("id_server", toJson(idServer)); + o.insert("sid", toJson(sid)); + + return o; +} +namespace QMatrixClient +{ + template <> struct FromJson + { + Post3PIDsJob::ThreePidCredentials operator()(QJsonValue jv) + { + QJsonObject o = jv.toObject(); + Post3PIDsJob::ThreePidCredentials result; + result.clientSecret = + fromJson(o.value("client_secret")); + result.idServer = + fromJson(o.value("id_server")); + result.sid = + fromJson(o.value("sid")); + + return result; + } + }; +} // namespace QMatrixClient + +Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind) + : BaseJob(HttpVerb::Post, "Post3PIDsJob", + basePath % "/account/3pid", + Query { } + ) +{ + QJsonObject _data; + _data.insert("three_pid_creds", toJson(threePidCreds)); + _data.insert("bind", toJson(bind)); + setRequestData(_data); +} + +RequestTokenTo3PIDJob::RequestTokenTo3PIDJob() + : BaseJob(HttpVerb::Post, "RequestTokenTo3PIDJob", + basePath % "/account/3pid/email/requestToken", + Query { }, Data { }, false + ) +{ } + diff --git a/jobs/generated/administrative_contact.h b/jobs/generated/administrative_contact.h new file mode 100644 index 00000000..fa6beba9 --- /dev/null +++ b/jobs/generated/administrative_contact.h @@ -0,0 +1,70 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + +#include "../basejob.h" + +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class GetAccount3PIDsJob : public BaseJob + { + public: + // Inner data structures + + struct ThirdPartyIdentifier + { + QString medium; + QString address; + + operator QJsonObject() const; + }; + + // End of inner data structures + + explicit GetAccount3PIDsJob(); + ~GetAccount3PIDsJob() override; + + const QVector& threepids() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + Private* d; + }; + + class Post3PIDsJob : public BaseJob + { + public: + // Inner data structures + + struct ThreePidCredentials + { + QString clientSecret; + QString idServer; + QString sid; + + operator QJsonObject() const; + }; + + // End of inner data structures + + explicit Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind = {}); + }; + + class RequestTokenTo3PIDJob : public BaseJob + { + public: + explicit RequestTokenTo3PIDJob(); + }; +} // namespace QMatrixClient diff --git a/jobs/generated/directory.cpp b/jobs/generated/directory.cpp new file mode 100644 index 00000000..dcec75ac --- /dev/null +++ b/jobs/generated/directory.cpp @@ -0,0 +1,71 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "directory.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0/directory"); + +SetRoomAliasJob::SetRoomAliasJob(const QString& roomAlias, const QString& roomId) + : BaseJob(HttpVerb::Put, "SetRoomAliasJob", + basePath % "/room/" % roomAlias, + Query { } + ) +{ + QJsonObject _data; + if (!roomId.isEmpty()) + _data.insert("room_id", toJson(roomId)); + setRequestData(_data); +} + +class GetRoomIdByAliasJob::Private +{ + public: + QString roomId; + QVector servers; +}; + +GetRoomIdByAliasJob::GetRoomIdByAliasJob(const QString& roomAlias) + : BaseJob(HttpVerb::Get, "GetRoomIdByAliasJob", + basePath % "/room/" % roomAlias, + Query { }, Data { }, false + ), d(new Private) +{ } + +GetRoomIdByAliasJob::~GetRoomIdByAliasJob() +{ + delete d; +} + +const QString& GetRoomIdByAliasJob::roomId() const +{ + return d->roomId; +} + +const QVector& GetRoomIdByAliasJob::servers() const +{ + return d->servers; +} + +BaseJob::Status GetRoomIdByAliasJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->roomId = fromJson(json.value("room_id")); + d->servers = fromJson>(json.value("servers")); + return Success; +} + +DeleteRoomAliasJob::DeleteRoomAliasJob(const QString& roomAlias) + : BaseJob(HttpVerb::Delete, "DeleteRoomAliasJob", + basePath % "/room/" % roomAlias, + Query { } + ) +{ } + diff --git a/jobs/generated/directory.h b/jobs/generated/directory.h new file mode 100644 index 00000000..1dd4e7ed --- /dev/null +++ b/jobs/generated/directory.h @@ -0,0 +1,46 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + +#include "../basejob.h" + +#include +#include + + +namespace QMatrixClient +{ + // Operations + + class SetRoomAliasJob : public BaseJob + { + public: + explicit SetRoomAliasJob(const QString& roomAlias, const QString& roomId = {}); + }; + + class GetRoomIdByAliasJob : public BaseJob + { + public: + explicit GetRoomIdByAliasJob(const QString& roomAlias); + ~GetRoomIdByAliasJob() override; + + const QString& roomId() const; + const QVector& servers() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + Private* d; + }; + + class DeleteRoomAliasJob : public BaseJob + { + public: + explicit DeleteRoomAliasJob(const QString& roomAlias); + }; +} // namespace QMatrixClient diff --git a/jobs/generated/list_public_rooms.cpp b/jobs/generated/list_public_rooms.cpp new file mode 100644 index 00000000..8a96966f --- /dev/null +++ b/jobs/generated/list_public_rooms.cpp @@ -0,0 +1,253 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "list_public_rooms.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +GetPublicRoomsJob::PublicRoomsChunk::operator QJsonObject() const +{ + QJsonObject o; + o.insert("aliases", toJson(aliases)); + o.insert("canonical_alias", toJson(canonicalAlias)); + o.insert("name", toJson(name)); + o.insert("num_joined_members", toJson(numJoinedMembers)); + o.insert("room_id", toJson(roomId)); + o.insert("topic", toJson(topic)); + o.insert("world_readable", toJson(worldReadable)); + o.insert("guest_can_join", toJson(guestCanJoin)); + o.insert("avatar_url", toJson(avatarUrl)); + + return o; +} +namespace QMatrixClient +{ + template <> struct FromJson + { + GetPublicRoomsJob::PublicRoomsChunk operator()(QJsonValue jv) + { + QJsonObject o = jv.toObject(); + GetPublicRoomsJob::PublicRoomsChunk result; + result.aliases = + fromJson>(o.value("aliases")); + result.canonicalAlias = + fromJson(o.value("canonical_alias")); + result.name = + fromJson(o.value("name")); + result.numJoinedMembers = + fromJson(o.value("num_joined_members")); + result.roomId = + fromJson(o.value("room_id")); + result.topic = + fromJson(o.value("topic")); + result.worldReadable = + fromJson(o.value("world_readable")); + result.guestCanJoin = + fromJson(o.value("guest_can_join")); + result.avatarUrl = + fromJson(o.value("avatar_url")); + + return result; + } + }; +} // namespace QMatrixClient + +class GetPublicRoomsJob::Private +{ + public: + QVector chunk; + QString nextBatch; + QString prevBatch; + double totalRoomCountEstimate; +}; + +GetPublicRoomsJob::GetPublicRoomsJob(double limit, const QString& since, const QString& server) + : BaseJob(HttpVerb::Get, "GetPublicRoomsJob", + basePath % "/publicRooms", + Query { + { "limit", toJson(limit).toString() }, + { "since", toJson(since).toString() }, + { "server", toJson(server).toString() } + }, Data { }, false + ), d(new Private) +{ } + +GetPublicRoomsJob::~GetPublicRoomsJob() +{ + delete d; +} + +const QVector& GetPublicRoomsJob::chunk() const +{ + return d->chunk; +} + +const QString& GetPublicRoomsJob::nextBatch() const +{ + return d->nextBatch; +} + +const QString& GetPublicRoomsJob::prevBatch() const +{ + return d->prevBatch; +} + +double GetPublicRoomsJob::totalRoomCountEstimate() const +{ + return d->totalRoomCountEstimate; +} + +BaseJob::Status GetPublicRoomsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("chunk")) + return { JsonParseError, + "The key 'chunk' not found in the response" }; + d->chunk = fromJson>(json.value("chunk")); + d->nextBatch = fromJson(json.value("next_batch")); + d->prevBatch = fromJson(json.value("prev_batch")); + d->totalRoomCountEstimate = fromJson(json.value("total_room_count_estimate")); + return Success; +} + +QueryPublicRoomsJob::Filter::operator QJsonObject() const +{ + QJsonObject o; + o.insert("generic_search_term", toJson(genericSearchTerm)); + + return o; +} +namespace QMatrixClient +{ + template <> struct FromJson + { + QueryPublicRoomsJob::Filter operator()(QJsonValue jv) + { + QJsonObject o = jv.toObject(); + QueryPublicRoomsJob::Filter result; + result.genericSearchTerm = + fromJson(o.value("generic_search_term")); + + return result; + } + }; +} // namespace QMatrixClient + +QueryPublicRoomsJob::PublicRoomsChunk::operator QJsonObject() const +{ + QJsonObject o; + o.insert("aliases", toJson(aliases)); + o.insert("canonical_alias", toJson(canonicalAlias)); + o.insert("name", toJson(name)); + o.insert("num_joined_members", toJson(numJoinedMembers)); + o.insert("room_id", toJson(roomId)); + o.insert("topic", toJson(topic)); + o.insert("world_readable", toJson(worldReadable)); + o.insert("guest_can_join", toJson(guestCanJoin)); + o.insert("avatar_url", toJson(avatarUrl)); + + return o; +} +namespace QMatrixClient +{ + template <> struct FromJson + { + QueryPublicRoomsJob::PublicRoomsChunk operator()(QJsonValue jv) + { + QJsonObject o = jv.toObject(); + QueryPublicRoomsJob::PublicRoomsChunk result; + result.aliases = + fromJson>(o.value("aliases")); + result.canonicalAlias = + fromJson(o.value("canonical_alias")); + result.name = + fromJson(o.value("name")); + result.numJoinedMembers = + fromJson(o.value("num_joined_members")); + result.roomId = + fromJson(o.value("room_id")); + result.topic = + fromJson(o.value("topic")); + result.worldReadable = + fromJson(o.value("world_readable")); + result.guestCanJoin = + fromJson(o.value("guest_can_join")); + result.avatarUrl = + fromJson(o.value("avatar_url")); + + return result; + } + }; +} // namespace QMatrixClient + +class QueryPublicRoomsJob::Private +{ + public: + QVector chunk; + QString nextBatch; + QString prevBatch; + double totalRoomCountEstimate; +}; + +QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server, double limit, const QString& since, const Filter& filter) + : BaseJob(HttpVerb::Post, "QueryPublicRoomsJob", + basePath % "/publicRooms", + Query { + { "server", toJson(server).toString() } + } + ), d(new Private) +{ + QJsonObject _data; + _data.insert("limit", toJson(limit)); + if (!since.isEmpty()) + _data.insert("since", toJson(since)); + _data.insert("filter", toJson(filter)); + setRequestData(_data); +} + +QueryPublicRoomsJob::~QueryPublicRoomsJob() +{ + delete d; +} + +const QVector& QueryPublicRoomsJob::chunk() const +{ + return d->chunk; +} + +const QString& QueryPublicRoomsJob::nextBatch() const +{ + return d->nextBatch; +} + +const QString& QueryPublicRoomsJob::prevBatch() const +{ + return d->prevBatch; +} + +double QueryPublicRoomsJob::totalRoomCountEstimate() const +{ + return d->totalRoomCountEstimate; +} + +BaseJob::Status QueryPublicRoomsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("chunk")) + return { JsonParseError, + "The key 'chunk' not found in the response" }; + d->chunk = fromJson>(json.value("chunk")); + d->nextBatch = fromJson(json.value("next_batch")); + d->prevBatch = fromJson(json.value("prev_batch")); + d->totalRoomCountEstimate = fromJson(json.value("total_room_count_estimate")); + return Success; +} + diff --git a/jobs/generated/list_public_rooms.h b/jobs/generated/list_public_rooms.h new file mode 100644 index 00000000..74dd8626 --- /dev/null +++ b/jobs/generated/list_public_rooms.h @@ -0,0 +1,101 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + +#include "../basejob.h" + +#include +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class GetPublicRoomsJob : public BaseJob + { + public: + // Inner data structures + + struct PublicRoomsChunk + { + QVector aliases; + QString canonicalAlias; + QString name; + double numJoinedMembers; + QString roomId; + QString topic; + bool worldReadable; + bool guestCanJoin; + QString avatarUrl; + + operator QJsonObject() const; + }; + + // End of inner data structures + + explicit GetPublicRoomsJob(double limit = {}, const QString& since = {}, const QString& server = {}); + ~GetPublicRoomsJob() override; + + const QVector& chunk() const; + const QString& nextBatch() const; + const QString& prevBatch() const; + double totalRoomCountEstimate() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + Private* d; + }; + + class QueryPublicRoomsJob : public BaseJob + { + public: + // Inner data structures + + struct Filter + { + QString genericSearchTerm; + + operator QJsonObject() const; + }; + + struct PublicRoomsChunk + { + QVector aliases; + QString canonicalAlias; + QString name; + double numJoinedMembers; + QString roomId; + QString topic; + bool worldReadable; + bool guestCanJoin; + QString avatarUrl; + + operator QJsonObject() const; + }; + + // End of inner data structures + + explicit QueryPublicRoomsJob(const QString& server = {}, double limit = {}, const QString& since = {}, const Filter& filter = {}); + ~QueryPublicRoomsJob() override; + + const QVector& chunk() const; + const QString& nextBatch() const; + const QString& prevBatch() const; + double totalRoomCountEstimate() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + Private* d; + }; +} // namespace QMatrixClient diff --git a/jobs/generated/receipts.cpp b/jobs/generated/receipts.cpp new file mode 100644 index 00000000..2820b583 --- /dev/null +++ b/jobs/generated/receipts.cpp @@ -0,0 +1,24 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "receipts.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +PostReceiptJob::PostReceiptJob(const QString& roomId, const QString& receiptType, const QString& eventId, const QJsonObject& receipt) + : BaseJob(HttpVerb::Post, "PostReceiptJob", + basePath % "/rooms/" % roomId % "/receipt/" % receiptType % "/" % eventId, + Query { } + ) +{ + setRequestData(Data(receipt)); +} + diff --git a/jobs/generated/receipts.h b/jobs/generated/receipts.h new file mode 100644 index 00000000..6f36d7fc --- /dev/null +++ b/jobs/generated/receipts.h @@ -0,0 +1,23 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + +#include "../basejob.h" + +#include +#include + + +namespace QMatrixClient +{ + // Operations + + class PostReceiptJob : public BaseJob + { + public: + explicit PostReceiptJob(const QString& roomId, const QString& receiptType, const QString& eventId, const QJsonObject& receipt = {}); + }; +} // namespace QMatrixClient diff --git a/jobs/generated/redaction.cpp b/jobs/generated/redaction.cpp new file mode 100644 index 00000000..a9b8ed7e --- /dev/null +++ b/jobs/generated/redaction.cpp @@ -0,0 +1,50 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "redaction.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class RedactEventJob::Private +{ + public: + QString eventId; +}; + +RedactEventJob::RedactEventJob(const QString& roomId, const QString& eventId, const QString& txnId, const QString& reason) + : BaseJob(HttpVerb::Put, "RedactEventJob", + basePath % "/rooms/" % roomId % "/redact/" % eventId % "/" % txnId, + Query { } + ), d(new Private) +{ + QJsonObject _data; + if (!reason.isEmpty()) + _data.insert("reason", toJson(reason)); + setRequestData(_data); +} + +RedactEventJob::~RedactEventJob() +{ + delete d; +} + +const QString& RedactEventJob::eventId() const +{ + return d->eventId; +} + +BaseJob::Status RedactEventJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->eventId = fromJson(json.value("event_id")); + return Success; +} + diff --git a/jobs/generated/redaction.h b/jobs/generated/redaction.h new file mode 100644 index 00000000..600e0daa --- /dev/null +++ b/jobs/generated/redaction.h @@ -0,0 +1,32 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + +#include "../basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class RedactEventJob : public BaseJob + { + public: + explicit RedactEventJob(const QString& roomId, const QString& eventId, const QString& txnId, const QString& reason = {}); + ~RedactEventJob() override; + + const QString& eventId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + Private* d; + }; +} // namespace QMatrixClient diff --git a/jobs/generated/third_party_membership.cpp b/jobs/generated/third_party_membership.cpp new file mode 100644 index 00000000..7a2aa4f4 --- /dev/null +++ b/jobs/generated/third_party_membership.cpp @@ -0,0 +1,28 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "third_party_membership.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +InviteBy3PIDJob::InviteBy3PIDJob(const QString& roomId, const QString& idServer, const QString& medium, const QString& address) + : BaseJob(HttpVerb::Post, "InviteBy3PIDJob", + basePath % "/rooms/" % roomId % "/invite", + Query { } + ) +{ + QJsonObject _data; + _data.insert("id_server", toJson(idServer)); + _data.insert("medium", toJson(medium)); + _data.insert("address", toJson(address)); + setRequestData(_data); +} + diff --git a/jobs/generated/third_party_membership.h b/jobs/generated/third_party_membership.h new file mode 100644 index 00000000..6c1193ed --- /dev/null +++ b/jobs/generated/third_party_membership.h @@ -0,0 +1,22 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + +#include "../basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class InviteBy3PIDJob : public BaseJob + { + public: + explicit InviteBy3PIDJob(const QString& roomId, const QString& idServer, const QString& medium, const QString& address); + }; +} // namespace QMatrixClient diff --git a/jobs/generated/typing.cpp b/jobs/generated/typing.cpp new file mode 100644 index 00000000..44bbb131 --- /dev/null +++ b/jobs/generated/typing.cpp @@ -0,0 +1,27 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "typing.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +SetTypingJob::SetTypingJob(const QString& userId, const QString& roomId, bool typing, int timeout) + : BaseJob(HttpVerb::Put, "SetTypingJob", + basePath % "/rooms/" % roomId % "/typing/" % userId, + Query { } + ) +{ + QJsonObject _data; + _data.insert("typing", toJson(typing)); + _data.insert("timeout", toJson(timeout)); + setRequestData(_data); +} + diff --git a/jobs/generated/typing.h b/jobs/generated/typing.h new file mode 100644 index 00000000..e20bca1a --- /dev/null +++ b/jobs/generated/typing.h @@ -0,0 +1,22 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + +#include "../basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class SetTypingJob : public BaseJob + { + public: + explicit SetTypingJob(const QString& userId, const QString& roomId, bool typing, int timeout = {}); + }; +} // namespace QMatrixClient diff --git a/jobs/generated/versions.cpp b/jobs/generated/versions.cpp new file mode 100644 index 00000000..66b31290 --- /dev/null +++ b/jobs/generated/versions.cpp @@ -0,0 +1,45 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "versions.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client"); + +class GetVersionsJob::Private +{ + public: + QVector versions; +}; + +GetVersionsJob::GetVersionsJob() + : BaseJob(HttpVerb::Get, "GetVersionsJob", + basePath % "/versions", + Query { }, Data { }, false + ), d(new Private) +{ } + +GetVersionsJob::~GetVersionsJob() +{ + delete d; +} + +const QVector& GetVersionsJob::versions() const +{ + return d->versions; +} + +BaseJob::Status GetVersionsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->versions = fromJson>(json.value("versions")); + return Success; +} + diff --git a/jobs/generated/versions.h b/jobs/generated/versions.h new file mode 100644 index 00000000..eab8cf9e --- /dev/null +++ b/jobs/generated/versions.h @@ -0,0 +1,33 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + +#include "../basejob.h" + +#include +#include + + +namespace QMatrixClient +{ + // Operations + + class GetVersionsJob : public BaseJob + { + public: + explicit GetVersionsJob(); + ~GetVersionsJob() override; + + const QVector& versions() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + Private* d; + }; +} // namespace QMatrixClient diff --git a/jobs/generated/whoami.cpp b/jobs/generated/whoami.cpp new file mode 100644 index 00000000..dce091ec --- /dev/null +++ b/jobs/generated/whoami.cpp @@ -0,0 +1,48 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#include "whoami.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class GetTokenOwnerJob::Private +{ + public: + QString userId; +}; + +GetTokenOwnerJob::GetTokenOwnerJob() + : BaseJob(HttpVerb::Get, "GetTokenOwnerJob", + basePath % "/account/whoami", + Query { } + ), d(new Private) +{ } + +GetTokenOwnerJob::~GetTokenOwnerJob() +{ + delete d; +} + +const QString& GetTokenOwnerJob::userId() const +{ + return d->userId; +} + +BaseJob::Status GetTokenOwnerJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("user_id")) + return { JsonParseError, + "The key 'user_id' not found in the response" }; + d->userId = fromJson(json.value("user_id")); + return Success; +} + diff --git a/jobs/generated/whoami.h b/jobs/generated/whoami.h new file mode 100644 index 00000000..1b04f337 --- /dev/null +++ b/jobs/generated/whoami.h @@ -0,0 +1,32 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + + +#pragma once + +#include "../basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class GetTokenOwnerJob : public BaseJob + { + public: + explicit GetTokenOwnerJob(); + ~GetTokenOwnerJob() override; + + const QString& userId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + Private* d; + }; +} // namespace QMatrixClient -- cgit v1.2.3 From 04c53826b0694dee38010b2f5116db6cf2e9b221 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 3 Jan 2018 12:11:16 +0900 Subject: jobs/generated: Polish formatting; other minor cleanup --- jobs/generated/administrative_contact.cpp | 8 +------- jobs/generated/administrative_contact.h | 7 +++---- jobs/generated/banning.cpp | 1 - jobs/generated/banning.h | 1 - jobs/generated/directory.cpp | 6 +----- jobs/generated/directory.h | 7 +++---- jobs/generated/inviting.cpp | 1 - jobs/generated/inviting.h | 1 - jobs/generated/kicking.cpp | 1 - jobs/generated/kicking.h | 1 - jobs/generated/leaving.cpp | 1 - jobs/generated/leaving.h | 1 - jobs/generated/list_public_rooms.cpp | 13 ++----------- jobs/generated/list_public_rooms.h | 13 ++++++------- jobs/generated/login.cpp | 6 +----- jobs/generated/login.h | 7 +++---- jobs/generated/logout.cpp | 1 - jobs/generated/logout.h | 1 - jobs/generated/profile.cpp | 16 +++------------- jobs/generated/profile.h | 19 +++++++++---------- jobs/generated/receipts.cpp | 1 - jobs/generated/receipts.h | 1 - jobs/generated/redaction.cpp | 6 +----- jobs/generated/redaction.h | 7 +++---- jobs/generated/third_party_membership.cpp | 1 - jobs/generated/third_party_membership.h | 1 - jobs/generated/typing.cpp | 1 - jobs/generated/typing.h | 1 - jobs/generated/versions.cpp | 6 +----- jobs/generated/versions.h | 7 +++---- jobs/generated/whoami.cpp | 6 +----- jobs/generated/whoami.h | 7 +++---- 32 files changed, 44 insertions(+), 113 deletions(-) diff --git a/jobs/generated/administrative_contact.cpp b/jobs/generated/administrative_contact.cpp index 705c5d54..ca029f58 100644 --- a/jobs/generated/administrative_contact.cpp +++ b/jobs/generated/administrative_contact.cpp @@ -2,11 +2,8 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "administrative_contact.h" -#include "converters.h" - #include using namespace QMatrixClient; @@ -52,10 +49,7 @@ GetAccount3PIDsJob::GetAccount3PIDsJob() ), d(new Private) { } -GetAccount3PIDsJob::~GetAccount3PIDsJob() -{ - delete d; -} +GetAccount3PIDsJob::~GetAccount3PIDsJob() = default; const QVector& GetAccount3PIDsJob::threepids() const { diff --git a/jobs/generated/administrative_contact.h b/jobs/generated/administrative_contact.h index fa6beba9..67563719 100644 --- a/jobs/generated/administrative_contact.h +++ b/jobs/generated/administrative_contact.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -34,13 +33,13 @@ namespace QMatrixClient ~GetAccount3PIDsJob() override; const QVector& threepids() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; class Post3PIDsJob : public BaseJob diff --git a/jobs/generated/banning.cpp b/jobs/generated/banning.cpp index 96f80ea8..d7708cc6 100644 --- a/jobs/generated/banning.cpp +++ b/jobs/generated/banning.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "banning.h" #include "converters.h" diff --git a/jobs/generated/banning.h b/jobs/generated/banning.h index 6db096ee..930020a5 100644 --- a/jobs/generated/banning.h +++ b/jobs/generated/banning.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/directory.cpp b/jobs/generated/directory.cpp index dcec75ac..1fd1e443 100644 --- a/jobs/generated/directory.cpp +++ b/jobs/generated/directory.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "directory.h" #include "converters.h" @@ -39,10 +38,7 @@ GetRoomIdByAliasJob::GetRoomIdByAliasJob(const QString& roomAlias) ), d(new Private) { } -GetRoomIdByAliasJob::~GetRoomIdByAliasJob() -{ - delete d; -} +GetRoomIdByAliasJob::~GetRoomIdByAliasJob() = default; const QString& GetRoomIdByAliasJob::roomId() const { diff --git a/jobs/generated/directory.h b/jobs/generated/directory.h index 1dd4e7ed..8290a2b5 100644 --- a/jobs/generated/directory.h +++ b/jobs/generated/directory.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -29,13 +28,13 @@ namespace QMatrixClient const QString& roomId() const; const QVector& servers() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; class DeleteRoomAliasJob : public BaseJob diff --git a/jobs/generated/inviting.cpp b/jobs/generated/inviting.cpp index 5f89adf7..bdf257dd 100644 --- a/jobs/generated/inviting.cpp +++ b/jobs/generated/inviting.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "inviting.h" #include "converters.h" diff --git a/jobs/generated/inviting.h b/jobs/generated/inviting.h index 225cb516..7ed49637 100644 --- a/jobs/generated/inviting.h +++ b/jobs/generated/inviting.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/kicking.cpp b/jobs/generated/kicking.cpp index 86dde629..3488b387 100644 --- a/jobs/generated/kicking.cpp +++ b/jobs/generated/kicking.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "kicking.h" #include "converters.h" diff --git a/jobs/generated/kicking.h b/jobs/generated/kicking.h index 7c834e45..84d88945 100644 --- a/jobs/generated/kicking.h +++ b/jobs/generated/kicking.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/leaving.cpp b/jobs/generated/leaving.cpp index 2cf7fda3..604fcc73 100644 --- a/jobs/generated/leaving.cpp +++ b/jobs/generated/leaving.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "leaving.h" #include "converters.h" diff --git a/jobs/generated/leaving.h b/jobs/generated/leaving.h index 28ba3d92..f006ce19 100644 --- a/jobs/generated/leaving.h +++ b/jobs/generated/leaving.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/list_public_rooms.cpp b/jobs/generated/list_public_rooms.cpp index 8a96966f..d15e9de3 100644 --- a/jobs/generated/list_public_rooms.cpp +++ b/jobs/generated/list_public_rooms.cpp @@ -2,11 +2,8 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "list_public_rooms.h" -#include "converters.h" - #include using namespace QMatrixClient; @@ -80,10 +77,7 @@ GetPublicRoomsJob::GetPublicRoomsJob(double limit, const QString& since, const Q ), d(new Private) { } -GetPublicRoomsJob::~GetPublicRoomsJob() -{ - delete d; -} +GetPublicRoomsJob::~GetPublicRoomsJob() = default; const QVector& GetPublicRoomsJob::chunk() const { @@ -213,10 +207,7 @@ QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server, double limit, co setRequestData(_data); } -QueryPublicRoomsJob::~QueryPublicRoomsJob() -{ - delete d; -} +QueryPublicRoomsJob::~QueryPublicRoomsJob() = default; const QVector& QueryPublicRoomsJob::chunk() const { diff --git a/jobs/generated/list_public_rooms.h b/jobs/generated/list_public_rooms.h index 74dd8626..f6467a21 100644 --- a/jobs/generated/list_public_rooms.h +++ b/jobs/generated/list_public_rooms.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -45,13 +44,13 @@ namespace QMatrixClient const QString& nextBatch() const; const QString& prevBatch() const; double totalRoomCountEstimate() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; class QueryPublicRoomsJob : public BaseJob @@ -90,12 +89,12 @@ namespace QMatrixClient const QString& nextBatch() const; const QString& prevBatch() const; double totalRoomCountEstimate() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; } // namespace QMatrixClient diff --git a/jobs/generated/login.cpp b/jobs/generated/login.cpp index 4c159517..bbfff0da 100644 --- a/jobs/generated/login.cpp +++ b/jobs/generated/login.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "login.h" #include "converters.h" @@ -47,10 +46,7 @@ LoginJob::LoginJob(const QString& type, const QString& user, const QString& medi setRequestData(_data); } -LoginJob::~LoginJob() -{ - delete d; -} +LoginJob::~LoginJob() = default; const QString& LoginJob::userId() const { diff --git a/jobs/generated/login.h b/jobs/generated/login.h index 1c017877..0f68a13b 100644 --- a/jobs/generated/login.h +++ b/jobs/generated/login.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -24,12 +23,12 @@ namespace QMatrixClient const QString& accessToken() const; const QString& homeServer() const; const QString& deviceId() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; } // namespace QMatrixClient diff --git a/jobs/generated/logout.cpp b/jobs/generated/logout.cpp index c250bddf..b6904070 100644 --- a/jobs/generated/logout.cpp +++ b/jobs/generated/logout.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "logout.h" #include "converters.h" diff --git a/jobs/generated/logout.h b/jobs/generated/logout.h index ae9e54b8..d2b85db5 100644 --- a/jobs/generated/logout.h +++ b/jobs/generated/logout.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/profile.cpp b/jobs/generated/profile.cpp index 6ec566f7..27bab0b8 100644 --- a/jobs/generated/profile.cpp +++ b/jobs/generated/profile.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "profile.h" #include "converters.h" @@ -38,10 +37,7 @@ GetDisplayNameJob::GetDisplayNameJob(const QString& userId) ), d(new Private) { } -GetDisplayNameJob::~GetDisplayNameJob() -{ - delete d; -} +GetDisplayNameJob::~GetDisplayNameJob() = default; const QString& GetDisplayNameJob::displayname() const { @@ -80,10 +76,7 @@ GetAvatarUrlJob::GetAvatarUrlJob(const QString& userId) ), d(new Private) { } -GetAvatarUrlJob::~GetAvatarUrlJob() -{ - delete d; -} +GetAvatarUrlJob::~GetAvatarUrlJob() = default; const QString& GetAvatarUrlJob::avatarUrl() const { @@ -111,10 +104,7 @@ GetUserProfileJob::GetUserProfileJob(const QString& userId) ), d(new Private) { } -GetUserProfileJob::~GetUserProfileJob() -{ - delete d; -} +GetUserProfileJob::~GetUserProfileJob() = default; const QString& GetUserProfileJob::avatarUrl() const { diff --git a/jobs/generated/profile.h b/jobs/generated/profile.h index 30e858de..9cbf3865 100644 --- a/jobs/generated/profile.h +++ b/jobs/generated/profile.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -27,13 +26,13 @@ namespace QMatrixClient ~GetDisplayNameJob() override; const QString& displayname() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; class SetAvatarUrlJob : public BaseJob @@ -49,13 +48,13 @@ namespace QMatrixClient ~GetAvatarUrlJob() override; const QString& avatarUrl() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; class GetUserProfileJob : public BaseJob @@ -66,12 +65,12 @@ namespace QMatrixClient const QString& avatarUrl() const; const QString& displayname() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; } // namespace QMatrixClient diff --git a/jobs/generated/receipts.cpp b/jobs/generated/receipts.cpp index 2820b583..1c8bd80f 100644 --- a/jobs/generated/receipts.cpp +++ b/jobs/generated/receipts.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "receipts.h" #include "converters.h" diff --git a/jobs/generated/receipts.h b/jobs/generated/receipts.h index 6f36d7fc..e4065ddb 100644 --- a/jobs/generated/receipts.h +++ b/jobs/generated/receipts.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/redaction.cpp b/jobs/generated/redaction.cpp index a9b8ed7e..9207f344 100644 --- a/jobs/generated/redaction.cpp +++ b/jobs/generated/redaction.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "redaction.h" #include "converters.h" @@ -31,10 +30,7 @@ RedactEventJob::RedactEventJob(const QString& roomId, const QString& eventId, co setRequestData(_data); } -RedactEventJob::~RedactEventJob() -{ - delete d; -} +RedactEventJob::~RedactEventJob() = default; const QString& RedactEventJob::eventId() const { diff --git a/jobs/generated/redaction.h b/jobs/generated/redaction.h index 600e0daa..0a68f8cd 100644 --- a/jobs/generated/redaction.h +++ b/jobs/generated/redaction.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -21,12 +20,12 @@ namespace QMatrixClient ~RedactEventJob() override; const QString& eventId() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; } // namespace QMatrixClient diff --git a/jobs/generated/third_party_membership.cpp b/jobs/generated/third_party_membership.cpp index 7a2aa4f4..dbb3ebee 100644 --- a/jobs/generated/third_party_membership.cpp +++ b/jobs/generated/third_party_membership.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "third_party_membership.h" #include "converters.h" diff --git a/jobs/generated/third_party_membership.h b/jobs/generated/third_party_membership.h index 6c1193ed..b1669795 100644 --- a/jobs/generated/third_party_membership.h +++ b/jobs/generated/third_party_membership.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/typing.cpp b/jobs/generated/typing.cpp index 44bbb131..a6817cb9 100644 --- a/jobs/generated/typing.cpp +++ b/jobs/generated/typing.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "typing.h" #include "converters.h" diff --git a/jobs/generated/typing.h b/jobs/generated/typing.h index e20bca1a..6eb3ddf4 100644 --- a/jobs/generated/typing.h +++ b/jobs/generated/typing.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" diff --git a/jobs/generated/versions.cpp b/jobs/generated/versions.cpp index 66b31290..8ff58365 100644 --- a/jobs/generated/versions.cpp +++ b/jobs/generated/versions.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "versions.h" #include "converters.h" @@ -26,10 +25,7 @@ GetVersionsJob::GetVersionsJob() ), d(new Private) { } -GetVersionsJob::~GetVersionsJob() -{ - delete d; -} +GetVersionsJob::~GetVersionsJob() = default; const QVector& GetVersionsJob::versions() const { diff --git a/jobs/generated/versions.h b/jobs/generated/versions.h index eab8cf9e..a7add8ba 100644 --- a/jobs/generated/versions.h +++ b/jobs/generated/versions.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -22,12 +21,12 @@ namespace QMatrixClient ~GetVersionsJob() override; const QVector& versions() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; } // namespace QMatrixClient diff --git a/jobs/generated/whoami.cpp b/jobs/generated/whoami.cpp index dce091ec..d4da99d4 100644 --- a/jobs/generated/whoami.cpp +++ b/jobs/generated/whoami.cpp @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #include "whoami.h" #include "converters.h" @@ -26,10 +25,7 @@ GetTokenOwnerJob::GetTokenOwnerJob() ), d(new Private) { } -GetTokenOwnerJob::~GetTokenOwnerJob() -{ - delete d; -} +GetTokenOwnerJob::~GetTokenOwnerJob() = default; const QString& GetTokenOwnerJob::userId() const { diff --git a/jobs/generated/whoami.h b/jobs/generated/whoami.h index 1b04f337..21cb1a17 100644 --- a/jobs/generated/whoami.h +++ b/jobs/generated/whoami.h @@ -2,7 +2,6 @@ * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN */ - #pragma once #include "../basejob.h" @@ -21,12 +20,12 @@ namespace QMatrixClient ~GetTokenOwnerJob() override; const QString& userId() const; - + protected: Status parseJson(const QJsonDocument& data) override; - + private: class Private; - Private* d; + QScopedPointer d; }; } // namespace QMatrixClient -- cgit v1.2.3 From 0a688331ec0d9d9c592e8c542946dbd66d9c6b2f Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 3 Jan 2018 12:19:25 +0900 Subject: Support request and response headers Enable specifying headers in the request and checking/using headers in the response. --- jobs/basejob.cpp | 110 ++++++++++++++++++++++++++++++++++++--------- jobs/basejob.h | 18 ++++++-- jobs/mediathumbnailjob.cpp | 6 +-- jobs/mediathumbnailjob.h | 2 +- 4 files changed, 107 insertions(+), 29 deletions(-) diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp index 405cb9e0..1f087f46 100644 --- a/jobs/basejob.cpp +++ b/jobs/basejob.cpp @@ -59,10 +59,16 @@ class BaseJob::Private // Contents for the network request HttpVerb verb; QString apiEndpoint; + QHash requestHeaders; QUrlQuery requestQuery; Data requestData; bool needsToken; + // There's no use of QMimeType here because we don't want to match + // content types against the known MIME type hierarchy; and at the same + // type QMimeType is of little help with MIME type globs (`text/*` etc.) + QByteArrayList expectedContentTypes; + QScopedPointer reply; Status status = NoError; @@ -116,6 +122,22 @@ void BaseJob::setApiEndpoint(const QString& apiEndpoint) d->apiEndpoint = apiEndpoint; } +const BaseJob::headers_t&BaseJob::requestHeaders() const +{ + return d->requestHeaders; +} + +void BaseJob::setRequestHeader(const headers_t::key_type& headerName, + const headers_t::mapped_type& headerValue) +{ + d->requestHeaders[headerName] = headerValue; +} + +void BaseJob::setRequestHeaders(const BaseJob::headers_t& headers) +{ + d->requestHeaders = headers; +} + const QUrlQuery& BaseJob::query() const { return d->requestQuery; @@ -136,6 +158,21 @@ void BaseJob::setRequestData(const BaseJob::Data& data) d->requestData = data; } +const QByteArrayList& BaseJob::expectedContentTypes() const +{ + return d->expectedContentTypes; +} + +void BaseJob::addExpectedContentType(const QByteArray& contentType) +{ + d->expectedContentTypes << contentType; +} + +void BaseJob::setExpectedContentTypes(const QByteArrayList& contentTypes) +{ + d->expectedContentTypes = contentTypes; +} + void BaseJob::Private::sendRequest() { QUrl url = connection->baseUrl(); @@ -147,13 +184,16 @@ void BaseJob::Private::sendRequest() url.setQuery(requestQuery); QNetworkRequest req {url}; - req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); + if (!requestHeaders.contains("Content-Type")) + req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); req.setRawHeader(QByteArray("Authorization"), QByteArray("Bearer ") + connection->accessToken()); #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); req.setMaximumRedirectsAllowed(10); #endif + for (auto it = requestHeaders.cbegin(); it != requestHeaders.cend(); ++it) + req.setRawHeader(it.key(), it.value()); switch( verb ) { case HttpVerb::Get: @@ -205,11 +245,34 @@ void BaseJob::gotReply() { setStatus(checkReply(d->reply.data())); if (status().good()) - setStatus(parseReply(d->reply->readAll())); + setStatus(parseReply(d->reply.data())); finishJob(); } +bool checkContentType(const QByteArray& type, const QByteArrayList& patterns) +{ + if (patterns.isEmpty()) + return true; + + for (const auto& pattern: patterns) + { + if (pattern.startsWith('*') || type == pattern) // Fast lane + return true; + + auto patternParts = pattern.split('/'); + Q_ASSERT_X(patternParts.size() <= 2, __FUNCTION__, + "BaseJob: Expected content type should have up to two" + " /-separated parts; violating pattern: " + pattern); + + if (type.split('/').front() == patternParts.front() && + patternParts.back() == "*") + return true; // Exact match already went on fast lane + } + + return false; +} + BaseJob::Status BaseJob::checkReply(QNetworkReply* reply) const { qCDebug(d->logCat) << this << "returned from" << reply->url().toDisplayString(); @@ -217,30 +280,35 @@ BaseJob::Status BaseJob::checkReply(QNetworkReply* reply) const qCDebug(d->logCat) << this << "returned" << reply->error(); switch( reply->error() ) { - case QNetworkReply::NoError: - return NoError; - - case QNetworkReply::AuthenticationRequiredError: - case QNetworkReply::ContentAccessDenied: - case QNetworkReply::ContentOperationNotPermittedError: - return { ContentAccessError, reply->errorString() }; - - case QNetworkReply::ProtocolInvalidOperationError: - case QNetworkReply::UnknownContentError: - return { IncorrectRequestError, reply->errorString() }; - - case QNetworkReply::ContentNotFoundError: - return { NotFoundError, reply->errorString() }; - - default: - return { NetworkError, reply->errorString() }; + case QNetworkReply::NoError: + if (checkContentType(reply->rawHeader("Content-Type"), + d->expectedContentTypes)) + return NoError; + else + return { IncorrectResponseError, + "Incorrect content type of the response" }; + + case QNetworkReply::AuthenticationRequiredError: + case QNetworkReply::ContentAccessDenied: + case QNetworkReply::ContentOperationNotPermittedError: + return { ContentAccessError, reply->errorString() }; + + case QNetworkReply::ProtocolInvalidOperationError: + case QNetworkReply::UnknownContentError: + return { IncorrectRequestError, reply->errorString() }; + + case QNetworkReply::ContentNotFoundError: + return { NotFoundError, reply->errorString() }; + + default: + return { NetworkError, reply->errorString() }; } } -BaseJob::Status BaseJob::parseReply(QByteArray data) +BaseJob::Status BaseJob::parseReply(QNetworkReply* reply) { QJsonParseError error; - QJsonDocument json = QJsonDocument::fromJson(data, &error); + QJsonDocument json = QJsonDocument::fromJson(reply->readAll(), &error); if( error.error == QJsonParseError::NoError ) return parseJson(json); else diff --git a/jobs/basejob.h b/jobs/basejob.h index e3a379fa..6b34c9f5 100644 --- a/jobs/basejob.h +++ b/jobs/basejob.h @@ -25,7 +25,6 @@ #include #include #include -#include class QNetworkReply; class QSslError; @@ -58,6 +57,7 @@ namespace QMatrixClient , ContentAccessError , NotFoundError , IncorrectRequestError + , IncorrectResponseError , UserDefinedError = 200 }; @@ -213,12 +213,21 @@ namespace QMatrixClient void failure(BaseJob*); protected: + using headers_t = QHash; + const QString& apiEndpoint() const; void setApiEndpoint(const QString& apiEndpoint); + const headers_t& requestHeaders() const; + void setRequestHeader(const headers_t::key_type& headerName, + const headers_t::mapped_type& headerValue); + void setRequestHeaders(const headers_t& headers); const QUrlQuery& query() const; void setRequestQuery(const QUrlQuery& query); const Data& requestData() const; void setRequestData(const Data& data); + const QByteArrayList& expectedContentTypes() const; + void addExpectedContentType(const QByteArray& contentType); + void setExpectedContentTypes(const QByteArrayList& contentTypes); virtual void beforeStart(const ConnectionData* connData); @@ -239,11 +248,11 @@ namespace QMatrixClient * Processes the reply. By default, parses the reply into * a QJsonDocument and calls parseJson() if it's a valid JSON. * - * @param data raw contents of a HTTP reply from the server (without headers) + * @param reply raw contents of a HTTP reply from the server (without headers) * * @see gotReply, parseJson */ - virtual Status parseReply(QByteArray data); + virtual Status parseReply(QNetworkReply* reply); /** * Processes the JSON document received from the Matrix server. @@ -264,7 +273,8 @@ namespace QMatrixClient void setLoggingCategory(LoggingCategory lcf); // Job objects should only be deleted via QObject::deleteLater - virtual ~BaseJob(); + ~BaseJob() override; + protected slots: void timeout(); diff --git a/jobs/mediathumbnailjob.cpp b/jobs/mediathumbnailjob.cpp index c0d67a63..9337549e 100644 --- a/jobs/mediathumbnailjob.cpp +++ b/jobs/mediathumbnailjob.cpp @@ -17,8 +17,8 @@ */ #include "mediathumbnailjob.h" -#include "util.h" +#include #include using namespace QMatrixClient; @@ -47,9 +47,9 @@ QImage MediaThumbnailJob::scaledThumbnail(QSize toSize) const Qt::KeepAspectRatio, Qt::SmoothTransformation); } -BaseJob::Status MediaThumbnailJob::parseReply(QByteArray data) +BaseJob::Status MediaThumbnailJob::parseReply(QNetworkReply* reply) { - if( !_thumbnail.loadFromData(data) ) + if( !_thumbnail.loadFromData(reply->readAll()) ) { qCDebug(JOBS) << "MediaThumbnailJob: could not read image data"; } diff --git a/jobs/mediathumbnailjob.h b/jobs/mediathumbnailjob.h index f8f36fe9..2d6853c7 100644 --- a/jobs/mediathumbnailjob.h +++ b/jobs/mediathumbnailjob.h @@ -36,7 +36,7 @@ namespace QMatrixClient QImage scaledThumbnail(QSize toSize) const; protected: - Status parseReply(QByteArray data) override; + Status parseReply(QNetworkReply* reply) override; private: QImage _thumbnail; -- cgit v1.2.3 From 9aed9cc6327c3756a29d30b8538799be9dadd01a Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 3 Jan 2018 12:20:26 +0900 Subject: Fully support content-repo API That includes dealing with headers and raw (non-JSON) responses. --- jobs/gtad.yaml | 1 - jobs/{{base}}.cpp.mustache | 49 +++++++++++++++++++++++----------------------- jobs/{{base}}.h.mustache | 13 ++++++------ 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml index a19415a6..b9d128b4 100644 --- a/jobs/gtad.yaml +++ b/jobs/gtad.yaml @@ -45,7 +45,6 @@ types: file: type: QByteArray imports: - returnFile?: true object: type: QJsonObject avoidCopy?: true diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index b303c053..6621f173 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -1,10 +1,10 @@ {{#@filePartial}}preamble{{/@filePartial}} - #include "{{filenameBase}}.h" - +{{^allModels}} #include "converters.h" -{{#operations}} -#include +{{/allModels}}{{#operations}} +{{#producesNotJson?}}#include +{{/producesNotJson?}}#include {{/operations}} using namespace QMatrixClient; {{#models.model}}{{^trivial?}} @@ -50,14 +50,13 @@ namespace QMatrixClient } }; } // namespace QMatrixClient -{{/ trivial?}}{{/models.model}}{{#responses}}{{#normalResponse?}}{{#properties?}} +{{/ trivial?}}{{/models.model}}{{#responses}}{{#normalResponse?}}{{#allProperties?}} class {{camelCaseOperationId}}Job::Private { - public: - {{#properties}}{{dataType.name}} {{paramName}};{{#@join}}{{!EOL except the last line}} - {{/@join}}{{/properties}} + public:{{#allProperties}} + {{dataType.name}} {{paramName}};{{/allProperties}} }; -{{/ properties?}}{{/normalResponse?}}{{/responses}} +{{/ allProperties?}}{{/normalResponse?}}{{/responses}} {{camelCaseOperationId}}Job::{{camelCaseOperationId}}Job({{#allParams}}{{>maybeCrefType}} {{paramName}}{{#@join}}, {{/@join}}{{/allParams}}) : BaseJob(HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{camelCaseOperationId}}Job", basePath{{#pathParts}} % {{_}}{{/pathParts}}, @@ -65,30 +64,32 @@ class {{camelCaseOperationId}}Job::Private {{#queryParams}}{ "{{baseName}}", toJson({{paramName}}).toString() }{{#@join}}, {{/@join}}{{/queryParams}} }{{/queryParams?}}{{#skipAuth}}, Data { }, false{{/skipAuth}} - ){{#responses}}{{#normalResponse?}}{{#properties?}}, d(new Private){{/properties?}}{{/normalResponse?}}{{/responses}} + ){{#responses}}{{#normalResponse?}}{{#allProperties?}}, d(new Private){{/allProperties?}}{{/normalResponse?}}{{/responses}} {{#bodyParams?}}{ -{{#inlineBody}} setRequestData(Data({{paramName}}));{{/inlineBody}}{{! +{{#headerParams?}}{{#headerParams}} setRequestHeader("{{baseName}}", {{paramName}}.toLatin1()); +{{/headerParams}} +{{/headerParams?}}{{#inlineBody}} setRequestData(Data({{paramName}}));{{/inlineBody}}{{! }}{{^inlineBody}} QJsonObject _data;{{#bodyParams}} {{^required?}}{{#string?}} if (!{{paramName}}.isEmpty()) {{/string?}}{{/required?}} _data.insert("{{baseName}}", toJson({{paramName}}));{{/bodyParams}} - setRequestData(_data);{{/inlineBody}} + setRequestData(_data);{{/inlineBody}}{{#produces?}} +{{#produces}} + addExpectedContentType({{_}});{{/produces}}{{/produces?}} }{{/bodyParams?}}{{^bodyParams?}}{ }{{/bodyParams?}} -{{# responses}}{{#normalResponse?}}{{#properties?}} -{{camelCaseOperationId}}Job::~{{camelCaseOperationId}}Job() -{ - delete d; -} -{{# properties}} +{{# responses}}{{#normalResponse?}}{{#allProperties?}} +{{camelCaseOperationId}}Job::~{{camelCaseOperationId}}Job() = default; +{{# allProperties}} {{>qualifiedMaybeCrefType}} {{camelCaseOperationId}}Job::{{paramName}}() const { return d->{{paramName}}; } -{{/ properties}}{{#returnFile?}} -BaseJob::Status {{camelCaseOperationId}}Job::parseReply(QByteArray data) +{{/ allProperties}}{{#producesNotJson?}} +BaseJob::Status {{camelCaseOperationId}}Job::parseReply(QNetworkReply* reply) { - {{properties.nameCamelCase}} = data; + {{#headers}}d->{{paramName}} = reply->rawHeader("{{baseName}}"); {{! We don't check for required headers yet }} + {{/headers}}{{#properties}}d->{{paramName}} = reply->readAll();{{/properties}} return Success; -}{{/ returnFile?}}{{^returnFile?}} +}{{/ producesNotJson?}}{{^producesNotJson?}} BaseJob::Status {{camelCaseOperationId}}Job::parseJson(const QJsonDocument& data) { auto json = data.object(); @@ -97,5 +98,5 @@ BaseJob::Status {{camelCaseOperationId}}Job::parseJson(const QJsonDocument& data "The key '{{baseName}}' not found in the response" }; {{/required?}}d->{{paramName}} = fromJson<{{dataType.name}}>(json.value("{{baseName}}")); {{/ properties}}return Success; -}{{/ returnFile?}} -{{/properties?}}{{/normalResponse?}}{{/responses}}{{/operation}}{{/operations}} +}{{/ producesNotJson?}} +{{/allProperties?}}{{/normalResponse?}}{{/responses}}{{/operation}}{{/operations}} diff --git a/jobs/{{base}}.h.mustache b/jobs/{{base}}.h.mustache index 76ae4f51..b5106dbe 100644 --- a/jobs/{{base}}.h.mustache +++ b/jobs/{{base}}.h.mustache @@ -1,5 +1,4 @@ {{#@filePartial}}preamble{{/@filePartial}} - #pragma once {{#operations}}#include "../basejob.h" @@ -45,17 +44,17 @@ namespace QMatrixClient // End of inner data structures {{/models}} explicit {{camelCaseOperationId}}Job({{#allParams}}{{>maybeCrefType}} {{paramName}}{{^required?}} = {{defaultValue}}{{^defaultValue}}{}{{/defaultValue}}{{/required?}}{{#@join}}, {{/@join}}{{/allParams}});{{!skip EOL -}}{{# responses}}{{#normalResponse?}}{{#properties?}} +}}{{# responses}}{{#normalResponse?}}{{#allProperties?}} ~{{camelCaseOperationId}}Job() override; +{{#allProperties}} + {{>maybeCrefType}} {{paramName}}() const;{{/allProperties}} - {{#properties}}{{>maybeCrefType}} {{paramName}}() const; - {{/properties}} protected: - {{^returnFile}}Status parseJson(const QJsonDocument& data) override;{{/returnFile}} - {{#returnFile?}}Status parseReply(QByteArray data) override;{{/returnFile?}} + Status {{#producesNotJson?}}parseReply(QNetworkReply* reply){{/producesNotJson?}}{{^producesNotJson?}}parseJson(const QJsonDocument& data){{/producesNotJson?}} override; + private: class Private; - Private* d;{{/properties?}}{{/normalResponse?}}{{/responses}} + QScopedPointer d;{{/allProperties?}}{{/normalResponse?}}{{/responses}} }; {{/operation}}{{/operations}}{{!skip EOL }}} // namespace QMatrixClient -- cgit v1.2.3 From 7ccf4a68e1a0b747f2535e838cdfa221bfb6d744 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 4 Jan 2018 13:21:44 +0900 Subject: gtad.yaml: Update to the most recent GTAD Use _scopeRenderer (instead of _typeRenderer) and _literalQuote. --- jobs/gtad.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml index b9d128b4..8280877a 100644 --- a/jobs/gtad.yaml +++ b/jobs/gtad.yaml @@ -61,7 +61,8 @@ types: #operations: env: - _typeRenderer: "{{#scope}}{{scopeCamelCase}}Job::{{/scope}}{{name}}" + _scopeRenderer: "{{scopeCamelCase}}Job::" + _literalQuote: '"' maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}" qualifiedMaybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}" # preamble: preamble.mustache -- cgit v1.2.3 From e623303aa2077110113d1cb92b70e758ba1533b0 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 4 Jan 2018 23:27:22 +0900 Subject: Disable generation of jobs that stand in the way We have a better SyncJob and SetRoomStateJob yet. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1aa06198..c1343d9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,7 @@ if (MATRIX_DOC_PATH AND GTAD_PATH) ${MATRIX_DOC_PATH}/api/client-server cas_login_redirect.yaml- cas_login_ticket.yaml- old_sync.yaml- room_initial_sync.yaml- + sync.yaml- room_state.yaml- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} SOURCES jobs/gtad.yaml jobs/{{base}}.h.mustache jobs/{{base}}.cpp.mustache -- cgit v1.2.3 From d313f575a780c764bc404106ec37c30f99ba6182 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 4 Jan 2018 23:28:03 +0900 Subject: Updated generated jobs Just one file, the rest are the same. --- jobs/generated/administrative_contact.h | 1 + 1 file changed, 1 insertion(+) diff --git a/jobs/generated/administrative_contact.h b/jobs/generated/administrative_contact.h index 67563719..a5f04781 100644 --- a/jobs/generated/administrative_contact.h +++ b/jobs/generated/administrative_contact.h @@ -7,6 +7,7 @@ #include "../basejob.h" #include +#include #include "converters.h" -- cgit v1.2.3 From f31dbfc9a91460d664d570ea8f0f34cb7dea27d3 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 4 Jan 2018 23:28:25 +0900 Subject: gtad.yaml: Cleanup --- jobs/gtad.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml index 8280877a..86eacc3d 100644 --- a/jobs/gtad.yaml +++ b/jobs/gtad.yaml @@ -69,7 +69,6 @@ env: copyrightName: Kitsune Ral copyrightEmail: # imports: { set: } -# returnFile?: { bool: false } templates: - "{{base}}.h.mustache" -- cgit v1.2.3 From b052b4c3ebc65dc573a36bfb0e1d98e91f49ca18 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 5 Jan 2018 11:12:20 +0900 Subject: {{base}}.cpp.mustache: Fix addExpectedContentType() invocation code --- jobs/{{base}}.cpp.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index 6621f173..1461dec5 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -74,7 +74,7 @@ class {{camelCaseOperationId}}Job::Private {{/string?}}{{/required?}} _data.insert("{{baseName}}", toJson({{paramName}}));{{/bodyParams}} setRequestData(_data);{{/inlineBody}}{{#produces?}} {{#produces}} - addExpectedContentType({{_}});{{/produces}}{{/produces?}} + addExpectedContentType("{{_}}");{{/produces}}{{/produces?}} }{{/bodyParams?}}{{^bodyParams?}}{ }{{/bodyParams?}} {{# responses}}{{#normalResponse?}}{{#allProperties?}} {{camelCaseOperationId}}Job::~{{camelCaseOperationId}}Job() = default; -- cgit v1.2.3 From 2a9e64dc046707040fa9fbf5474459b47f881473 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 5 Jan 2018 11:01:18 +0900 Subject: jobs/generated: Use BaseJob::addExpectedContentType() --- jobs/generated/administrative_contact.cpp | 2 ++ jobs/generated/banning.cpp | 4 ++++ jobs/generated/directory.cpp | 2 ++ jobs/generated/inviting.cpp | 2 ++ jobs/generated/kicking.cpp | 2 ++ jobs/generated/list_public_rooms.cpp | 2 ++ jobs/generated/login.cpp | 2 ++ jobs/generated/profile.cpp | 4 ++++ jobs/generated/receipts.cpp | 2 ++ jobs/generated/redaction.cpp | 2 ++ jobs/generated/third_party_membership.cpp | 2 ++ jobs/generated/typing.cpp | 2 ++ 12 files changed, 28 insertions(+) diff --git a/jobs/generated/administrative_contact.cpp b/jobs/generated/administrative_contact.cpp index ca029f58..584c447f 100644 --- a/jobs/generated/administrative_contact.cpp +++ b/jobs/generated/administrative_contact.cpp @@ -102,6 +102,8 @@ Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind) _data.insert("three_pid_creds", toJson(threePidCreds)); _data.insert("bind", toJson(bind)); setRequestData(_data); + + addExpectedContentType("application/json"); } RequestTokenTo3PIDJob::RequestTokenTo3PIDJob() diff --git a/jobs/generated/banning.cpp b/jobs/generated/banning.cpp index d7708cc6..b7888062 100644 --- a/jobs/generated/banning.cpp +++ b/jobs/generated/banning.cpp @@ -23,6 +23,8 @@ BanJob::BanJob(const QString& roomId, const QString& userId, const QString& reas if (!reason.isEmpty()) _data.insert("reason", toJson(reason)); setRequestData(_data); + + addExpectedContentType("application/json"); } UnbanJob::UnbanJob(const QString& roomId, const QString& userId) @@ -34,5 +36,7 @@ UnbanJob::UnbanJob(const QString& roomId, const QString& userId) QJsonObject _data; _data.insert("user_id", toJson(userId)); setRequestData(_data); + + addExpectedContentType("application/json"); } diff --git a/jobs/generated/directory.cpp b/jobs/generated/directory.cpp index 1fd1e443..ea6d493f 100644 --- a/jobs/generated/directory.cpp +++ b/jobs/generated/directory.cpp @@ -22,6 +22,8 @@ SetRoomAliasJob::SetRoomAliasJob(const QString& roomAlias, const QString& roomId if (!roomId.isEmpty()) _data.insert("room_id", toJson(roomId)); setRequestData(_data); + + addExpectedContentType("application/json"); } class GetRoomIdByAliasJob::Private diff --git a/jobs/generated/inviting.cpp b/jobs/generated/inviting.cpp index bdf257dd..6cd67ad7 100644 --- a/jobs/generated/inviting.cpp +++ b/jobs/generated/inviting.cpp @@ -21,5 +21,7 @@ InviteUserJob::InviteUserJob(const QString& roomId, const QString& userId) QJsonObject _data; _data.insert("user_id", toJson(userId)); setRequestData(_data); + + addExpectedContentType("application/json"); } diff --git a/jobs/generated/kicking.cpp b/jobs/generated/kicking.cpp index 3488b387..bf94fe59 100644 --- a/jobs/generated/kicking.cpp +++ b/jobs/generated/kicking.cpp @@ -23,5 +23,7 @@ KickJob::KickJob(const QString& roomId, const QString& userId, const QString& re if (!reason.isEmpty()) _data.insert("reason", toJson(reason)); setRequestData(_data); + + addExpectedContentType("application/json"); } diff --git a/jobs/generated/list_public_rooms.cpp b/jobs/generated/list_public_rooms.cpp index d15e9de3..1e775f1b 100644 --- a/jobs/generated/list_public_rooms.cpp +++ b/jobs/generated/list_public_rooms.cpp @@ -205,6 +205,8 @@ QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server, double limit, co _data.insert("since", toJson(since)); _data.insert("filter", toJson(filter)); setRequestData(_data); + + addExpectedContentType("application/json"); } QueryPublicRoomsJob::~QueryPublicRoomsJob() = default; diff --git a/jobs/generated/login.cpp b/jobs/generated/login.cpp index bbfff0da..67d991db 100644 --- a/jobs/generated/login.cpp +++ b/jobs/generated/login.cpp @@ -44,6 +44,8 @@ LoginJob::LoginJob(const QString& type, const QString& user, const QString& medi if (!initialDeviceDisplayName.isEmpty()) _data.insert("initial_device_display_name", toJson(initialDeviceDisplayName)); setRequestData(_data); + + addExpectedContentType("application/json"); } LoginJob::~LoginJob() = default; diff --git a/jobs/generated/profile.cpp b/jobs/generated/profile.cpp index 27bab0b8..b30b9a36 100644 --- a/jobs/generated/profile.cpp +++ b/jobs/generated/profile.cpp @@ -22,6 +22,8 @@ SetDisplayNameJob::SetDisplayNameJob(const QString& userId, const QString& displ if (!displayname.isEmpty()) _data.insert("displayname", toJson(displayname)); setRequestData(_data); + + addExpectedContentType("application/json"); } class GetDisplayNameJob::Private @@ -61,6 +63,8 @@ SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QString& avatarUrl if (!avatarUrl.isEmpty()) _data.insert("avatar_url", toJson(avatarUrl)); setRequestData(_data); + + addExpectedContentType("application/json"); } class GetAvatarUrlJob::Private diff --git a/jobs/generated/receipts.cpp b/jobs/generated/receipts.cpp index 1c8bd80f..20e58ffb 100644 --- a/jobs/generated/receipts.cpp +++ b/jobs/generated/receipts.cpp @@ -19,5 +19,7 @@ PostReceiptJob::PostReceiptJob(const QString& roomId, const QString& receiptType ) { setRequestData(Data(receipt)); + + addExpectedContentType("application/json"); } diff --git a/jobs/generated/redaction.cpp b/jobs/generated/redaction.cpp index 9207f344..218e1aa6 100644 --- a/jobs/generated/redaction.cpp +++ b/jobs/generated/redaction.cpp @@ -28,6 +28,8 @@ RedactEventJob::RedactEventJob(const QString& roomId, const QString& eventId, co if (!reason.isEmpty()) _data.insert("reason", toJson(reason)); setRequestData(_data); + + addExpectedContentType("application/json"); } RedactEventJob::~RedactEventJob() = default; diff --git a/jobs/generated/third_party_membership.cpp b/jobs/generated/third_party_membership.cpp index dbb3ebee..f5ccf123 100644 --- a/jobs/generated/third_party_membership.cpp +++ b/jobs/generated/third_party_membership.cpp @@ -23,5 +23,7 @@ InviteBy3PIDJob::InviteBy3PIDJob(const QString& roomId, const QString& idServer, _data.insert("medium", toJson(medium)); _data.insert("address", toJson(address)); setRequestData(_data); + + addExpectedContentType("application/json"); } diff --git a/jobs/generated/typing.cpp b/jobs/generated/typing.cpp index a6817cb9..05e5fd1e 100644 --- a/jobs/generated/typing.cpp +++ b/jobs/generated/typing.cpp @@ -22,5 +22,7 @@ SetTypingJob::SetTypingJob(const QString& userId, const QString& roomId, bool ty _data.insert("typing", toJson(typing)); _data.insert("timeout", toJson(timeout)); setRequestData(_data); + + addExpectedContentType("application/json"); } -- cgit v1.2.3 From c944e7d87c3ac7b2f83adc0ea7c04eeccda07b2b Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 5 Jan 2018 11:06:30 +0900 Subject: Avatar: Use Connection::getThumbnail instead of callApi<> --- avatar.cpp | 2 +- avatar.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/avatar.cpp b/avatar.cpp index 9490347d..eeb61f30 100644 --- a/avatar.cpp +++ b/avatar.cpp @@ -76,7 +76,7 @@ QImage Avatar::Private::get(QSize size, Avatar::notifier_t notifier) if (_ongoingRequest) _ongoingRequest->abandon(); notifiers.emplace_back(std::move(notifier)); - _ongoingRequest = _connection->callApi(_url, size); + _ongoingRequest = _connection->getThumbnail(_url, size); _ongoingRequest->connect( _ongoingRequest, &MediaThumbnailJob::finished, _connection, [=]() { if (_ongoingRequest->status().good()) diff --git a/avatar.h b/avatar.h index d8b4b206..bf9cfdcd 100644 --- a/avatar.h +++ b/avatar.h @@ -25,7 +25,6 @@ namespace QMatrixClient { - class MediaThumbnailJob; class Connection; class Avatar -- cgit v1.2.3 From 5d85fc6335d4b49438a83e1e592ccac5a41d2332 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 5 Jan 2018 17:33:32 +0900 Subject: CMakeLists.txt: Exclude more API files from generation All of these new exclusions have parameters named 'signed', 'unsigned' and 'default' which are C++ reserverd words. GTAD does not give a proper workaround for these yet (see #24) so exclude them for now. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c1343d9d..827497db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,6 +88,9 @@ if (MATRIX_DOC_PATH AND GTAD_PATH) cas_login_redirect.yaml- cas_login_ticket.yaml- old_sync.yaml- room_initial_sync.yaml- sync.yaml- room_state.yaml- + event_context.yaml- joining.yaml- + notifications.yaml- peeking_events.yaml- + pushrules.yaml- rooms.yaml- search.yaml- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} SOURCES jobs/gtad.yaml jobs/{{base}}.h.mustache jobs/{{base}}.cpp.mustache -- cgit v1.2.3 From bd5b10c8d59b971379799b164eb968eea939079a Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 5 Jan 2018 17:23:55 +0900 Subject: jobs/generated: Make default values propagate properly Thanks to the latest GTAD. initializeDefaultValue is a partial that in turn inserts a type-specific {{>initializer}} if there is a non-trivial default value. --- jobs/gtad.yaml | 16 ++++++++++++---- jobs/{{base}}.h.mustache | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml index 86eacc3d..ad8dc80f 100644 --- a/jobs/gtad.yaml +++ b/jobs/gtad.yaml @@ -3,9 +3,9 @@ preprocess: "%CLIENT_MAJOR_VERSION%": r0 # FIXME: the below only fixes C++ compilation but not actual work - the code # will try to reach out for wrong values in JSON payloads - "signed:": "signedData:" - "unsigned:": "unsignedData:" - "default:": "isDefault:" + #"signed:": "signedData:" + #"unsigned:": "unsignedData:" + #"default:": "isDefault:" # Structure: # swaggerType: @@ -29,16 +29,23 @@ types: string: - byte: &QByteArray type: QByteArray + initializer: '"{{defaultValue}}"' string?: true imports: - binary: *QByteArray - - date: { type: QDate, "avoidCopy?": true, imports: } + - date: + type: QDate + initializer: QDate::fromString("{{defaultValue}}") + avoidCopy?: true + imports: - dateTime: type: QDateTime + initializer: QDateTime::fromString("{{defaultValue}}") avoidCopy?: true imports: - //: type: QString + initializer: QStringLiteral("{{defaultValue}}") string?: true avoidCopy?: true imports: @@ -65,6 +72,7 @@ env: _literalQuote: '"' maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}" qualifiedMaybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}" + initializeDefaultValue: "{{#defaultValue}}{{>initializer}}{{/defaultValue}}{{^defaultValue}}{}{{/defaultValue}}" # preamble: preamble.mustache copyrightName: Kitsune Ral copyrightEmail: diff --git a/jobs/{{base}}.h.mustache b/jobs/{{base}}.h.mustache index b5106dbe..69e0e6d3 100644 --- a/jobs/{{base}}.h.mustache +++ b/jobs/{{base}}.h.mustache @@ -43,7 +43,7 @@ namespace QMatrixClient {{/ trivial?}}{{/model}} // End of inner data structures {{/models}} - explicit {{camelCaseOperationId}}Job({{#allParams}}{{>maybeCrefType}} {{paramName}}{{^required?}} = {{defaultValue}}{{^defaultValue}}{}{{/defaultValue}}{{/required?}}{{#@join}}, {{/@join}}{{/allParams}});{{!skip EOL + explicit {{camelCaseOperationId}}Job({{#allParams}}{{>maybeCrefType}} {{paramName}}{{^required?}} = {{>initializeDefaultValue}}{{/required?}}{{#@join}}, {{/@join}}{{/allParams}});{{!skip EOL }}{{# responses}}{{#normalResponse?}}{{#allProperties?}} ~{{camelCaseOperationId}}Job() override; {{#allProperties}} -- cgit v1.2.3 From 859a0c70353d9c92fbc02c9d5aa467bf9c28e9e6 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 5 Jan 2018 19:21:54 +0900 Subject: BaseJob: Provide a simplified constructor --- jobs/basejob.cpp | 4 ++++ jobs/basejob.h | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp index 1f087f46..d2d1ce95 100644 --- a/jobs/basejob.cpp +++ b/jobs/basejob.cpp @@ -95,6 +95,10 @@ QDebug QMatrixClient::operator<<(QDebug dbg, const BaseJob::Status& s) << QString(s.message).replace(filter, "\\1 HIDDEN"); } +BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, bool needsToken) + : BaseJob(verb, name, endpoint, Query { }, Data { }, needsToken) +{ } + BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, const Query& query, const Data& data, bool needsToken) : d(new Private(verb, endpoint, query, data, needsToken)) diff --git a/jobs/basejob.h b/jobs/basejob.h index 6b34c9f5..daca1e79 100644 --- a/jobs/basejob.h +++ b/jobs/basejob.h @@ -129,7 +129,9 @@ namespace QMatrixClient public: BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, - const Query& query = {}, const Data& data = {}, + bool needsToken = true); + BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, + const Query& query, const Data& data = {}, bool needsToken = true); Status status() const; -- cgit v1.2.3 From ea5cd86a9deacc9a6b57f1c432ad6e51e92de428 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 5 Jan 2018 19:47:45 +0900 Subject: jobs/generated: Convert numbers to string in a way that actually works Plus a bit of fooling around with linebreaks. --- jobs/gtad.yaml | 1 + jobs/{{base}}.cpp.mustache | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml index ad8dc80f..54f70cdb 100644 --- a/jobs/gtad.yaml +++ b/jobs/gtad.yaml @@ -73,6 +73,7 @@ env: maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}" qualifiedMaybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}" initializeDefaultValue: "{{#defaultValue}}{{>initializer}}{{/defaultValue}}{{^defaultValue}}{}{{/defaultValue}}" + paramToString: '{{#string?}}{{nameCamelCase}}{{/string?}}{{^string?}}QString("%1").arg({{nameCamelCase}}){{/string?}}' # preamble: preamble.mustache copyrightName: Kitsune Ral copyrightEmail: diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index 1461dec5..0726d523 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -59,23 +59,24 @@ class {{camelCaseOperationId}}Job::Private {{/ allProperties?}}{{/normalResponse?}}{{/responses}} {{camelCaseOperationId}}Job::{{camelCaseOperationId}}Job({{#allParams}}{{>maybeCrefType}} {{paramName}}{{#@join}}, {{/@join}}{{/allParams}}) : BaseJob(HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{camelCaseOperationId}}Job", - basePath{{#pathParts}} % {{_}}{{/pathParts}}, - Query {{^queryParams}}{ }{{/queryParams}}{{#queryParams?}}{ - {{#queryParams}}{ "{{baseName}}", toJson({{paramName}}).toString() }{{#@join}}, - {{/@join}}{{/queryParams}} - }{{/queryParams?}}{{#skipAuth}}, Data { }, false{{/skipAuth}} - ){{#responses}}{{#normalResponse?}}{{#allProperties?}}, d(new Private){{/allProperties?}}{{/normalResponse?}}{{/responses}} -{{#bodyParams?}}{ + basePath{{#pathParts}} % {{_}}{{/pathParts}}{{#skipAuth}}, false{{/skipAuth}}){{#responses}}{{#normalResponse?}}{{#allProperties?}} + , d(new Private){{/allProperties?}}{{/normalResponse?}}{{/responses}} +{ {{#headerParams?}}{{#headerParams}} setRequestHeader("{{baseName}}", {{paramName}}.toLatin1()); {{/headerParams}} -{{/headerParams?}}{{#inlineBody}} setRequestData(Data({{paramName}}));{{/inlineBody}}{{! +{{/headerParams?}}{{! +}}{{#queryParams?}} QUrlQuery _q;{{#queryParams}} +{{^required?}}{{#string?}} if (!{{nameCamelCase}}.isEmpty()) + {{/string?}}{{/required?}} _q.addQueryItem("{{baseName}}", {{>paramToString}});{{/queryParams}} + setRequestQuery(_q); +{{/queryParams?}}{{#bodyParams?}}{{! +}}{{#inlineBody}} setRequestData(Data({{nameCamelCase}}));{{/inlineBody}}{{! }}{{^inlineBody}} QJsonObject _data;{{#bodyParams}} {{^required?}}{{#string?}} if (!{{paramName}}.isEmpty()) {{/string?}}{{/required?}} _data.insert("{{baseName}}", toJson({{paramName}}));{{/bodyParams}} - setRequestData(_data);{{/inlineBody}}{{#produces?}} -{{#produces}} - addExpectedContentType("{{_}}");{{/produces}}{{/produces?}} -}{{/bodyParams?}}{{^bodyParams?}}{ }{{/bodyParams?}} + setRequestData(_data);{{/inlineBody}} +{{/bodyParams?}}{{#producesNotJson?}} setExpectedContentTypes({ {{#produces}}"{{_}}"{{#@join}}, {{/@join}}{{/produces}} }); +{{/producesNotJson?}}}{{!<- mind the actual brace}} {{# responses}}{{#normalResponse?}}{{#allProperties?}} {{camelCaseOperationId}}Job::~{{camelCaseOperationId}}Job() = default; {{# allProperties}} -- cgit v1.2.3 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/basejob.cpp | 1 + jobs/generated/administrative_contact.cpp | 21 +++++++----------- jobs/generated/banning.cpp | 12 ++--------- jobs/generated/directory.cpp | 21 +++++++----------- jobs/generated/inviting.cpp | 6 +----- jobs/generated/kicking.cpp | 6 +----- jobs/generated/leaving.cpp | 14 ++++++------ jobs/generated/list_public_rooms.cpp | 32 ++++++++++++++------------- jobs/generated/login.cpp | 7 ++---- jobs/generated/logout.cpp | 7 +++--- jobs/generated/profile.cpp | 36 ++++++++++++------------------- jobs/generated/receipts.cpp | 6 +----- jobs/generated/redaction.cpp | 7 ++---- jobs/generated/third_party_membership.cpp | 6 +----- jobs/generated/typing.cpp | 6 +----- jobs/generated/versions.cpp | 8 +++---- jobs/generated/whoami.cpp | 8 +++---- 17 files changed, 76 insertions(+), 128 deletions(-) diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp index d2d1ce95..2a28f11e 100644 --- a/jobs/basejob.cpp +++ b/jobs/basejob.cpp @@ -104,6 +104,7 @@ BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, : d(new Private(verb, endpoint, query, data, needsToken)) { setObjectName(name); + setExpectedContentTypes({ "application/json" }); d->timer.setSingleShot(true); connect (&d->timer, &QTimer::timeout, this, &BaseJob::timeout); d->retryTimer.setSingleShot(true); 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) +{ +} diff --git a/jobs/generated/banning.cpp b/jobs/generated/banning.cpp index b7888062..f66b27b6 100644 --- a/jobs/generated/banning.cpp +++ b/jobs/generated/banning.cpp @@ -14,29 +14,21 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); BanJob::BanJob(const QString& roomId, const QString& userId, const QString& reason) : BaseJob(HttpVerb::Post, "BanJob", - basePath % "/rooms/" % roomId % "/ban", - Query { } - ) + basePath % "/rooms/" % roomId % "/ban") { QJsonObject _data; _data.insert("user_id", toJson(userId)); if (!reason.isEmpty()) _data.insert("reason", toJson(reason)); setRequestData(_data); - - addExpectedContentType("application/json"); } UnbanJob::UnbanJob(const QString& roomId, const QString& userId) : BaseJob(HttpVerb::Post, "UnbanJob", - basePath % "/rooms/" % roomId % "/unban", - Query { } - ) + basePath % "/rooms/" % roomId % "/unban") { QJsonObject _data; _data.insert("user_id", toJson(userId)); setRequestData(_data); - - addExpectedContentType("application/json"); } diff --git a/jobs/generated/directory.cpp b/jobs/generated/directory.cpp index ea6d493f..4e61ed74 100644 --- a/jobs/generated/directory.cpp +++ b/jobs/generated/directory.cpp @@ -14,16 +14,12 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0/directory"); SetRoomAliasJob::SetRoomAliasJob(const QString& roomAlias, const QString& roomId) : BaseJob(HttpVerb::Put, "SetRoomAliasJob", - basePath % "/room/" % roomAlias, - Query { } - ) + basePath % "/room/" % roomAlias) { QJsonObject _data; if (!roomId.isEmpty()) _data.insert("room_id", toJson(roomId)); setRequestData(_data); - - addExpectedContentType("application/json"); } class GetRoomIdByAliasJob::Private @@ -35,10 +31,10 @@ class GetRoomIdByAliasJob::Private GetRoomIdByAliasJob::GetRoomIdByAliasJob(const QString& roomAlias) : BaseJob(HttpVerb::Get, "GetRoomIdByAliasJob", - basePath % "/room/" % roomAlias, - Query { }, Data { }, false - ), d(new Private) -{ } + basePath % "/room/" % roomAlias, false) + , d(new Private) +{ +} GetRoomIdByAliasJob::~GetRoomIdByAliasJob() = default; @@ -62,8 +58,7 @@ BaseJob::Status GetRoomIdByAliasJob::parseJson(const QJsonDocument& data) DeleteRoomAliasJob::DeleteRoomAliasJob(const QString& roomAlias) : BaseJob(HttpVerb::Delete, "DeleteRoomAliasJob", - basePath % "/room/" % roomAlias, - Query { } - ) -{ } + basePath % "/room/" % roomAlias) +{ +} diff --git a/jobs/generated/inviting.cpp b/jobs/generated/inviting.cpp index 6cd67ad7..d2ee2107 100644 --- a/jobs/generated/inviting.cpp +++ b/jobs/generated/inviting.cpp @@ -14,14 +14,10 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); InviteUserJob::InviteUserJob(const QString& roomId, const QString& userId) : BaseJob(HttpVerb::Post, "InviteUserJob", - basePath % "/rooms/" % roomId % "/invite", - Query { } - ) + basePath % "/rooms/" % roomId % "/invite") { QJsonObject _data; _data.insert("user_id", toJson(userId)); setRequestData(_data); - - addExpectedContentType("application/json"); } diff --git a/jobs/generated/kicking.cpp b/jobs/generated/kicking.cpp index bf94fe59..bf2490b7 100644 --- a/jobs/generated/kicking.cpp +++ b/jobs/generated/kicking.cpp @@ -14,16 +14,12 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); KickJob::KickJob(const QString& roomId, const QString& userId, const QString& reason) : BaseJob(HttpVerb::Post, "KickJob", - basePath % "/rooms/" % roomId % "/kick", - Query { } - ) + basePath % "/rooms/" % roomId % "/kick") { QJsonObject _data; _data.insert("user_id", toJson(userId)); if (!reason.isEmpty()) _data.insert("reason", toJson(reason)); setRequestData(_data); - - addExpectedContentType("application/json"); } diff --git a/jobs/generated/leaving.cpp b/jobs/generated/leaving.cpp index 604fcc73..89c110dd 100644 --- a/jobs/generated/leaving.cpp +++ b/jobs/generated/leaving.cpp @@ -14,15 +14,13 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); LeaveRoomJob::LeaveRoomJob(const QString& roomId) : BaseJob(HttpVerb::Post, "LeaveRoomJob", - basePath % "/rooms/" % roomId % "/leave", - Query { } - ) -{ } + basePath % "/rooms/" % roomId % "/leave") +{ +} ForgetRoomJob::ForgetRoomJob(const QString& roomId) : BaseJob(HttpVerb::Post, "ForgetRoomJob", - basePath % "/rooms/" % roomId % "/forget", - Query { } - ) -{ } + basePath % "/rooms/" % roomId % "/forget") +{ +} diff --git a/jobs/generated/list_public_rooms.cpp b/jobs/generated/list_public_rooms.cpp index 1e775f1b..a2c0e406 100644 --- a/jobs/generated/list_public_rooms.cpp +++ b/jobs/generated/list_public_rooms.cpp @@ -68,14 +68,17 @@ class GetPublicRoomsJob::Private GetPublicRoomsJob::GetPublicRoomsJob(double limit, const QString& since, const QString& server) : BaseJob(HttpVerb::Get, "GetPublicRoomsJob", - basePath % "/publicRooms", - Query { - { "limit", toJson(limit).toString() }, - { "since", toJson(since).toString() }, - { "server", toJson(server).toString() } - }, Data { }, false - ), d(new Private) -{ } + basePath % "/publicRooms", false) + , d(new Private) +{ + QUrlQuery _q; + _q.addQueryItem("limit", QString("%1").arg(limit)); + if (!since.isEmpty()) + _q.addQueryItem("since", since); + if (!server.isEmpty()) + _q.addQueryItem("server", server); + setRequestQuery(_q); +} GetPublicRoomsJob::~GetPublicRoomsJob() = default; @@ -193,20 +196,19 @@ class QueryPublicRoomsJob::Private QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server, double limit, const QString& since, const Filter& filter) : BaseJob(HttpVerb::Post, "QueryPublicRoomsJob", - basePath % "/publicRooms", - Query { - { "server", toJson(server).toString() } - } - ), d(new Private) + basePath % "/publicRooms") + , d(new Private) { + QUrlQuery _q; + if (!server.isEmpty()) + _q.addQueryItem("server", server); + setRequestQuery(_q); QJsonObject _data; _data.insert("limit", toJson(limit)); if (!since.isEmpty()) _data.insert("since", toJson(since)); _data.insert("filter", toJson(filter)); setRequestData(_data); - - addExpectedContentType("application/json"); } QueryPublicRoomsJob::~QueryPublicRoomsJob() = default; diff --git a/jobs/generated/login.cpp b/jobs/generated/login.cpp index 67d991db..a4dab428 100644 --- a/jobs/generated/login.cpp +++ b/jobs/generated/login.cpp @@ -23,9 +23,8 @@ class LoginJob::Private LoginJob::LoginJob(const QString& type, const QString& user, const QString& medium, const QString& address, const QString& password, const QString& token, const QString& deviceId, const QString& initialDeviceDisplayName) : BaseJob(HttpVerb::Post, "LoginJob", - basePath % "/login", - Query { }, Data { }, false - ), d(new Private) + basePath % "/login", false) + , d(new Private) { QJsonObject _data; _data.insert("type", toJson(type)); @@ -44,8 +43,6 @@ LoginJob::LoginJob(const QString& type, const QString& user, const QString& medi if (!initialDeviceDisplayName.isEmpty()) _data.insert("initial_device_display_name", toJson(initialDeviceDisplayName)); setRequestData(_data); - - addExpectedContentType("application/json"); } LoginJob::~LoginJob() = default; diff --git a/jobs/generated/logout.cpp b/jobs/generated/logout.cpp index b6904070..f7f8eff9 100644 --- a/jobs/generated/logout.cpp +++ b/jobs/generated/logout.cpp @@ -14,8 +14,7 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); LogoutJob::LogoutJob() : BaseJob(HttpVerb::Post, "LogoutJob", - basePath % "/logout", - Query { } - ) -{ } + basePath % "/logout") +{ +} diff --git a/jobs/generated/profile.cpp b/jobs/generated/profile.cpp index b30b9a36..9523ca96 100644 --- a/jobs/generated/profile.cpp +++ b/jobs/generated/profile.cpp @@ -14,16 +14,12 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); SetDisplayNameJob::SetDisplayNameJob(const QString& userId, const QString& displayname) : BaseJob(HttpVerb::Put, "SetDisplayNameJob", - basePath % "/profile/" % userId % "/displayname", - Query { } - ) + basePath % "/profile/" % userId % "/displayname") { QJsonObject _data; if (!displayname.isEmpty()) _data.insert("displayname", toJson(displayname)); setRequestData(_data); - - addExpectedContentType("application/json"); } class GetDisplayNameJob::Private @@ -34,10 +30,10 @@ class GetDisplayNameJob::Private GetDisplayNameJob::GetDisplayNameJob(const QString& userId) : BaseJob(HttpVerb::Get, "GetDisplayNameJob", - basePath % "/profile/" % userId % "/displayname", - Query { }, Data { }, false - ), d(new Private) -{ } + basePath % "/profile/" % userId % "/displayname", false) + , d(new Private) +{ +} GetDisplayNameJob::~GetDisplayNameJob() = default; @@ -55,16 +51,12 @@ BaseJob::Status GetDisplayNameJob::parseJson(const QJsonDocument& data) SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QString& avatarUrl) : BaseJob(HttpVerb::Put, "SetAvatarUrlJob", - basePath % "/profile/" % userId % "/avatar_url", - Query { } - ) + basePath % "/profile/" % userId % "/avatar_url") { QJsonObject _data; if (!avatarUrl.isEmpty()) _data.insert("avatar_url", toJson(avatarUrl)); setRequestData(_data); - - addExpectedContentType("application/json"); } class GetAvatarUrlJob::Private @@ -75,10 +67,10 @@ class GetAvatarUrlJob::Private GetAvatarUrlJob::GetAvatarUrlJob(const QString& userId) : BaseJob(HttpVerb::Get, "GetAvatarUrlJob", - basePath % "/profile/" % userId % "/avatar_url", - Query { }, Data { }, false - ), d(new Private) -{ } + basePath % "/profile/" % userId % "/avatar_url", false) + , d(new Private) +{ +} GetAvatarUrlJob::~GetAvatarUrlJob() = default; @@ -103,10 +95,10 @@ class GetUserProfileJob::Private GetUserProfileJob::GetUserProfileJob(const QString& userId) : BaseJob(HttpVerb::Get, "GetUserProfileJob", - basePath % "/profile/" % userId, - Query { }, Data { }, false - ), d(new Private) -{ } + basePath % "/profile/" % userId, false) + , d(new Private) +{ +} GetUserProfileJob::~GetUserProfileJob() = default; diff --git a/jobs/generated/receipts.cpp b/jobs/generated/receipts.cpp index 20e58ffb..83c38b6f 100644 --- a/jobs/generated/receipts.cpp +++ b/jobs/generated/receipts.cpp @@ -14,12 +14,8 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); PostReceiptJob::PostReceiptJob(const QString& roomId, const QString& receiptType, const QString& eventId, const QJsonObject& receipt) : BaseJob(HttpVerb::Post, "PostReceiptJob", - basePath % "/rooms/" % roomId % "/receipt/" % receiptType % "/" % eventId, - Query { } - ) + basePath % "/rooms/" % roomId % "/receipt/" % receiptType % "/" % eventId) { setRequestData(Data(receipt)); - - addExpectedContentType("application/json"); } diff --git a/jobs/generated/redaction.cpp b/jobs/generated/redaction.cpp index 218e1aa6..0da35dfc 100644 --- a/jobs/generated/redaction.cpp +++ b/jobs/generated/redaction.cpp @@ -20,16 +20,13 @@ class RedactEventJob::Private RedactEventJob::RedactEventJob(const QString& roomId, const QString& eventId, const QString& txnId, const QString& reason) : BaseJob(HttpVerb::Put, "RedactEventJob", - basePath % "/rooms/" % roomId % "/redact/" % eventId % "/" % txnId, - Query { } - ), d(new Private) + basePath % "/rooms/" % roomId % "/redact/" % eventId % "/" % txnId) + , d(new Private) { QJsonObject _data; if (!reason.isEmpty()) _data.insert("reason", toJson(reason)); setRequestData(_data); - - addExpectedContentType("application/json"); } RedactEventJob::~RedactEventJob() = default; diff --git a/jobs/generated/third_party_membership.cpp b/jobs/generated/third_party_membership.cpp index f5ccf123..b637d481 100644 --- a/jobs/generated/third_party_membership.cpp +++ b/jobs/generated/third_party_membership.cpp @@ -14,16 +14,12 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); InviteBy3PIDJob::InviteBy3PIDJob(const QString& roomId, const QString& idServer, const QString& medium, const QString& address) : BaseJob(HttpVerb::Post, "InviteBy3PIDJob", - basePath % "/rooms/" % roomId % "/invite", - Query { } - ) + basePath % "/rooms/" % roomId % "/invite") { QJsonObject _data; _data.insert("id_server", toJson(idServer)); _data.insert("medium", toJson(medium)); _data.insert("address", toJson(address)); setRequestData(_data); - - addExpectedContentType("application/json"); } diff --git a/jobs/generated/typing.cpp b/jobs/generated/typing.cpp index 05e5fd1e..fa700290 100644 --- a/jobs/generated/typing.cpp +++ b/jobs/generated/typing.cpp @@ -14,15 +14,11 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); SetTypingJob::SetTypingJob(const QString& userId, const QString& roomId, bool typing, int timeout) : BaseJob(HttpVerb::Put, "SetTypingJob", - basePath % "/rooms/" % roomId % "/typing/" % userId, - Query { } - ) + basePath % "/rooms/" % roomId % "/typing/" % userId) { QJsonObject _data; _data.insert("typing", toJson(typing)); _data.insert("timeout", toJson(timeout)); setRequestData(_data); - - addExpectedContentType("application/json"); } diff --git a/jobs/generated/versions.cpp b/jobs/generated/versions.cpp index 8ff58365..938c1d34 100644 --- a/jobs/generated/versions.cpp +++ b/jobs/generated/versions.cpp @@ -20,10 +20,10 @@ class GetVersionsJob::Private GetVersionsJob::GetVersionsJob() : BaseJob(HttpVerb::Get, "GetVersionsJob", - basePath % "/versions", - Query { }, Data { }, false - ), d(new Private) -{ } + basePath % "/versions", false) + , d(new Private) +{ +} GetVersionsJob::~GetVersionsJob() = default; diff --git a/jobs/generated/whoami.cpp b/jobs/generated/whoami.cpp index d4da99d4..4f7b052c 100644 --- a/jobs/generated/whoami.cpp +++ b/jobs/generated/whoami.cpp @@ -20,10 +20,10 @@ class GetTokenOwnerJob::Private GetTokenOwnerJob::GetTokenOwnerJob() : BaseJob(HttpVerb::Get, "GetTokenOwnerJob", - basePath % "/account/whoami", - Query { } - ), d(new Private) -{ } + basePath % "/account/whoami") + , d(new Private) +{ +} GetTokenOwnerJob::~GetTokenOwnerJob() = default; -- cgit v1.2.3 From e3a1511b6b03aedab065386aa0fa7a9e1cd78a70 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 5 Jan 2018 11:12:48 +0900 Subject: jobs/generated: content-repo.*, create_room.* --- jobs/generated/content-repo.cpp | 212 ++++++++++++++++++++++++++++++++++++++++ jobs/generated/content-repo.h | 102 +++++++++++++++++++ jobs/generated/create_room.cpp | 114 +++++++++++++++++++++ jobs/generated/create_room.h | 56 +++++++++++ 4 files changed, 484 insertions(+) create mode 100644 jobs/generated/content-repo.cpp create mode 100644 jobs/generated/content-repo.h create mode 100644 jobs/generated/create_room.cpp create mode 100644 jobs/generated/create_room.h diff --git a/jobs/generated/content-repo.cpp b/jobs/generated/content-repo.cpp new file mode 100644 index 00000000..ec6683bb --- /dev/null +++ b/jobs/generated/content-repo.cpp @@ -0,0 +1,212 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "content-repo.h" + +#include "converters.h" + +#include +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/media/r0"); + +class UploadContentJob::Private +{ + public: + QString contentUri; +}; + +UploadContentJob::UploadContentJob(QByteArray content, const QString& filename, const QString& contentType) + : BaseJob(HttpVerb::Post, "UploadContentJob", + basePath % "/upload") + , d(new Private) +{ + setRequestHeader("Content-Type", contentType.toLatin1()); + + QUrlQuery _q; + if (!filename.isEmpty()) + _q.addQueryItem("filename", filename); + setRequestQuery(_q); + setRequestData(Data(content)); +} + +UploadContentJob::~UploadContentJob() = default; + +const QString& UploadContentJob::contentUri() const +{ + return d->contentUri; +} + +BaseJob::Status UploadContentJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("content_uri")) + return { JsonParseError, + "The key 'content_uri' not found in the response" }; + d->contentUri = fromJson(json.value("content_uri")); + return Success; +} + +class GetContentJob::Private +{ + public: + QString contentType; + QString contentDisposition; + QByteArray content; +}; + +GetContentJob::GetContentJob(const QString& serverName, const QString& mediaId) + : BaseJob(HttpVerb::Get, "GetContentJob", + basePath % "/download/" % serverName % "/" % mediaId, false) + , d(new Private) +{ + setExpectedContentTypes({ "*/*" }); +} + +GetContentJob::~GetContentJob() = default; + +const QString& GetContentJob::contentType() const +{ + return d->contentType; +} + +const QString& GetContentJob::contentDisposition() const +{ + return d->contentDisposition; +} + +QByteArray GetContentJob::content() const +{ + return d->content; +} + +BaseJob::Status GetContentJob::parseReply(QNetworkReply* reply) +{ + d->contentType = reply->rawHeader("Content-Type"); + d->contentDisposition = reply->rawHeader("Content-Disposition"); + d->content = reply->readAll(); + return Success; +} + +class GetContentOverrideNameJob::Private +{ + public: + QString contentType; + QString contentDisposition; + QByteArray content; +}; + +GetContentOverrideNameJob::GetContentOverrideNameJob(const QString& serverName, const QString& mediaId, const QString& fileName) + : BaseJob(HttpVerb::Get, "GetContentOverrideNameJob", + basePath % "/download/" % serverName % "/" % mediaId % "/" % fileName, false) + , d(new Private) +{ + setExpectedContentTypes({ "*/*" }); +} + +GetContentOverrideNameJob::~GetContentOverrideNameJob() = default; + +const QString& GetContentOverrideNameJob::contentType() const +{ + return d->contentType; +} + +const QString& GetContentOverrideNameJob::contentDisposition() const +{ + return d->contentDisposition; +} + +QByteArray GetContentOverrideNameJob::content() const +{ + return d->content; +} + +BaseJob::Status GetContentOverrideNameJob::parseReply(QNetworkReply* reply) +{ + d->contentType = reply->rawHeader("Content-Type"); + d->contentDisposition = reply->rawHeader("Content-Disposition"); + d->content = reply->readAll(); + return Success; +} + +class GetContentThumbnailJob::Private +{ + public: + QString contentType; + QByteArray content; +}; + +GetContentThumbnailJob::GetContentThumbnailJob(const QString& serverName, const QString& mediaId, int width, int height, const QString& method) + : BaseJob(HttpVerb::Get, "GetContentThumbnailJob", + basePath % "/thumbnail/" % serverName % "/" % mediaId, false) + , d(new Private) +{ + QUrlQuery _q; + _q.addQueryItem("width", QString("%1").arg(width)); + _q.addQueryItem("height", QString("%1").arg(height)); + if (!method.isEmpty()) + _q.addQueryItem("method", method); + setRequestQuery(_q); + setExpectedContentTypes({ "image/jpeg", "image/png" }); +} + +GetContentThumbnailJob::~GetContentThumbnailJob() = default; + +const QString& GetContentThumbnailJob::contentType() const +{ + return d->contentType; +} + +QByteArray GetContentThumbnailJob::content() const +{ + return d->content; +} + +BaseJob::Status GetContentThumbnailJob::parseReply(QNetworkReply* reply) +{ + d->contentType = reply->rawHeader("Content-Type"); + d->content = reply->readAll(); + return Success; +} + +class GetUrlPreviewJob::Private +{ + public: + double matrixImageSize; + QString ogImage; +}; + +GetUrlPreviewJob::GetUrlPreviewJob(const QString& url, double ts) + : BaseJob(HttpVerb::Get, "GetUrlPreviewJob", + basePath % "/preview_url") + , d(new Private) +{ + QUrlQuery _q; + _q.addQueryItem("url", url); + _q.addQueryItem("ts", QString("%1").arg(ts)); + setRequestQuery(_q); +} + +GetUrlPreviewJob::~GetUrlPreviewJob() = default; + +double GetUrlPreviewJob::matrixImageSize() const +{ + return d->matrixImageSize; +} + +const QString& GetUrlPreviewJob::ogImage() const +{ + return d->ogImage; +} + +BaseJob::Status GetUrlPreviewJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->matrixImageSize = fromJson(json.value("matrix:image:size")); + d->ogImage = fromJson(json.value("og:image")); + return Success; +} + diff --git a/jobs/generated/content-repo.h b/jobs/generated/content-repo.h new file mode 100644 index 00000000..1d844651 --- /dev/null +++ b/jobs/generated/content-repo.h @@ -0,0 +1,102 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include +#include + + +namespace QMatrixClient +{ + // Operations + + class UploadContentJob : public BaseJob + { + public: + explicit UploadContentJob(QByteArray content, const QString& filename = {}, const QString& contentType = {}); + ~UploadContentJob() override; + + const QString& contentUri() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class GetContentJob : public BaseJob + { + public: + explicit GetContentJob(const QString& serverName, const QString& mediaId); + ~GetContentJob() override; + + const QString& contentType() const; + const QString& contentDisposition() const; + QByteArray content() const; + + protected: + Status parseReply(QNetworkReply* reply) override; + + private: + class Private; + QScopedPointer d; + }; + + class GetContentOverrideNameJob : public BaseJob + { + public: + explicit GetContentOverrideNameJob(const QString& serverName, const QString& mediaId, const QString& fileName); + ~GetContentOverrideNameJob() override; + + const QString& contentType() const; + const QString& contentDisposition() const; + QByteArray content() const; + + protected: + Status parseReply(QNetworkReply* reply) override; + + private: + class Private; + QScopedPointer d; + }; + + class GetContentThumbnailJob : public BaseJob + { + public: + explicit GetContentThumbnailJob(const QString& serverName, const QString& mediaId, int width = {}, int height = {}, const QString& method = {}); + ~GetContentThumbnailJob() override; + + const QString& contentType() const; + QByteArray content() const; + + protected: + Status parseReply(QNetworkReply* reply) override; + + private: + class Private; + QScopedPointer d; + }; + + class GetUrlPreviewJob : public BaseJob + { + public: + explicit GetUrlPreviewJob(const QString& url, double ts = {}); + ~GetUrlPreviewJob() override; + + double matrixImageSize() const; + const QString& ogImage() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/jobs/generated/create_room.cpp b/jobs/generated/create_room.cpp new file mode 100644 index 00000000..be06873a --- /dev/null +++ b/jobs/generated/create_room.cpp @@ -0,0 +1,114 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "create_room.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +CreateRoomJob::Invite3pid::operator QJsonObject() const +{ + QJsonObject o; + o.insert("id_server", toJson(idServer)); + o.insert("medium", toJson(medium)); + o.insert("address", toJson(address)); + + return o; +} +namespace QMatrixClient +{ + template <> struct FromJson + { + CreateRoomJob::Invite3pid operator()(QJsonValue jv) + { + QJsonObject o = jv.toObject(); + CreateRoomJob::Invite3pid result; + result.idServer = + fromJson(o.value("id_server")); + result.medium = + fromJson(o.value("medium")); + result.address = + fromJson(o.value("address")); + + return result; + } + }; +} // namespace QMatrixClient + +CreateRoomJob::StateEvent::operator QJsonObject() const +{ + QJsonObject o; + o.insert("type", toJson(type)); + o.insert("state_key", toJson(stateKey)); + o.insert("content", toJson(content)); + + return o; +} +namespace QMatrixClient +{ + template <> struct FromJson + { + CreateRoomJob::StateEvent operator()(QJsonValue jv) + { + QJsonObject o = jv.toObject(); + CreateRoomJob::StateEvent result; + result.type = + fromJson(o.value("type")); + result.stateKey = + fromJson(o.value("state_key")); + result.content = + fromJson(o.value("content")); + + return result; + } + }; +} // namespace QMatrixClient + +class CreateRoomJob::Private +{ + public: + QString roomId; +}; + +CreateRoomJob::CreateRoomJob(const QString& visibility, const QString& roomAliasName, const QString& name, const QString& topic, const QVector& invite, const QVector& invite3pid, const QJsonObject& creationContent, const QVector& initialState, const QString& preset, bool isDirect) + : BaseJob(HttpVerb::Post, "CreateRoomJob", + basePath % "/createRoom") + , d(new Private) +{ + QJsonObject _data; + if (!visibility.isEmpty()) + _data.insert("visibility", toJson(visibility)); + if (!roomAliasName.isEmpty()) + _data.insert("room_alias_name", toJson(roomAliasName)); + if (!name.isEmpty()) + _data.insert("name", toJson(name)); + if (!topic.isEmpty()) + _data.insert("topic", toJson(topic)); + _data.insert("invite", toJson(invite)); + _data.insert("invite_3pid", toJson(invite3pid)); + _data.insert("creation_content", toJson(creationContent)); + _data.insert("initial_state", toJson(initialState)); + if (!preset.isEmpty()) + _data.insert("preset", toJson(preset)); + _data.insert("is_direct", toJson(isDirect)); + setRequestData(_data); +} + +CreateRoomJob::~CreateRoomJob() = default; + +const QString& CreateRoomJob::roomId() const +{ + return d->roomId; +} + +BaseJob::Status CreateRoomJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->roomId = fromJson(json.value("room_id")); + return Success; +} + diff --git a/jobs/generated/create_room.h b/jobs/generated/create_room.h new file mode 100644 index 00000000..a92cb106 --- /dev/null +++ b/jobs/generated/create_room.h @@ -0,0 +1,56 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include +#include +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class CreateRoomJob : public BaseJob + { + public: + // Inner data structures + + struct Invite3pid + { + QString idServer; + QString medium; + QString address; + + operator QJsonObject() const; + }; + + struct StateEvent + { + QString type; + QString stateKey; + QJsonObject content; + + operator QJsonObject() const; + }; + + // End of inner data structures + + explicit CreateRoomJob(const QString& visibility = {}, const QString& roomAliasName = {}, const QString& name = {}, const QString& topic = {}, const QVector& invite = {}, const QVector& invite3pid = {}, const QJsonObject& creationContent = {}, const QVector& initialState = {}, const QString& preset = {}, bool isDirect = {}); + ~CreateRoomJob() override; + + const QString& roomId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient -- cgit v1.2.3 From a568ea9a2a6b5ffb4b47520bbacb71943d8f8174 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 5 Jan 2018 11:17:13 +0900 Subject: MediaThumbnailJob: Rewire to GetContentThumbnailJob; decommission ThumbnailType "crop" thumbnail type didn't seem to be ever used. Once GTAD is able to generate enums, the respective code will show up in GetContentThumbnailJob and this parameter can be reintroduced in MediaThumbnailJob. As of now, just rely on the default "scale" value. --- jobs/mediathumbnailjob.cpp | 20 +++++--------------- jobs/mediathumbnailjob.h | 9 +++------ 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/jobs/mediathumbnailjob.cpp b/jobs/mediathumbnailjob.cpp index 9337549e..d768d253 100644 --- a/jobs/mediathumbnailjob.cpp +++ b/jobs/mediathumbnailjob.cpp @@ -18,22 +18,11 @@ #include "mediathumbnailjob.h" -#include -#include - using namespace QMatrixClient; -MediaThumbnailJob::MediaThumbnailJob(QUrl url, QSize requestedSize, - ThumbnailType thumbnailType) - : BaseJob(HttpVerb::Get, "MediaThumbnailJob", - QStringLiteral("/_matrix/media/v1/thumbnail/%1%2") - .arg(url.host(), url.path()), - Query( - { { "width", QString::number(requestedSize.width()) } - , { "height", QString::number(requestedSize.height()) } - , { "method", - thumbnailType == ThumbnailType::Scale ? "scale" : "crop" } - })) +MediaThumbnailJob::MediaThumbnailJob(QUrl url, QSize requestedSize) + : GetContentThumbnailJob(url.host(), url.path().mid(1), + requestedSize.width(), requestedSize.height()) { } QImage MediaThumbnailJob::thumbnail() const @@ -49,7 +38,8 @@ QImage MediaThumbnailJob::scaledThumbnail(QSize toSize) const BaseJob::Status MediaThumbnailJob::parseReply(QNetworkReply* reply) { - if( !_thumbnail.loadFromData(reply->readAll()) ) + GetContentThumbnailJob::parseReply(reply); + if( !_thumbnail.loadFromData(content()) ) { qCDebug(JOBS) << "MediaThumbnailJob: could not read image data"; } diff --git a/jobs/mediathumbnailjob.h b/jobs/mediathumbnailjob.h index 2d6853c7..66960b75 100644 --- a/jobs/mediathumbnailjob.h +++ b/jobs/mediathumbnailjob.h @@ -18,19 +18,16 @@ #pragma once -#include "basejob.h" +#include "generated/content-repo.h" #include namespace QMatrixClient { - enum class ThumbnailType {Crop, Scale}; - - class MediaThumbnailJob: public BaseJob + class MediaThumbnailJob: public GetContentThumbnailJob { public: - MediaThumbnailJob(QUrl url, QSize requestedSize, - ThumbnailType thumbnailType = ThumbnailType::Scale); + MediaThumbnailJob(QUrl url, QSize requestedSize); QImage thumbnail() const; QImage scaledThumbnail(QSize toSize) const; -- cgit v1.2.3 From 93cb0e5897cc94d8cc691bbe62f5b0093dd0a00f Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 9 Jan 2018 10:57:03 +0900 Subject: Job template: Use QIODevice instead of QByteArray to store byte streams This allows smooth pipelining of files to and from the network. --- jobs/gtad.yaml | 17 +++++++---------- jobs/{{base}}.cpp.mustache | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml index 54f70cdb..f79ce9b6 100644 --- a/jobs/gtad.yaml +++ b/jobs/gtad.yaml @@ -27,12 +27,12 @@ types: - //: double boolean: bool string: - - byte: &QByteArray - type: QByteArray - initializer: '"{{defaultValue}}"' - string?: true - imports: - - binary: *QByteArray + - byte: &ByteStream + type: QIODevice* + #initializer: '"{{defaultValue}}"' + #string?: true + imports: + - binary: *ByteStream - date: type: QDate initializer: QDate::fromString("{{defaultValue}}") @@ -48,10 +48,7 @@ types: initializer: QStringLiteral("{{defaultValue}}") string?: true avoidCopy?: true - imports: - file: - type: QByteArray - imports: + file: *ByteStream object: type: QJsonObject avoidCopy?: true diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index 0726d523..34e7faf3 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -88,7 +88,7 @@ class {{camelCaseOperationId}}Job::Private BaseJob::Status {{camelCaseOperationId}}Job::parseReply(QNetworkReply* reply) { {{#headers}}d->{{paramName}} = reply->rawHeader("{{baseName}}"); {{! We don't check for required headers yet }} - {{/headers}}{{#properties}}d->{{paramName}} = reply->readAll();{{/properties}} + {{/headers}}{{#properties}}d->{{paramName}} = reply;{{/properties}} return Success; }{{/ producesNotJson?}}{{^producesNotJson?}} BaseJob::Status {{camelCaseOperationId}}Job::parseJson(const QJsonDocument& data) -- cgit v1.2.3 From 0199c963de5a46a6526389829e210f5c68226911 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 12 Jan 2018 22:01:26 +0900 Subject: BaseJob::Data -> RequestData; support QIODevice* input/output --- CMakeLists.txt | 1 + jobs/basejob.cpp | 15 +++++------ jobs/basejob.h | 39 ++++++--------------------- jobs/generated/content-repo.cpp | 20 +++++++------- jobs/generated/content-repo.h | 11 ++++---- jobs/mediathumbnailjob.cpp | 13 ++++++--- jobs/mediathumbnailjob.h | 4 ++- jobs/requestdata.cpp | 38 ++++++++++++++++++++++++++ jobs/requestdata.h | 59 +++++++++++++++++++++++++++++++++++++++++ libqmatrixclient.pri | 2 ++ 10 files changed, 143 insertions(+), 59 deletions(-) create mode 100644 jobs/requestdata.cpp create mode 100644 jobs/requestdata.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 827497db..533d604f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,7 @@ set(libqmatrixclient_SRCS events/roomavatarevent.cpp events/typingevent.cpp events/receiptevent.cpp + jobs/requestdata.cpp jobs/basejob.cpp jobs/checkauthmethods.cpp jobs/sendeventjob.cpp diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp index 1f079966..4e0879b0 100644 --- a/jobs/basejob.cpp +++ b/jobs/basejob.cpp @@ -45,7 +45,7 @@ class BaseJob::Private public: // Using an idiom from clang-tidy: // http://clang.llvm.org/extra/clang-tidy/checks/modernize-pass-by-value.html - Private(HttpVerb v, QString endpoint, QUrlQuery q, Data data, bool nt) + Private(HttpVerb v, QString endpoint, QUrlQuery q, Data&& data, bool nt) : verb(v), apiEndpoint(std::move(endpoint)) , requestQuery(std::move(q)), requestData(std::move(data)) , needsToken(nt) @@ -100,8 +100,8 @@ BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, bo { } BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, - const Query& query, const Data& data, bool needsToken) - : d(new Private(verb, endpoint, query, data, needsToken)) + const Query& query, Data&& data, bool needsToken) + : d(new Private(verb, endpoint, query, std::move(data), needsToken)) { setObjectName(name); setExpectedContentTypes({ "application/json" }); @@ -158,9 +158,9 @@ const BaseJob::Data& BaseJob::requestData() const return d->requestData; } -void BaseJob::setRequestData(const BaseJob::Data& data) +void BaseJob::setRequestData(Data&& data) { - d->requestData = data; + std::swap(d->requestData, data); } const QByteArrayList& BaseJob::expectedContentTypes() const @@ -205,10 +205,10 @@ void BaseJob::Private::sendRequest() reply.reset( connection->nam()->get(req) ); break; case HttpVerb::Post: - reply.reset( connection->nam()->post(req, requestData.serialize()) ); + reply.reset( connection->nam()->post(req, requestData.source()) ); break; case HttpVerb::Put: - reply.reset( connection->nam()->put(req, requestData.serialize()) ); + reply.reset( connection->nam()->put(req, requestData.source()) ); break; case HttpVerb::Delete: reply.reset( connection->nam()->deleteResource(req) ); @@ -446,4 +446,3 @@ void BaseJob::setLoggingCategory(LoggingCategory lcf) { d->logCat = lcf; } - diff --git a/jobs/basejob.h b/jobs/basejob.h index 1fe3a24d..4567bca7 100644 --- a/jobs/basejob.h +++ b/jobs/basejob.h @@ -18,13 +18,15 @@ #pragma once -#include "logging.h" +#include "../logging.h" +#include "requestdata.h" #include +#include + +// Any job that parses the response will need the below two. #include #include -#include -#include class QNetworkReply; class QSslError; @@ -76,33 +78,8 @@ namespace QMatrixClient setQueryItems(l); } }; - /** - * A simple wrapper that represents the request body. - * Provides a unified interface to dump an unstructured byte stream - * as well as JSON (and possibly other structures in the future) to - * a QByteArray consumed by QNetworkAccessManager request methods. - */ - class Data - { - public: - Data() = default; - Data(const QByteArray& a) : _payload(a) { } - Data(const QJsonObject& jo) - : _payload(fromJson(QJsonDocument(jo))) { } - Data(const QJsonArray& ja) - : _payload(fromJson(QJsonDocument(ja))) { } - QByteArray serialize() const - { - return _payload; - } - private: - static QByteArray fromJson(const QJsonDocument& jd) - { - return jd.toJson(QJsonDocument::Compact); - } - QByteArray _payload; - }; + using Data = RequestData; /** * This structure stores the status of a server call job. The status consists @@ -132,7 +109,7 @@ namespace QMatrixClient BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, bool needsToken = true); BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, - const Query& query, const Data& data = {}, + const Query& query, Data&& data = {}, bool needsToken = true); Status status() const; @@ -227,7 +204,7 @@ namespace QMatrixClient const QUrlQuery& query() const; void setRequestQuery(const QUrlQuery& query); const Data& requestData() const; - void setRequestData(const Data& data); + void setRequestData(Data&& data); const QByteArrayList& expectedContentTypes() const; void addExpectedContentType(const QByteArray& contentType); void setExpectedContentTypes(const QByteArrayList& contentTypes); diff --git a/jobs/generated/content-repo.cpp b/jobs/generated/content-repo.cpp index ec6683bb..93aa838c 100644 --- a/jobs/generated/content-repo.cpp +++ b/jobs/generated/content-repo.cpp @@ -19,7 +19,7 @@ class UploadContentJob::Private QString contentUri; }; -UploadContentJob::UploadContentJob(QByteArray content, const QString& filename, const QString& contentType) +UploadContentJob::UploadContentJob(QIODevice* content, const QString& filename, const QString& contentType) : BaseJob(HttpVerb::Post, "UploadContentJob", basePath % "/upload") , d(new Private) @@ -55,7 +55,7 @@ class GetContentJob::Private public: QString contentType; QString contentDisposition; - QByteArray content; + QIODevice* content; }; GetContentJob::GetContentJob(const QString& serverName, const QString& mediaId) @@ -78,7 +78,7 @@ const QString& GetContentJob::contentDisposition() const return d->contentDisposition; } -QByteArray GetContentJob::content() const +QIODevice* GetContentJob::content() const { return d->content; } @@ -87,7 +87,7 @@ BaseJob::Status GetContentJob::parseReply(QNetworkReply* reply) { d->contentType = reply->rawHeader("Content-Type"); d->contentDisposition = reply->rawHeader("Content-Disposition"); - d->content = reply->readAll(); + d->content = reply; return Success; } @@ -96,7 +96,7 @@ class GetContentOverrideNameJob::Private public: QString contentType; QString contentDisposition; - QByteArray content; + QIODevice* content; }; GetContentOverrideNameJob::GetContentOverrideNameJob(const QString& serverName, const QString& mediaId, const QString& fileName) @@ -119,7 +119,7 @@ const QString& GetContentOverrideNameJob::contentDisposition() const return d->contentDisposition; } -QByteArray GetContentOverrideNameJob::content() const +QIODevice* GetContentOverrideNameJob::content() const { return d->content; } @@ -128,7 +128,7 @@ BaseJob::Status GetContentOverrideNameJob::parseReply(QNetworkReply* reply) { d->contentType = reply->rawHeader("Content-Type"); d->contentDisposition = reply->rawHeader("Content-Disposition"); - d->content = reply->readAll(); + d->content = reply; return Success; } @@ -136,7 +136,7 @@ class GetContentThumbnailJob::Private { public: QString contentType; - QByteArray content; + QIODevice* content; }; GetContentThumbnailJob::GetContentThumbnailJob(const QString& serverName, const QString& mediaId, int width, int height, const QString& method) @@ -160,7 +160,7 @@ const QString& GetContentThumbnailJob::contentType() const return d->contentType; } -QByteArray GetContentThumbnailJob::content() const +QIODevice* GetContentThumbnailJob::content() const { return d->content; } @@ -168,7 +168,7 @@ QByteArray GetContentThumbnailJob::content() const BaseJob::Status GetContentThumbnailJob::parseReply(QNetworkReply* reply) { d->contentType = reply->rawHeader("Content-Type"); - d->content = reply->readAll(); + d->content = reply; return Success; } diff --git a/jobs/generated/content-repo.h b/jobs/generated/content-repo.h index 1d844651..0796322b 100644 --- a/jobs/generated/content-repo.h +++ b/jobs/generated/content-repo.h @@ -6,8 +6,7 @@ #include "../basejob.h" -#include -#include +#include namespace QMatrixClient @@ -17,7 +16,7 @@ namespace QMatrixClient class UploadContentJob : public BaseJob { public: - explicit UploadContentJob(QByteArray content, const QString& filename = {}, const QString& contentType = {}); + explicit UploadContentJob(QIODevice* content, const QString& filename = {}, const QString& contentType = {}); ~UploadContentJob() override; const QString& contentUri() const; @@ -38,7 +37,7 @@ namespace QMatrixClient const QString& contentType() const; const QString& contentDisposition() const; - QByteArray content() const; + QIODevice* content() const; protected: Status parseReply(QNetworkReply* reply) override; @@ -56,7 +55,7 @@ namespace QMatrixClient const QString& contentType() const; const QString& contentDisposition() const; - QByteArray content() const; + QIODevice* content() const; protected: Status parseReply(QNetworkReply* reply) override; @@ -73,7 +72,7 @@ namespace QMatrixClient ~GetContentThumbnailJob() override; const QString& contentType() const; - QByteArray content() const; + QIODevice* content() const; protected: Status parseReply(QNetworkReply* reply) override; diff --git a/jobs/mediathumbnailjob.cpp b/jobs/mediathumbnailjob.cpp index d768d253..ec82f57b 100644 --- a/jobs/mediathumbnailjob.cpp +++ b/jobs/mediathumbnailjob.cpp @@ -20,8 +20,15 @@ using namespace QMatrixClient; -MediaThumbnailJob::MediaThumbnailJob(QUrl url, QSize requestedSize) - : GetContentThumbnailJob(url.host(), url.path().mid(1), +MediaThumbnailJob::MediaThumbnailJob(const QString& serverName, + const QString& mediaId, QSize requestedSize) + : GetContentThumbnailJob(serverName, mediaId, + requestedSize.width(), requestedSize.height()) +{ } + +MediaThumbnailJob::MediaThumbnailJob(const QUrl& mxcUri, QSize requestedSize) + : GetContentThumbnailJob(mxcUri.authority(), + mxcUri.path().mid(1), // sans leading '/' requestedSize.width(), requestedSize.height()) { } @@ -39,7 +46,7 @@ QImage MediaThumbnailJob::scaledThumbnail(QSize toSize) const BaseJob::Status MediaThumbnailJob::parseReply(QNetworkReply* reply) { GetContentThumbnailJob::parseReply(reply); - if( !_thumbnail.loadFromData(content()) ) + if( !_thumbnail.loadFromData(content()->readAll()) ) { qCDebug(JOBS) << "MediaThumbnailJob: could not read image data"; } diff --git a/jobs/mediathumbnailjob.h b/jobs/mediathumbnailjob.h index 66960b75..ef834cd7 100644 --- a/jobs/mediathumbnailjob.h +++ b/jobs/mediathumbnailjob.h @@ -27,7 +27,9 @@ namespace QMatrixClient class MediaThumbnailJob: public GetContentThumbnailJob { public: - MediaThumbnailJob(QUrl url, QSize requestedSize); + MediaThumbnailJob(const QString& serverName, const QString& mediaId, + QSize requestedSize); + MediaThumbnailJob(const QUrl& mxcUri, QSize requestedSize); QImage thumbnail() const; QImage scaledThumbnail(QSize toSize) const; diff --git a/jobs/requestdata.cpp b/jobs/requestdata.cpp new file mode 100644 index 00000000..f5516c5f --- /dev/null +++ b/jobs/requestdata.cpp @@ -0,0 +1,38 @@ +#include "requestdata.h" + +#include +#include +#include +#include +#include + +using namespace QMatrixClient; + +std::unique_ptr fromData(const QByteArray& data) +{ + auto source = std::make_unique(); + source->open(QIODevice::WriteOnly); + source->write(data); + source->close(); + return source; +} + +template +inline std::unique_ptr fromJson(const JsonDataT& jdata) +{ + return fromData(QJsonDocument(jdata).toJson(QJsonDocument::Compact)); +} + +RequestData::RequestData(const QByteArray& a) + : _source(fromData(a)) +{ } + +RequestData::RequestData(const QJsonObject& jo) + : _source(fromJson(jo)) +{ } + +RequestData::RequestData(const QJsonArray& ja) + : _source(fromJson(ja)) +{ } + +RequestData::~RequestData() = default; diff --git a/jobs/requestdata.h b/jobs/requestdata.h new file mode 100644 index 00000000..aa03b744 --- /dev/null +++ b/jobs/requestdata.h @@ -0,0 +1,59 @@ +/****************************************************************************** + * Copyright (C) 2018 Kitsune Ral + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#pragma once + +#include + +class QByteArray; +class QJsonObject; +class QJsonArray; +class QJsonDocument; +class QIODevice; + +namespace QMatrixClient +{ + /** + * A simple wrapper that represents the request body. + * Provides a unified interface to dump an unstructured byte stream + * as well as JSON (and possibly other structures in the future) to + * a QByteArray consumed by QNetworkAccessManager request methods. + */ + class RequestData + { + public: + RequestData() = default; + RequestData(const QByteArray& a); + RequestData(const QJsonObject& jo); + RequestData(const QJsonArray& ja); + RequestData(QIODevice* source) + : _source(std::unique_ptr(source)) + { } + RequestData(RequestData&&) = default; + RequestData& operator=(RequestData&&) = default; + ~RequestData(); + + QIODevice* source() const + { + return _source.get(); + } + + private: + std::unique_ptr _source; + }; +} // namespace QMatrixClient diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri index 8ee3634c..db5de469 100644 --- a/libqmatrixclient.pri +++ b/libqmatrixclient.pri @@ -20,6 +20,7 @@ HEADERS += \ $$PWD/events/typingevent.h \ $$PWD/events/receiptevent.h \ $$PWD/events/redactionevent.h \ + $$PWD/jobs/requestdata.h \ $$PWD/jobs/basejob.h \ $$PWD/jobs/checkauthmethods.h \ $$PWD/jobs/passwordlogin.h \ @@ -49,6 +50,7 @@ SOURCES += \ $$PWD/events/typingevent.cpp \ $$PWD/events/receiptevent.cpp \ $$PWD/events/redactionevent.cpp \ + $$PWD/jobs/requestdata.cpp \ $$PWD/jobs/basejob.cpp \ $$PWD/jobs/checkauthmethods.cpp \ $$PWD/jobs/passwordlogin.cpp \ -- cgit v1.2.3 From a4509336ad07ef91771492830a0756af68d55962 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 12 Jan 2018 22:02:42 +0900 Subject: Drop extraneous #include --- jobs/generated/administrative_contact.h | 1 - jobs/generated/banning.h | 1 - jobs/generated/create_room.h | 3 +-- jobs/generated/directory.h | 1 - jobs/generated/inviting.h | 1 - jobs/generated/kicking.h | 1 - jobs/generated/leaving.h | 1 - jobs/generated/list_public_rooms.h | 1 - jobs/generated/login.h | 1 - jobs/generated/profile.h | 1 - jobs/generated/receipts.h | 1 - jobs/generated/redaction.h | 1 - jobs/generated/third_party_membership.h | 1 - jobs/generated/typing.h | 1 - jobs/generated/versions.h | 1 - jobs/generated/whoami.h | 1 - 16 files changed, 1 insertion(+), 17 deletions(-) diff --git a/jobs/generated/administrative_contact.h b/jobs/generated/administrative_contact.h index a5f04781..67563719 100644 --- a/jobs/generated/administrative_contact.h +++ b/jobs/generated/administrative_contact.h @@ -7,7 +7,6 @@ #include "../basejob.h" #include -#include #include "converters.h" diff --git a/jobs/generated/banning.h b/jobs/generated/banning.h index 930020a5..2d6fbd9b 100644 --- a/jobs/generated/banning.h +++ b/jobs/generated/banning.h @@ -6,7 +6,6 @@ #include "../basejob.h" -#include namespace QMatrixClient diff --git a/jobs/generated/create_room.h b/jobs/generated/create_room.h index a92cb106..13c9d2c0 100644 --- a/jobs/generated/create_room.h +++ b/jobs/generated/create_room.h @@ -6,9 +6,8 @@ #include "../basejob.h" -#include #include -#include +#include #include "converters.h" diff --git a/jobs/generated/directory.h b/jobs/generated/directory.h index 8290a2b5..eeda563b 100644 --- a/jobs/generated/directory.h +++ b/jobs/generated/directory.h @@ -7,7 +7,6 @@ #include "../basejob.h" #include -#include namespace QMatrixClient diff --git a/jobs/generated/inviting.h b/jobs/generated/inviting.h index 7ed49637..eaa884df 100644 --- a/jobs/generated/inviting.h +++ b/jobs/generated/inviting.h @@ -6,7 +6,6 @@ #include "../basejob.h" -#include namespace QMatrixClient diff --git a/jobs/generated/kicking.h b/jobs/generated/kicking.h index 84d88945..3814bef7 100644 --- a/jobs/generated/kicking.h +++ b/jobs/generated/kicking.h @@ -6,7 +6,6 @@ #include "../basejob.h" -#include namespace QMatrixClient diff --git a/jobs/generated/leaving.h b/jobs/generated/leaving.h index f006ce19..cd39b612 100644 --- a/jobs/generated/leaving.h +++ b/jobs/generated/leaving.h @@ -6,7 +6,6 @@ #include "../basejob.h" -#include namespace QMatrixClient diff --git a/jobs/generated/list_public_rooms.h b/jobs/generated/list_public_rooms.h index f6467a21..7dcb8cf7 100644 --- a/jobs/generated/list_public_rooms.h +++ b/jobs/generated/list_public_rooms.h @@ -7,7 +7,6 @@ #include "../basejob.h" #include -#include #include "converters.h" diff --git a/jobs/generated/login.h b/jobs/generated/login.h index 0f68a13b..3ac955d4 100644 --- a/jobs/generated/login.h +++ b/jobs/generated/login.h @@ -6,7 +6,6 @@ #include "../basejob.h" -#include namespace QMatrixClient diff --git a/jobs/generated/profile.h b/jobs/generated/profile.h index 9cbf3865..1e09791d 100644 --- a/jobs/generated/profile.h +++ b/jobs/generated/profile.h @@ -6,7 +6,6 @@ #include "../basejob.h" -#include namespace QMatrixClient diff --git a/jobs/generated/receipts.h b/jobs/generated/receipts.h index e4065ddb..9eb7a489 100644 --- a/jobs/generated/receipts.h +++ b/jobs/generated/receipts.h @@ -7,7 +7,6 @@ #include "../basejob.h" #include -#include namespace QMatrixClient diff --git a/jobs/generated/redaction.h b/jobs/generated/redaction.h index 0a68f8cd..e3b3ff4f 100644 --- a/jobs/generated/redaction.h +++ b/jobs/generated/redaction.h @@ -6,7 +6,6 @@ #include "../basejob.h" -#include namespace QMatrixClient diff --git a/jobs/generated/third_party_membership.h b/jobs/generated/third_party_membership.h index b1669795..c7b5214e 100644 --- a/jobs/generated/third_party_membership.h +++ b/jobs/generated/third_party_membership.h @@ -6,7 +6,6 @@ #include "../basejob.h" -#include namespace QMatrixClient diff --git a/jobs/generated/typing.h b/jobs/generated/typing.h index 6eb3ddf4..0495ed0a 100644 --- a/jobs/generated/typing.h +++ b/jobs/generated/typing.h @@ -6,7 +6,6 @@ #include "../basejob.h" -#include namespace QMatrixClient diff --git a/jobs/generated/versions.h b/jobs/generated/versions.h index a7add8ba..686d7069 100644 --- a/jobs/generated/versions.h +++ b/jobs/generated/versions.h @@ -6,7 +6,6 @@ #include "../basejob.h" -#include #include diff --git a/jobs/generated/whoami.h b/jobs/generated/whoami.h index 21cb1a17..8e1952da 100644 --- a/jobs/generated/whoami.h +++ b/jobs/generated/whoami.h @@ -6,7 +6,6 @@ #include "../basejob.h" -#include namespace QMatrixClient -- cgit v1.2.3 From 9e8e958b5d72b9671425b5bcd34fa016874b8677 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 12 Jan 2018 22:04:28 +0900 Subject: BaseJob: afterStart(), beforeAbandon(), up/downloadProgress() To support the upcoming DownloadFileJob --- jobs/basejob.cpp | 17 ++++++++++++++--- jobs/basejob.h | 6 ++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp index 4e0879b0..6f80bfd7 100644 --- a/jobs/basejob.cpp +++ b/jobs/basejob.cpp @@ -216,15 +216,21 @@ void BaseJob::Private::sendRequest() } } -void BaseJob::beforeStart(const ConnectionData* connData) -{ -} +void BaseJob::beforeStart(const ConnectionData*) +{ } + +void BaseJob::afterStart(const ConnectionData*, QNetworkReply*) +{ } + +void BaseJob::beforeAbandon(QNetworkReply*) +{ } void BaseJob::start(const ConnectionData* connData) { d->connection = connData; beforeStart(connData); sendRequest(); + afterStart(connData, d->reply.data()); } void BaseJob::sendRequest() @@ -238,6 +244,10 @@ void BaseJob::sendRequest() connect( d->reply.data(), &QNetworkReply::finished, this, &BaseJob::gotReply ); if (d->reply->isRunning()) { + connect( d->reply.data(), &QNetworkReply::uploadProgress, + this, &BaseJob::uploadProgress); + connect( d->reply.data(), &QNetworkReply::downloadProgress, + this, &BaseJob::downloadProgress); d->timer.start(getCurrentTimeout()); qCDebug(d->logCat) << this << "request has been sent"; emit started(); @@ -430,6 +440,7 @@ void BaseJob::setStatus(int code, QString message) void BaseJob::abandon() { + beforeAbandon(d->reply.data()); this->disconnect(); if (d->reply) d->reply->disconnect(this); diff --git a/jobs/basejob.h b/jobs/basejob.h index 4567bca7..5e2734b1 100644 --- a/jobs/basejob.h +++ b/jobs/basejob.h @@ -192,6 +192,9 @@ namespace QMatrixClient */ void failure(BaseJob*); + void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); + void uploadProgress(qint64 bytesSent, qint64 bytesTotal); + protected: using headers_t = QHash; @@ -210,6 +213,9 @@ namespace QMatrixClient void setExpectedContentTypes(const QByteArrayList& contentTypes); virtual void beforeStart(const ConnectionData* connData); + virtual void afterStart(const ConnectionData* connData, + QNetworkReply* reply); + virtual void beforeAbandon(QNetworkReply*); /** * Used by gotReply() to check the received reply for general -- cgit v1.2.3 From 24b60a9693d032cc30ce75803730e4727b418087 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 12 Jan 2018 22:07:33 +0900 Subject: DownloadFileJob Instead of exposing a QIODevice as GetContentJob does it gets a filename and saves the incoming payload into it. --- CMakeLists.txt | 1 + jobs/downloadfilejob.cpp | 113 +++++++++++++++++++++++++++++++++++++++++++++++ jobs/downloadfilejob.h | 27 +++++++++++ libqmatrixclient.pri | 6 ++- 4 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 jobs/downloadfilejob.cpp create mode 100644 jobs/downloadfilejob.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 533d604f..c0ffc0b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,6 +74,7 @@ set(libqmatrixclient_SRCS jobs/roommessagesjob.cpp jobs/syncjob.cpp jobs/mediathumbnailjob.cpp + jobs/downloadfilejob.cpp ) set(API_DEF_PATH ${MATRIX_DOC_PATH}/api/client-server/) diff --git a/jobs/downloadfilejob.cpp b/jobs/downloadfilejob.cpp new file mode 100644 index 00000000..2530e259 --- /dev/null +++ b/jobs/downloadfilejob.cpp @@ -0,0 +1,113 @@ +#include "downloadfilejob.h" + +#include +#include +#include + +using namespace QMatrixClient; + +class DownloadFileJob::Private +{ + public: + Private() : tempFile(new QTemporaryFile()) { } + + explicit Private(const QString& localFilename) + : targetFile(new QFile(localFilename)) + , tempFile(new QFile(targetFile->fileName() + ".qmcdownload")) + { } + + QScopedPointer targetFile; + QScopedPointer tempFile; +}; + +DownloadFileJob::DownloadFileJob(const QString& serverName, + const QString& mediaId, + const QString& localFilename) + : GetContentJob(serverName, mediaId) + , d(localFilename.isEmpty() ? new Private : new Private(localFilename)) +{ + setObjectName("DownloadFileJob"); +} + +QString DownloadFileJob::targetFileName() const +{ + return (d->targetFile ? d->targetFile : d->tempFile)->fileName(); +} + +void DownloadFileJob::beforeStart(const ConnectionData*) +{ + if (d->targetFile && !d->targetFile->open(QIODevice::WriteOnly)) + { + qCWarning(JOBS) << "Couldn't open the file" + << d->targetFile->fileName() << "for writing"; + setStatus(FileError, "Could not open the target file for writing"); + return; + } + if (!d->tempFile->open(QIODevice::WriteOnly)) + { + qCWarning(JOBS) << "Couldn't open the temporary file" + << d->tempFile->fileName() << "for writing"; + setStatus(FileError, "Could not open the temporary download file"); + } + qCDebug(JOBS) << "Downloading to" << d->tempFile->fileName(); +} + +void DownloadFileJob::afterStart(const ConnectionData*, QNetworkReply* reply) +{ + connect(reply, &QNetworkReply::metaDataChanged, this, [this,reply] { + auto sizeHeader = reply->header(QNetworkRequest::ContentLengthHeader); + if (sizeHeader.isValid()) + { + auto targetSize = sizeHeader.value(); + if (targetSize != -1) + if (!d->tempFile->resize(targetSize)) + { + qCWarning(JOBS) << "Failed to allocate" << targetSize + << "bytes for" << d->tempFile->fileName(); + setStatus(FileError, + "Could not reserve disk space for download"); + } + } + }); + connect(reply, &QIODevice::readyRead, this, [this,reply] { + auto bytes = reply->read(reply->bytesAvailable()); + if (bytes.isEmpty()) + { + qCWarning(JOBS) + << "Unexpected empty chunk when downloading from" + << reply->url() << "to" << d->tempFile->fileName(); + } else { + d->tempFile->write(bytes); + } + }); +} + +void DownloadFileJob::beforeAbandon(QNetworkReply*) +{ + if (d->targetFile) + d->targetFile->remove(); + d->tempFile->remove(); +} + +BaseJob::Status DownloadFileJob::parseReply(QNetworkReply*) +{ + if (d->targetFile) + { + d->targetFile->close(); + if (!d->targetFile->remove()) + { + qCWarning(JOBS) << "Failed to remove the target file placeholder"; + return { FileError, "Couldn't finalise the download" }; + } + if (!d->tempFile->rename(d->targetFile->fileName())) + { + qCWarning(JOBS) << "Failed to rename" << d->tempFile->fileName() + << "to" << d->targetFile->fileName(); + return { FileError, "Couldn't finalise the download" }; + } + } + else + d->tempFile->close(); + qCDebug(JOBS) << "Saved a file as" << targetFileName(); + return Success; +} diff --git a/jobs/downloadfilejob.h b/jobs/downloadfilejob.h new file mode 100644 index 00000000..d798506c --- /dev/null +++ b/jobs/downloadfilejob.h @@ -0,0 +1,27 @@ +#pragma once + +#include "generated/content-repo.h" + +namespace QMatrixClient +{ + class DownloadFileJob : public GetContentJob + { + public: + enum { FileError = BaseJob::UserDefinedError + 1 }; + + DownloadFileJob(const QString& serverName, const QString& mediaId, + const QString& localFilename = {}); + + QString targetFileName() const; + + private: + class Private; + QScopedPointer d; + + void beforeStart(const ConnectionData*) override; + void afterStart(const ConnectionData*, + QNetworkReply* reply) override; + void beforeAbandon(QNetworkReply*) override; + Status parseReply(QNetworkReply*) override; + }; +} diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri index db5de469..9e4cb279 100644 --- a/libqmatrixclient.pri +++ b/libqmatrixclient.pri @@ -35,7 +35,8 @@ HEADERS += \ $$PWD/logging.h \ $$PWD/settings.h \ $$PWD/networksettings.h \ - $$PWD/networkaccessmanager.h + $$PWD/networkaccessmanager.h \ + $$PWD/jobs/downloadfilejob.h SOURCES += \ $$PWD/connectiondata.cpp \ @@ -65,4 +66,5 @@ SOURCES += \ $$PWD/logging.cpp \ $$PWD/settings.cpp \ $$PWD/networksettings.cpp \ - $$PWD/networkaccessmanager.cpp + $$PWD/networkaccessmanager.cpp \ + $$PWD/jobs/downloadfilejob.cpp -- cgit v1.2.3 From 6d77401c5bf1d67d1660c0661c695ed241fdf58a Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 12 Jan 2018 23:22:49 +0900 Subject: Connection::getThumbnail: Add an overload for QString Connection::getThumbnail(QString,...) is better fitting to retrieve images for QML image providers - one doesn't need to create a QUrl (which if made naively ends up being incorrect) and also doesn't need to stack up "mxc://" before the mediaId. Just call Connection::getThumbnail with the id the QML engine gives you. --- connection.cpp | 17 ++++++++++++++++- connection.h | 5 +++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/connection.cpp b/connection.cpp index 85d310cc..e7646b82 100644 --- a/connection.cpp +++ b/connection.cpp @@ -297,9 +297,24 @@ RoomMessagesJob* Connection::getMessages(Room* room, const QString& from) const return callApi(room->id(), from); } +inline auto splitMediaId(const QString& mediaId) +{ + auto idParts = mediaId.split('/'); + Q_ASSERT_X(idParts.size() == 2, __FUNCTION__, + "mediaId should have a form 'serverName/localMediaId' (without apostrophes)"); + return idParts; +} + +MediaThumbnailJob* Connection::getThumbnail(const QString& mediaId, QSize requestedSize) const +{ + auto idParts = splitMediaId(mediaId); + return callApi(idParts.front(), idParts.back(), + requestedSize); +} + MediaThumbnailJob* Connection::getThumbnail(const QUrl& url, QSize requestedSize) const { - return callApi(url, requestedSize); + return getThumbnail(url.authority() + url.path(), requestedSize); } MediaThumbnailJob* Connection::getThumbnail(const QUrl& url, int requestedWidth, diff --git a/connection.h b/connection.h index 8dda2bbf..1d483fe8 100644 --- a/connection.h +++ b/connection.h @@ -174,8 +174,10 @@ namespace QMatrixClient void sync(int timeout = -1); void stopSync(); - virtual MediaThumbnailJob* getThumbnail(const QUrl& url, + virtual MediaThumbnailJob* getThumbnail(const QString& mediaId, QSize requestedSize) const; + MediaThumbnailJob* getThumbnail(const QUrl& url, + QSize requestedSize) const; MediaThumbnailJob* getThumbnail(const QUrl& url, int requestedWidth, int requestedHeight) const; @@ -297,7 +299,6 @@ namespace QMatrixClient */ Room* provideRoom(const QString& roomId, JoinState joinState); - /** * Completes loading sync data. */ -- cgit v1.2.3 From f80065013935a0b32acafd4d96dda271441436fe Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 12 Jan 2018 23:31:46 +0900 Subject: Connection: files up/downloading support --- connection.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++ connection.h | 15 +++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/connection.cpp b/connection.cpp index e7646b82..935546b1 100644 --- a/connection.cpp +++ b/connection.cpp @@ -29,6 +29,7 @@ #include "jobs/roommessagesjob.h" #include "jobs/syncjob.h" #include "jobs/mediathumbnailjob.h" +#include "jobs/downloadfilejob.h" #include #include @@ -323,6 +324,47 @@ MediaThumbnailJob* Connection::getThumbnail(const QUrl& url, int requestedWidth, return getThumbnail(url, QSize(requestedWidth, requestedHeight)); } +UploadContentJob* Connection::uploadContent(QIODevice* contentSource, + const QString& filename, const QString& contentType) const +{ + return callApi(contentSource, filename, contentType); +} + +UploadContentJob* Connection::uploadFile(const QString& fileName, + const QString& contentType) +{ + auto sourceFile = new QFile(fileName); + if (sourceFile->open(QIODevice::ReadOnly)) + { + qCWarning(MAIN) << "Couldn't open" << sourceFile->fileName() + << "for reading"; + return nullptr; + } + return uploadContent(sourceFile, QFileInfo(*sourceFile).fileName(), + contentType); +} + +GetContentJob* Connection::getContent(const QString& mediaId) const +{ + auto idParts = splitMediaId(mediaId); + return callApi(idParts.front(), idParts.back()); +} + +GetContentJob* Connection::getContent(const QUrl& url) const +{ + return getContent(url.authority() + url.path()); +} + +DownloadFileJob* Connection::downloadFile(const QUrl& url, + const QString& localFilename) const +{ + auto mediaId = url.authority() + url.path(); + auto idParts = splitMediaId(mediaId); + auto* job = callApi(idParts.front(), idParts.back(), + localFilename); + return job; +} + ForgetRoomJob* Connection::forgetRoom(const QString& id) { // To forget is hard :) First we should ensure the local user is not diff --git a/connection.h b/connection.h index 1d483fe8..79d7d658 100644 --- a/connection.h +++ b/connection.h @@ -41,6 +41,9 @@ namespace QMatrixClient class PostReceiptJob; class MediaThumbnailJob; class JoinRoomJob; + class UploadContentJob; + class GetContentJob; + class DownloadFileJob; class Connection: public QObject { Q_OBJECT @@ -182,6 +185,18 @@ namespace QMatrixClient int requestedWidth, int requestedHeight) const; + // QIODevice* should already be open + virtual UploadContentJob* uploadContent(QIODevice* contentSource, + const QString& filename = {}, + const QString& contentType = {}) const; + virtual UploadContentJob* uploadFile(const QString& fileName, + const QString& contentType = {}); + virtual GetContentJob* getContent(const QString& mediaId) const; + GetContentJob* getContent(const QUrl& url) const; + // If localFilename is empty, a temporary file will be created + virtual DownloadFileJob* downloadFile(const QUrl& url, + const QString& localFilename = {}) const; + virtual JoinRoomJob* joinRoom(const QString& roomAlias); // Old API that will be abolished any time soon. DO NOT USE. -- cgit v1.2.3 From 8f4a940d70cdcfc34a2ffe2d9a9561c0d821c56e Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 12 Jan 2018 23:47:08 +0900 Subject: User: Q_PROPERTYs; setAvatar() --- user.cpp | 46 +++++++++++++++++++++++++++++++++++++++++----- user.h | 25 ++++++++++++++++--------- 2 files changed, 57 insertions(+), 14 deletions(-) diff --git a/user.cpp b/user.cpp index 6d2a2030..baa7bc45 100644 --- a/user.cpp +++ b/user.cpp @@ -23,9 +23,11 @@ #include "events/event.h" #include "events/roommemberevent.h" #include "jobs/generated/profile.h" +#include "jobs/generated/content-repo.h" #include #include +#include using namespace QMatrixClient; @@ -42,6 +44,9 @@ class User::Private QString bridged; Connection* connection; Avatar avatar; + QPointer avatarUploadJob = nullptr; + + void setAvatar(UploadContentJob* job, User* q); }; User::User(QString userId, Connection* connection) @@ -66,19 +71,51 @@ QString User::name() const void User::updateName(const QString& newName) { const auto oldName = name(); - if (d->name != newName) + if (oldName != newName) { d->name = newName; - emit nameChanged(this, oldName); + emit nameChanged(newName, oldName); } } +void User::updateAvatarUrl(const QUrl& newUrl) +{ + if (d->avatar.updateUrl(newUrl)) + emit avatarChanged(this); +} + void User::rename(const QString& newName) { auto job = d->connection->callApi(id(), newName); connect(job, &BaseJob::success, this, [=] { updateName(newName); }); } +bool User::setAvatar(const QString& fileName) +{ + if (isJobRunning(d->avatarUploadJob)) + return false; + d->setAvatar(d->connection->uploadFile(fileName), this); + return true; +} + +bool User::setAvatar(QIODevice* source) +{ + if (isJobRunning(d->avatarUploadJob) || !source->isReadable()) + return false; + d->setAvatar(d->connection->uploadContent(source), this); + return true; +} + +void User::Private::setAvatar(UploadContentJob* job, User* q) +{ + avatarUploadJob = job; + connect(job, &BaseJob::success, q, [this,q] { + auto* j = connection->callApi( + userId, avatarUploadJob->contentUri()); + connect(j, &BaseJob::success, q, [q] { emit q->avatarChanged(q); }); + }); +} + QString User::displayname() const { if( !d->name.isEmpty() ) @@ -90,7 +127,7 @@ QString User::bridged() const { return d->bridged; } -Avatar& User::avatarObject() +const Avatar& User::avatarObject() { return d->avatar; } @@ -127,7 +164,6 @@ void User::processEvent(Event* event) newName.truncate(match.capturedStart(0)); } updateName(newName); - if (d->avatar.updateUrl(e->avatarUrl())) - emit avatarChanged(this); + updateAvatarUrl(e->avatarUrl()); } } diff --git a/user.h b/user.h index b7d67fb2..91dfdc09 100644 --- a/user.h +++ b/user.h @@ -29,6 +29,10 @@ namespace QMatrixClient class User: public QObject { Q_OBJECT + Q_PROPERTY(QString id READ id CONSTANT) + Q_PROPERTY(QString name READ name NOTIFY nameChanged) + Q_PROPERTY(QString displayName READ displayname NOTIFY nameChanged STORED false) + Q_PROPERTY(QString bridgeName READ bridged NOTIFY nameChanged STORED false) public: User(QString userId, Connection* connection); ~User() override; @@ -36,40 +40,43 @@ namespace QMatrixClient /** * Returns the id of the user */ - Q_INVOKABLE QString id() const; + QString id() const; /** * Returns the name chosen by the user */ - Q_INVOKABLE QString name() const; + QString name() const; /** * Returns the name that should be used to display the user. */ - Q_INVOKABLE QString displayname() const; + QString displayname() const; /** * Returns the name of bridge the user is connected from or empty. */ - Q_INVOKABLE QString bridged() const; + QString bridged() const; - Avatar& avatarObject(); - QImage avatar(int dimension); - QImage avatar(int requestedWidth, int requestedHeight); + const Avatar& avatarObject(); + Q_INVOKABLE QImage avatar(int dimension); + Q_INVOKABLE QImage avatar(int requestedWidth, int requestedHeight); - QUrl avatarUrl() const; + Q_INVOKABLE QUrl avatarUrl() const; void processEvent(Event* event); public slots: void rename(const QString& newName); + bool setAvatar(const QString& fileName); + bool setAvatar(QIODevice* source); signals: - void nameChanged(User*, QString); + void nameChanged(QString newName, QString oldName); void avatarChanged(User* user); private slots: void updateName(const QString& newName); + void updateAvatarUrl(const QUrl& newUrl); private: class Private; -- cgit v1.2.3 From 32d2673ff6268ad00c2b80912e7675673480096c Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 13 Jan 2018 19:42:37 +0900 Subject: Refactor EventContent; allow to easily check files out of message events The whole inheritance/templating structure has been considerably simplified by using a trick with mixin classes; thanks to that, *Info classes are no more templated, they are just mixed together by the almighty UrlBasedContent<> template (but the same can easily be done outside of it, as LocationContent implementation shows). RoomMessageEvent has gained hasFileContent(); it's also possible to easily get a FileInfo core object just by calling msgEvent->content()->fileInfo(). --- events/eventcontent.cpp | 51 ++++++++--- events/eventcontent.h | 212 ++++++++++++++++++++------------------------ events/roommessageevent.cpp | 43 +++++---- events/roommessageevent.h | 34 +++---- 4 files changed, 175 insertions(+), 165 deletions(-) diff --git a/events/eventcontent.cpp b/events/eventcontent.cpp index dcbccf08..271669e2 100644 --- a/events/eventcontent.cpp +++ b/events/eventcontent.cpp @@ -30,27 +30,21 @@ QJsonObject Base::toJson() const return o; } -QJsonObject InfoBase::toInfoJson() const -{ - QJsonObject info; - fillInfoJson(&info); - return info; -} - -void InfoBase::fillInfoJson(QJsonObject*) const { } - FileInfo::FileInfo(const QUrl& u, int payloadSize, const QMimeType& mimeType, const QString& originalFilename) - : InfoBase(mimeType), url(u), payloadSize(payloadSize) + : mimeType(mimeType), url(u), payloadSize(payloadSize) , originalName(originalFilename) { } FileInfo::FileInfo(const QUrl& u, const QJsonObject& infoJson, const QString& originalFilename) - : FileInfo(u, infoJson["size"].toInt(), - QMimeDatabase().mimeTypeForName(infoJson["mimetype"].toString()), - originalFilename) + : originalInfoJson(infoJson) + , mimeType(QMimeDatabase().mimeTypeForName(infoJson["mimetype"].toString())) + , url(u) + , payloadSize(infoJson["size"].toInt()) + , originalName(originalFilename) { + originalInfoJson.insert("mediaId", url.authority() + url.path()); if (!mimeType.isValid()) mimeType = QMimeDatabase().mimeTypeForData(QByteArray()); } @@ -61,3 +55,34 @@ void FileInfo::fillInfoJson(QJsonObject* infoJson) const infoJson->insert("size", payloadSize); infoJson->insert("mimetype", mimeType.name()); } + +ImageInfo::ImageInfo(const QUrl& u, int fileSize, QMimeType mimeType, + const QSize& imageSize) + : FileInfo(u, fileSize, mimeType), imageSize(imageSize) +{ } + +ImageInfo::ImageInfo(const QUrl& u, const QJsonObject& infoJson, + const QString& originalFilename) + : FileInfo(u, infoJson, originalFilename) + , imageSize(infoJson["w"].toInt(), infoJson["h"].toInt()) +{ } + +void ImageInfo::fillInfoJson(QJsonObject* infoJson) const +{ + FileInfo::fillInfoJson(infoJson); + infoJson->insert("w", imageSize.width()); + infoJson->insert("h", imageSize.height()); +} + +WithThumbnail::WithThumbnail(const QJsonObject& infoJson) + : thumbnail(infoJson["thumbnail_url"].toString(), + infoJson["thumbnail_info"].toObject()) +{ } + +void WithThumbnail::fillInfoJson(QJsonObject* infoJson) const +{ + infoJson->insert("thumbnail_url", thumbnail.url.toString()); + QJsonObject thumbnailInfoJson; + thumbnail.fillInfoJson(&thumbnailInfoJson); + infoJson->insert("thumbnail_info", thumbnailInfoJson); +} diff --git a/events/eventcontent.h b/events/eventcontent.h index 60437995..b37dc923 100644 --- a/events/eventcontent.h +++ b/events/eventcontent.h @@ -23,7 +23,6 @@ #include "converters.h" -#include #include #include #include @@ -40,28 +39,23 @@ namespace QMatrixClient * a QJsonObject and override fillJson() with an implementation * that will fill the target QJsonObject with stored values. It is * assumed but not required that a content object can also be created - * from plain data. fillJson() should only fill the main JSON object - * but not the "info" subobject if it exists for a certain content type; - * use \p InfoBase to de/serialize "info" parts with an optional URL - * on the top level. + * from plain data. */ class Base { public: + explicit Base (const QJsonObject& o = {}) : originalJson(o) { } virtual ~Base() = default; QJsonObject toJson() const; + public: + QJsonObject originalJson; + protected: virtual void fillJson(QJsonObject* o) const = 0; }; - class TypedBase: public Base - { - public: - virtual QMimeType type() const = 0; - }; - template class SimpleContent: public Base { @@ -74,10 +68,12 @@ namespace QMatrixClient : value(std::forward(value)), key(std::move(keyName)) { } SimpleContent(const QJsonObject& json, QString keyName) - : value(QMatrixClient::fromJson(json[keyName])) + : Base(json) + , value(QMatrixClient::fromJson(json[keyName])) , key(std::move(keyName)) { } + public: T value; protected: @@ -91,44 +87,36 @@ namespace QMatrixClient } }; - /** - * A base class for content types that have an "info" object in their - * JSON representation - * - * These include most multimedia types currently in the CS API spec. - * Derived classes should override fillInfoJson() to fill the "info" - * subobject, BUT NOT the main JSON object. Most but not all "info" - * classes (specifically, those deriving from FileInfo) should also - * have a constructor that accepts two parameters, QUrl and QJsonObject, - * in order to load the URL+info part from JSON. - */ - class InfoBase - { - public: - virtual ~InfoBase() = default; - - QJsonObject toInfoJson() const; - - QMimeType mimeType; - - protected: - InfoBase() = default; - explicit InfoBase(const QMimeType& type) : mimeType(type) { } - - virtual void fillInfoJson(QJsonObject* /*infoJson*/) const = 0; - }; - // The below structures fairly follow CS spec 11.2.1.6. The overall // set of attributes for each content types is a superset of the spec // but specific aggregation structure is altered. See doc comments to // each type for the list of available attributes. + // A quick classes inheritance structure follows: + // FileInfo + // FileContent : UrlBasedContent + // AudioContent : UrlBasedContent + // ImageInfo : FileInfo + imageSize attribute + // ImageContent : UrlBasedContent + // VideoContent : UrlBasedContent + /** - * Base class for content types that consist of a URL along with - * additional information. Most of message types except textual fall - * under this category. + * A base/mixin class for structures representing an "info" object for + * some content types. These include most attachment types currently in + * the CS API spec. + * + * In order to use it in a content class, derive both from TypedBase + * (or Base) and from FileInfo (or its derivative, such as \p ImageInfo) + * and call fillInfoJson() to fill the "info" subobject. Make sure + * to pass an "info" part of JSON to FileInfo constructor, not the whole + * JSON content, as well as contents of "url" (or a similar key) and + * optionally "filename" node from the main JSON content. Assuming you + * don't do unusual things, you should use \p UrlBasedContent<> instead + * of doing multiple inheritance and overriding Base::fillJson() by hand. + * + * This class is not polymorphic. */ - class FileInfo: public InfoBase + class FileInfo { public: explicit FileInfo(const QUrl& u, int payloadSize = -1, @@ -137,111 +125,101 @@ namespace QMatrixClient FileInfo(const QUrl& u, const QJsonObject& infoJson, const QString& originalFilename = {}); + void fillInfoJson(QJsonObject* infoJson) const; + + /** + * \brief Extract media id from the URL + * + * This can be used, e.g., to construct a QML-facing image:// + * URI as follows: + * \code "image://provider/" + info.mediaId() \endcode + */ + QString mediaId() const { return url.authority() + url.path(); } + + public: + QJsonObject originalInfoJson; + QMimeType mimeType; QUrl url; int payloadSize; QString originalName; - - protected: - void fillInfoJson(QJsonObject* infoJson) const override; }; /** - * A base class for image info types: image, thumbnail, video - * - * \tparam InfoT base info class; should derive from \p InfoBase + * A content info class for image content types: image, thumbnail, video */ - template - class ImageInfo : public InfoT + class ImageInfo : public FileInfo { public: explicit ImageInfo(const QUrl& u, int fileSize = -1, QMimeType mimeType = {}, - const QSize& imageSize = {}) - : InfoT(u, fileSize, mimeType), imageSize(imageSize) - { } + const QSize& imageSize = {}); ImageInfo(const QUrl& u, const QJsonObject& infoJson, - const QString& originalFilename = {}) - : InfoT(u, infoJson, originalFilename) - , imageSize(infoJson["w"].toInt(), infoJson["h"].toInt()) - { } + const QString& originalFilename = {}); - QSize imageSize; + void fillInfoJson(QJsonObject* infoJson) const; - protected: - void fillInfoJson(QJsonObject* infoJson) const override - { - InfoT::fillInfoJson(infoJson); - infoJson->insert("w", imageSize.width()); - infoJson->insert("h", imageSize.height()); - } + public: + QSize imageSize; }; /** - * A base class for an info type that carries a thumbnail + * A mixin class for an info type that carries a thumbnail * - * This class decorates the underlying type, adding ability to save/load - * a thumbnail to/from "info" subobject of the JSON representation of - * event content; namely, "info/thumbnail_url" and "info/thumbnail_info" - * fields are used. - * - * \tparam InfoT base info class; should derive from \p InfoBase + * This class saves/loads a thumbnail to/from "info" subobject of + * the JSON representation of event content; namely, + * "info/thumbnail_url" and "info/thumbnail_info" fields are used. */ - template - class Thumbnailed : public InfoT + class WithThumbnail { public: - template - explicit Thumbnailed(const ImageInfo<>& thumbnail, - ArgTs&&... infoArgs) - : InfoT(std::forward(infoArgs)...) - , thumbnail(thumbnail) - { } - - explicit Thumbnailed(const QJsonObject& infoJson) - : thumbnail(infoJson["thumbnail_url"].toString(), - infoJson["thumbnail_info"].toObject()) + WithThumbnail(const QJsonObject& infoJson); + WithThumbnail(const ImageInfo& info) + : thumbnail(info) { } - Thumbnailed(const QUrl& u, const QJsonObject& infoJson, - const QString& originalFilename = {}) - : InfoT(u, infoJson, originalFilename) - , thumbnail(infoJson["thumbnail_url"].toString(), - infoJson["thumbnail_info"].toObject()) - { } + /** + * Writes thumbnail information to "thumbnail_info" subobject + * and thumbnail URL to "thumbnail_url" node inside "info". + */ + void fillInfoJson(QJsonObject* infoJson) const; - ImageInfo<> thumbnail; + public: + ImageInfo thumbnail; + }; - protected: - void fillInfoJson(QJsonObject* infoJson) const override - { - InfoT::fillInfoJson(infoJson); - infoJson->insert("thumbnail_url", thumbnail.url.toString()); - infoJson->insert("thumbnail_info", thumbnail.toInfoJson()); - } + class TypedBase: public Base + { + public: + explicit TypedBase(const QJsonObject& o = {}) : Base(o) { } + virtual QMimeType type() const = 0; + virtual const FileInfo* fileInfo() const { return nullptr; } }; /** - * One more facility base class for content types that have a URL and - * additional info + * A base class for content types that have a URL and additional info * - * Types that derive from UrlWith take "url" and, optionally, - * "filename" values from the top-level JSON object and the rest of - * information from the "info" subobject. + * Types that derive from this class template take "url" and, + * optionally, "filename" values from the top-level JSON object and + * the rest of information from the "info" subobject, as defined by + * the parameter type. * - * \tparam InfoT base info class; should derive from \p FileInfo or - * provide a constructor with a compatible signature + * \tparam InfoT base info class + * \tparam InfoMixinTs... additional info mixin classes (e.g. WithThumbnail) */ - template // InfoT : public FileInfo - class UrlWith : public TypedBase, public InfoT + template + class UrlBasedContent : + public TypedBase, public InfoT, public InfoMixinTs... { public: - using InfoT::InfoT; - explicit UrlWith(const QJsonObject& json) - : InfoT(json["url"].toString(), json["info"].toObject(), + explicit UrlBasedContent(const QJsonObject& json) + : TypedBase(json) + , InfoT(json["url"].toString(), json["info"].toObject(), json["filename"].toString()) + , InfoMixinTs(InfoT::originalInfoJson)... { } QMimeType type() const override { return InfoT::mimeType; } + const FileInfo* fileInfo() const override { return this; } protected: void fillJson(QJsonObject* json) const override @@ -250,7 +228,13 @@ namespace QMatrixClient json->insert("url", InfoT::url.toString()); if (!InfoT::originalName.isEmpty()) json->insert("filename", InfoT::originalName); - json->insert("info", InfoT::toInfoJson()); + QJsonObject infoJson; + InfoT::fillInfoJson(&infoJson); + // http://en.cppreference.com/w/cpp/language/parameter_pack#Brace-enclosed_initializers + // Looking forward to C++17 and its folding awesomeness. + int d[] = { (InfoMixinTs::fillInfoJson(&infoJson), 0)... }; + Q_UNUSED(d); + json->insert("info", infoJson); } }; @@ -272,7 +256,7 @@ namespace QMatrixClient * - mimeType * - imageSize */ - using ImageContent = UrlWith>>; + using ImageContent = UrlBasedContent; /** * Content class for m.file @@ -290,6 +274,6 @@ namespace QMatrixClient * - thumbnail.mimeType * - thumbnail.imageSize (QSize for "h" and "w" in JSON) */ - using FileContent = UrlWith>; + using FileContent = UrlBasedContent; } // namespace EventContent } // namespace QMatrixClient diff --git a/events/roommessageevent.cpp b/events/roommessageevent.cpp index bc41abf6..20e81564 100644 --- a/events/roommessageevent.cpp +++ b/events/roommessageevent.cpp @@ -116,6 +116,11 @@ QMimeType RoomMessageEvent::mimeType() const QMimeDatabase().mimeTypeForName("text/plain"); } +bool RoomMessageEvent::hasFileContent() const +{ + return content() && content()->fileInfo(); +} + QJsonObject RoomMessageEvent::toJson() const { QJsonObject obj = _content ? _content->toJson() : QJsonObject(); @@ -153,43 +158,35 @@ void TextContent::fillJson(QJsonObject* json) const json->insert("formatted_body", body); } -LocationContent::LocationContent(const QString& geoUri, - const ImageInfo<>& thumbnail) - : Thumbnailed<>(thumbnail), geoUri(geoUri) +LocationContent::LocationContent(const QString& geoUri, const ImageInfo& thumbnail) + : WithThumbnail(thumbnail), geoUri(geoUri) { } LocationContent::LocationContent(const QJsonObject& json) - : Thumbnailed<>(json["info"].toObject()) + : TypedBase(json) + , WithThumbnail(json["info"].toObject()) , geoUri(json["geo_uri"].toString()) { } -void LocationContent::fillJson(QJsonObject* o) const -{ - Q_ASSERT(o); - o->insert("geo_uri", geoUri); - o->insert("info", Thumbnailed::toInfoJson()); -} - QMimeType LocationContent::type() const { return QMimeDatabase().mimeTypeForData(geoUri.toLatin1()); } -PlayableInfo::PlayableInfo(const QUrl& u, int fileSize, - const QMimeType& mimeType, int duration, - const QString& originalFilename) - : FileInfo(u, fileSize, mimeType, originalFilename) - , duration(duration) -{ } +void LocationContent::fillJson(QJsonObject* o) const +{ + Q_ASSERT(o); + o->insert("geo_uri", geoUri); + QJsonObject infoJson; + WithThumbnail::fillInfoJson(&infoJson); + o->insert("info", infoJson); +} -PlayableInfo::PlayableInfo(const QUrl& u, const QJsonObject& infoJson, - const QString& originalFilename) - : FileInfo(u, infoJson, originalFilename) - , duration(infoJson["duration"].toInt()) +WithDuration::WithDuration(const QJsonObject& infoJson) + : duration(infoJson["duration"].toInt()) { } -void PlayableInfo::fillInfoJson(QJsonObject* infoJson) const +void WithDuration::fillInfoJson(QJsonObject* infoJson) const { - FileInfo::fillInfoJson(infoJson); infoJson->insert("duration", duration); } diff --git a/events/roommessageevent.h b/events/roommessageevent.h index eef6b657..6b551b76 100644 --- a/events/roommessageevent.h +++ b/events/roommessageevent.h @@ -32,6 +32,10 @@ namespace QMatrixClient class RoomMessageEvent: public RoomEvent { Q_GADGET + Q_PROPERTY(QString msgType READ rawMsgtype CONSTANT) + Q_PROPERTY(QString plainBody READ plainBody CONSTANT) + Q_PROPERTY(QMimeType mimeType READ mimeType STORED false CONSTANT) + Q_PROPERTY(EventContent::TypedBase* content READ content CONSTANT) public: enum class MsgType { @@ -52,9 +56,10 @@ namespace QMatrixClient MsgType msgtype() const; QString rawMsgtype() const { return _msgtype; } const QString& plainBody() const { return _plainBody; } - const EventContent::TypedBase* content() const + EventContent::TypedBase* content() const { return _content.data(); } QMimeType mimeType() const; + bool hasFileContent() const; QJsonObject toJson() const; @@ -107,15 +112,16 @@ namespace QMatrixClient * - thumbnail.mimeType * - thumbnail.imageSize */ - class LocationContent: public TypedBase, public Thumbnailed<> + class LocationContent: public TypedBase, public WithThumbnail { public: LocationContent(const QString& geoUri, - const ImageInfo<>& thumbnail); + const ImageInfo& thumbnail); explicit LocationContent(const QJsonObject& json); QMimeType type() const override; + public: QString geoUri; protected: @@ -123,21 +129,18 @@ namespace QMatrixClient }; /** - * A base class for "playable" info types: audio and video + * A mixin class for info types that include duration: audio and video */ - class PlayableInfo : public FileInfo + class WithDuration { public: - explicit PlayableInfo(const QUrl& u, int fileSize, - const QMimeType& mimeType, int duration, - const QString& originalFilename = {}); - PlayableInfo(const QUrl& u, const QJsonObject& infoJson, - const QString& originalFilename = {}); + explicit WithDuration(int duration) : duration(duration) { } + WithDuration(const QJsonObject& infoJson); - int duration; + void fillInfoJson(QJsonObject* infoJson) const; - protected: - void fillInfoJson(QJsonObject* infoJson) const override; + public: + int duration; }; /** @@ -159,7 +162,8 @@ namespace QMatrixClient * - mimeType * - imageSize */ - using VideoContent = UrlWith>>; + using VideoContent = + UrlBasedContent; /** * Content class for m.audio @@ -173,6 +177,6 @@ namespace QMatrixClient * - mimeType ("mimetype" in JSON) * - duration */ - using AudioContent = UrlWith; + using AudioContent = UrlBasedContent; } // namespace EventContent } // namespace QMatrixClient -- cgit v1.2.3 From 281216273ed417ae790dac9346adb8a6a0a5019c Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 13 Jan 2018 15:37:09 +0900 Subject: RoomEvent-aware file up/downloads along with status tracking --- room.cpp | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ room.h | 41 ++++++++++++++++++ 2 files changed, 187 insertions(+) diff --git a/room.cpp b/room.cpp index 28107228..0ef78c9f 100644 --- a/room.cpp +++ b/room.cpp @@ -33,6 +33,7 @@ #include "events/redactionevent.h" #include "jobs/sendeventjob.h" #include "jobs/roommessagesjob.h" +#include "jobs/downloadfilejob.h" #include "avatar.h" #include "connection.h" #include "user.h" @@ -40,6 +41,8 @@ #include #include // for efficient string concats (operator%) #include +#include +#include #include #include @@ -90,6 +93,37 @@ class Room::Private QString prevBatch; RoomMessagesJob* roomMessagesJob; + struct FileTransferPrivateInfo + { + QPointer job = nullptr; + QFileInfo localFileInfo { }; + FileTransferInfo::Status status = FileTransferInfo::Started; + qint64 progress = 0; + qint64 total = -1; + + void update(qint64 p, qint64 t) + { + progress = p; total = t; + if (t == 0) + { + t = -1; + if (p == 0) + p = -1; + } + } + }; + void failedTransfer(const QString& tid, const QString& errorMessage = {}) + { + qCWarning(MAIN) << "File transfer failed for id" << tid; + if (!errorMessage.isEmpty()) + qCWarning(MAIN) << "Message:" << errorMessage; + fileTransfers[tid].status = FileTransferInfo::Failed; + emit q->fileTransferFailed(tid, errorMessage); + } + // A map from event/txn ids to information about the long operation; + // used for both download and upload operations + QHash fileTransfers; + // Convenience methods to work with the membersMap and usersLeft. // addMember() and removeMember() emit respective Room:: signals // after a succesful operation. @@ -413,6 +447,30 @@ void Room::resetHighlightCount() emit highlightCountChanged(this); } +FileTransferInfo Room::fileTransferInfo(const QString& id) const +{ + auto infoIt = d->fileTransfers.find(id); + if (infoIt == d->fileTransfers.end()) + return {}; + + // FIXME: Add lib tests to make sure FileTransferInfo::status stays + // consistent with FileTransferInfo::job + + qint64 progress = infoIt->progress; + qint64 total = infoIt->total; + if (total > INT_MAX) + { + // JavaScript doesn't deal with 64-bit integers; scale down if necessary + progress = std::llround(double(progress) / total * INT_MAX); + total = INT_MAX; + } + + return { infoIt->status, int(progress), int(total), + QUrl::fromLocalFile(infoIt->localFileInfo.absolutePath()), + QUrl::fromLocalFile(infoIt->localFileInfo.absoluteFilePath()) + }; +} + QList< User* > Room::usersTyping() const { return d->usersTyping; @@ -713,6 +771,94 @@ void Room::redactEvent(const QString& eventId, const QString& reason) id(), eventId, connection()->generateTxnId(), reason); } +void Room::uploadFile(const QString& id, const QUrl& localFilename, + const QString& overrideContentType) +{ + Q_ASSERT_X(localFilename.isLocalFile(), __FUNCTION__, + "localFilename should point at a local file"); + auto fileName = localFilename.toLocalFile(); + auto job = connection()->uploadFile(fileName, overrideContentType); + if (isJobRunning(job)) + { + d->fileTransfers.insert(id, { job, fileName }); + connect(job, &BaseJob::uploadProgress, this, + [this,id] (qint64 sent, qint64 total) { + d->fileTransfers[id].update(sent, total); + emit fileTransferProgress(id, sent, total); + }); + connect(job, &BaseJob::success, this, [this,id,localFilename,job] { + d->fileTransfers[id].status = FileTransferInfo::Completed; + emit fileTransferCompleted(id, localFilename, job->contentUri()); + }); + connect(job, &BaseJob::failure, this, + std::bind(&Private::failedTransfer, d, id, job->errorString())); + emit newFileTransfer(id, localFilename); + } else + d->failedTransfer(id); +} + +void Room::downloadFile(const QString& eventId, const QUrl& localFilename) +{ + Q_ASSERT_X(localFilename.isEmpty() || localFilename.isLocalFile(), + __FUNCTION__, "localFilename should point at a local file"); + auto evtIt = findInTimeline(eventId); + if (evtIt == timelineEdge() || + evtIt->event()->type() != EventType::RoomMessage) + { + qCritical() << "Cannot download a file from event" << eventId + << "(there's no such message event in the local timeline)"; + Q_ASSERT(false); + return; + } + auto* event = static_cast(evtIt->event()); + if (!event->hasFileContent()) + { + qCritical() << eventId << "has no file content; nothing to download"; + Q_ASSERT(false); + return; + } + auto* fileInfo = event->content()->fileInfo(); + auto fileName = !localFilename.isEmpty() ? localFilename.toLocalFile() : + !fileInfo->originalName.isEmpty() ? + (QDir::tempPath() + '/' + fileInfo->originalName) : + !event->plainBody().isEmpty() ? + (QDir::tempPath() + '/' + event->plainBody()) : QString(); + auto job = connection()->downloadFile(fileInfo->url, fileName); + if (isJobRunning(job)) + { + d->fileTransfers.insert(eventId, { job, job->targetFileName() }); + connect(job, &BaseJob::downloadProgress, this, + [this,eventId] (qint64 received, qint64 total) { + d->fileTransfers[eventId].update(received, total); + emit fileTransferProgress(eventId, received, total); + }); + connect(job, &BaseJob::success, this, [this,eventId,fileInfo,job] { + d->fileTransfers[eventId].status = FileTransferInfo::Completed; + emit fileTransferCompleted(eventId, fileInfo->url, + QUrl::fromLocalFile(job->targetFileName())); + }); + connect(job, &BaseJob::failure, this, + std::bind(&Private::failedTransfer, d, + eventId, job->errorString())); + } else + d->failedTransfer(eventId); +} + +void Room::cancelFileTransfer(const QString& id) +{ + auto it = d->fileTransfers.find(id); + if (it == d->fileTransfers.end()) + { + qCWarning(MAIN) << "No information on file transfer" << id + << "in room" << d->id; + return; + } + if (isJobRunning(it->job)) + it->job->abandon(); + d->fileTransfers.remove(id); + emit fileTransferCancelled(id); +} + void Room::Private::dropDuplicateEvents(RoomEvents* events) const { if (events->empty()) diff --git a/room.h b/room.h index f863d41b..f5bf0839 100644 --- a/room.h +++ b/room.h @@ -70,6 +70,30 @@ namespace QMatrixClient return d; } + class FileTransferInfo + { + Q_GADGET + Q_PROPERTY(bool active READ active CONSTANT) + Q_PROPERTY(bool completed READ completed CONSTANT) + Q_PROPERTY(bool failed READ failed CONSTANT) + Q_PROPERTY(int progress MEMBER progress CONSTANT) + Q_PROPERTY(int total MEMBER total CONSTANT) + Q_PROPERTY(QUrl localDir MEMBER localDir CONSTANT) + Q_PROPERTY(QUrl localPath MEMBER localPath CONSTANT) + public: + enum Status { None, Started, Completed, Failed }; + Status status = None; + int progress = 0; + int total = -1; + QUrl localDir { }; + QUrl localPath { }; + + bool active() const + { return status == Started || status == Completed; } + bool completed() const { return status == Completed; } + bool failed() const { return status == Failed; } + }; + class Room: public QObject { Q_OBJECT @@ -166,6 +190,8 @@ namespace QMatrixClient Q_INVOKABLE int highlightCount() const; Q_INVOKABLE void resetHighlightCount(); + Q_INVOKABLE FileTransferInfo fileTransferInfo(const QString& id) const; + MemberSorter memberSorter() const; QJsonObject toJson() const; @@ -191,6 +217,13 @@ namespace QMatrixClient void redactEvent(const QString& eventId, const QString& reason = {}); + void uploadFile(const QString& id, const QUrl& localFilename, + const QString& overrideContentType = {}); + // If localFilename is empty a temporary file is created + void downloadFile(const QString& eventId, + const QUrl& localFilename = {}); + void cancelFileTransfer(const QString& id); + /** Mark all messages in the room as read */ void markAllMessagesAsRead(); @@ -219,9 +252,16 @@ namespace QMatrixClient void lastReadEventChanged(User* user); void readMarkerMoved(); void unreadMessagesChanged(Room* room); + void replacedEvent(const RoomEvent* newEvent, const RoomEvent* oldEvent); + void newFileTransfer(QString id, QUrl localFile); + void fileTransferProgress(QString id, qint64 progress, qint64 total); + void fileTransferCompleted(QString id, QUrl localFile, QUrl mxcUrl); + void fileTransferFailed(QString id, QString errorMessage = {}); + void fileTransferCancelled(QString id); + protected: virtual void processStateEvents(const RoomEvents& events); virtual void processEphemeralEvent(EventPtr event); @@ -253,3 +293,4 @@ namespace QMatrixClient const Room* room; }; } // namespace QMatrixClient +Q_DECLARE_METATYPE(QMatrixClient::FileTransferInfo) -- cgit v1.2.3 From 36db5ddad0183c21444246d5ab55a6b44de8b529 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 22 Jan 2018 10:30:21 +0900 Subject: splitMediaId: better assertion failure message --- connection.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/connection.cpp b/connection.cpp index 935546b1..68f23042 100644 --- a/connection.cpp +++ b/connection.cpp @@ -302,7 +302,8 @@ inline auto splitMediaId(const QString& mediaId) { auto idParts = mediaId.split('/'); Q_ASSERT_X(idParts.size() == 2, __FUNCTION__, - "mediaId should have a form 'serverName/localMediaId' (without apostrophes)"); + ("mediaId:" + mediaId + + "doesn't look like \"serverName/localMediaId\"").toLatin1()); return idParts; } -- cgit v1.2.3 From 7d506f7bebbcc3b5f8a37589f8fda6fa1e7e1efd Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Wed, 24 Jan 2018 11:22:52 +0900 Subject: splitMediaId: fix typos in the assertion failure message --- connection.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connection.cpp b/connection.cpp index 68f23042..f41f6c10 100644 --- a/connection.cpp +++ b/connection.cpp @@ -302,8 +302,8 @@ inline auto splitMediaId(const QString& mediaId) { auto idParts = mediaId.split('/'); Q_ASSERT_X(idParts.size() == 2, __FUNCTION__, - ("mediaId:" + mediaId + - "doesn't look like \"serverName/localMediaId\"").toLatin1()); + ("'" + mediaId + + "' doesn't look like 'serverName/localMediaId'").toLatin1()); return idParts; } -- cgit v1.2.3 From b34368907cba52954849bfb0266e119e5563eeb7 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 26 Jan 2018 10:37:44 +0900 Subject: CreateRoomJob: Update to the latest Spec version --- jobs/generated/create_room.cpp | 3 ++- jobs/generated/create_room.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jobs/generated/create_room.cpp b/jobs/generated/create_room.cpp index be06873a..de7807b5 100644 --- a/jobs/generated/create_room.cpp +++ b/jobs/generated/create_room.cpp @@ -74,7 +74,7 @@ class CreateRoomJob::Private QString roomId; }; -CreateRoomJob::CreateRoomJob(const QString& visibility, const QString& roomAliasName, const QString& name, const QString& topic, const QVector& invite, const QVector& invite3pid, const QJsonObject& creationContent, const QVector& initialState, const QString& preset, bool isDirect) +CreateRoomJob::CreateRoomJob(const QString& visibility, const QString& roomAliasName, const QString& name, const QString& topic, const QVector& invite, const QVector& invite3pid, const QJsonObject& creationContent, const QVector& initialState, const QString& preset, bool isDirect, bool guestCanJoin) : BaseJob(HttpVerb::Post, "CreateRoomJob", basePath % "/createRoom") , d(new Private) @@ -95,6 +95,7 @@ CreateRoomJob::CreateRoomJob(const QString& visibility, const QString& roomAlias if (!preset.isEmpty()) _data.insert("preset", toJson(preset)); _data.insert("is_direct", toJson(isDirect)); + _data.insert("guest_can_join", toJson(guestCanJoin)); setRequestData(_data); } diff --git a/jobs/generated/create_room.h b/jobs/generated/create_room.h index 13c9d2c0..b479615a 100644 --- a/jobs/generated/create_room.h +++ b/jobs/generated/create_room.h @@ -40,7 +40,7 @@ namespace QMatrixClient // End of inner data structures - explicit CreateRoomJob(const QString& visibility = {}, const QString& roomAliasName = {}, const QString& name = {}, const QString& topic = {}, const QVector& invite = {}, const QVector& invite3pid = {}, const QJsonObject& creationContent = {}, const QVector& initialState = {}, const QString& preset = {}, bool isDirect = {}); + explicit CreateRoomJob(const QString& visibility = {}, const QString& roomAliasName = {}, const QString& name = {}, const QString& topic = {}, const QVector& invite = {}, const QVector& invite3pid = {}, const QJsonObject& creationContent = {}, const QVector& initialState = {}, const QString& preset = {}, bool isDirect = {}, bool guestCanJoin = {}); ~CreateRoomJob() override; const QString& roomId() const; -- cgit v1.2.3 From 83427d7e20008f05bfc78339b3cdb30719c77272 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 3 Feb 2018 19:13:09 +0900 Subject: BaseJob::makeRequestUrl A static method that constructs a request URL for this job and the passed set of parameters. --- jobs/basejob.cpp | 21 +++++++++++++-------- jobs/basejob.h | 8 ++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp index 22ce5bd5..0e3e59d0 100644 --- a/jobs/basejob.cpp +++ b/jobs/basejob.cpp @@ -178,17 +178,22 @@ void BaseJob::setExpectedContentTypes(const QByteArrayList& contentTypes) d->expectedContentTypes = contentTypes; } -void BaseJob::Private::sendRequest() +QUrl BaseJob::makeRequestUrl(QUrl baseUrl, + const QString& path, const QUrlQuery& query) { - QUrl url = connection->baseUrl(); - QString path = url.path(); - if (!path.endsWith('/') && !apiEndpoint.startsWith('/')) - path.push_back('/'); + auto pathBase = baseUrl.path(); + if (!pathBase.endsWith('/') && !path.startsWith('/')) + pathBase.push_back('/'); - url.setPath( path + apiEndpoint ); - url.setQuery(requestQuery); + baseUrl.setPath( pathBase + path ); + baseUrl.setQuery(query); + return baseUrl; +} - QNetworkRequest req {url}; +void BaseJob::Private::sendRequest() +{ + QNetworkRequest req + { makeRequestUrl(connection->baseUrl(), apiEndpoint, requestQuery) }; if (!requestHeaders.contains("Content-Type")) req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); req.setRawHeader(QByteArray("Authorization"), diff --git a/jobs/basejob.h b/jobs/basejob.h index e9e108c6..c03c914f 100644 --- a/jobs/basejob.h +++ b/jobs/basejob.h @@ -212,6 +212,14 @@ namespace QMatrixClient void addExpectedContentType(const QByteArray& contentType); void setExpectedContentTypes(const QByteArrayList& contentTypes); + /** Construct a URL out of baseUrl, path and query + * The function automatically adds '/' between baseUrl's path and + * \p path if necessary. The query component of \p baseUrl + * is ignored. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& path, + const QUrlQuery& query = {}); + virtual void beforeStart(const ConnectionData* connData); virtual void afterStart(const ConnectionData* connData, QNetworkReply* reply); -- cgit v1.2.3 From e1aedb9f3dcf7dcdc68e5eefab206258013c5114 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 3 Feb 2018 19:14:00 +0900 Subject: GTAD: Generate job-specific makeRequestUrl() methods --- jobs/gtad.yaml | 5 ++++- jobs/{{base}}.cpp.mustache | 29 +++++++++++++++++++++-------- jobs/{{base}}.h.mustache | 11 +++++++++-- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml index f79ce9b6..78c879e4 100644 --- a/jobs/gtad.yaml +++ b/jobs/gtad.yaml @@ -25,7 +25,7 @@ types: number: - float: float - //: double - boolean: bool + boolean: { type: bool, initializer: false } string: - byte: &ByteStream type: QIODevice* @@ -70,6 +70,9 @@ env: maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}" qualifiedMaybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}" initializeDefaultValue: "{{#defaultValue}}{{>initializer}}{{/defaultValue}}{{^defaultValue}}{}{{/defaultValue}}" + joinedParamDecl: '{{>maybeCrefType}} {{paramName}}{{^required?}} = {{>initializeDefaultValue}}{{/required?}}{{#@join}}, {{/@join}}' + joinedParamDef: '{{>maybeCrefType}} {{paramName}}{{#@join}}, {{/@join}}' + passQueryParams: '{{#queryParams}}{{paramName}}{{#@join}}, {{/@join}}{{/queryParams}}' paramToString: '{{#string?}}{{nameCamelCase}}{{/string?}}{{^string?}}QString("%1").arg({{nameCamelCase}}){{/string?}}' # preamble: preamble.mustache copyrightName: Kitsune Ral diff --git a/jobs/{{base}}.cpp.mustache b/jobs/{{base}}.cpp.mustache index 34e7faf3..b8532c51 100644 --- a/jobs/{{base}}.cpp.mustache +++ b/jobs/{{base}}.cpp.mustache @@ -56,20 +56,33 @@ class {{camelCaseOperationId}}Job::Private public:{{#allProperties}} {{dataType.name}} {{paramName}};{{/allProperties}} }; -{{/ allProperties?}}{{/normalResponse?}}{{/responses}} -{{camelCaseOperationId}}Job::{{camelCaseOperationId}}Job({{#allParams}}{{>maybeCrefType}} {{paramName}}{{#@join}}, {{/@join}}{{/allParams}}) +{{/ allProperties?}}{{/normalResponse?}}{{/responses}}{{#queryParams?}} +BaseJob::Query queryTo{{camelCaseOperationId}}({{#queryParams}}{{>joinedParamDef}}{{/queryParams}}) +{ + BaseJob::Query _q;{{#queryParams}} +{{^required?}}{{#string?}} if (!{{nameCamelCase}}.isEmpty()) + {{/string?}}{{/required?}} _q.addQueryItem("{{baseName}}", {{>paramToString}});{{/queryParams}} + return _q; +} +{{/queryParams?}}{{^bodyParams}} +QUrl {{camelCaseOperationId}}Job::makeRequestUrl(QUrl baseUrl{{#allParams?}}, {{#allParams}}{{>joinedParamDef}}{{/allParams}}{{/allParams?}}) +{ + return BaseJob::makeRequestUrl(baseUrl, + basePath{{#pathParts}} % {{_}}{{/pathParts}}{{#queryParams?}}, + queryTo{{camelCaseOperationId}}({{>passQueryParams}}){{/queryParams?}}); +} +{{/ bodyParams}} +{{camelCaseOperationId}}Job::{{camelCaseOperationId}}Job({{#allParams}}{{>joinedParamDef}}{{/allParams}}) : BaseJob(HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{camelCaseOperationId}}Job", - basePath{{#pathParts}} % {{_}}{{/pathParts}}{{#skipAuth}}, false{{/skipAuth}}){{#responses}}{{#normalResponse?}}{{#allProperties?}} + basePath{{#pathParts}} % {{_}}{{/pathParts}}{{#queryParams?}}, + queryTo{{camelCaseOperationId}}({{>passQueryParams}}){{/queryParams?}}{{#skipAuth}}{{#queryParams?}}, + {}{{/queryParams?}}, false{{/skipAuth}}){{#responses}}{{#normalResponse?}}{{#allProperties?}} , d(new Private){{/allProperties?}}{{/normalResponse?}}{{/responses}} { {{#headerParams?}}{{#headerParams}} setRequestHeader("{{baseName}}", {{paramName}}.toLatin1()); {{/headerParams}} {{/headerParams?}}{{! -}}{{#queryParams?}} QUrlQuery _q;{{#queryParams}} -{{^required?}}{{#string?}} if (!{{nameCamelCase}}.isEmpty()) - {{/string?}}{{/required?}} _q.addQueryItem("{{baseName}}", {{>paramToString}});{{/queryParams}} - setRequestQuery(_q); -{{/queryParams?}}{{#bodyParams?}}{{! +}}{{#bodyParams?}}{{! }}{{#inlineBody}} setRequestData(Data({{nameCamelCase}}));{{/inlineBody}}{{! }}{{^inlineBody}} QJsonObject _data;{{#bodyParams}} {{^required?}}{{#string?}} if (!{{paramName}}.isEmpty()) diff --git a/jobs/{{base}}.h.mustache b/jobs/{{base}}.h.mustache index 69e0e6d3..63aa53e7 100644 --- a/jobs/{{base}}.h.mustache +++ b/jobs/{{base}}.h.mustache @@ -42,8 +42,15 @@ namespace QMatrixClient }; {{/ trivial?}}{{/model}} // End of inner data structures -{{/models}} - explicit {{camelCaseOperationId}}Job({{#allParams}}{{>maybeCrefType}} {{paramName}}{{^required?}} = {{>initializeDefaultValue}}{{/required?}}{{#@join}}, {{/@join}}{{/allParams}});{{!skip EOL +{{/models}}{{^bodyParams}} + /** Construct a URL out of baseUrl and usual parameters passed to + * {{camelCaseOperationId}}Job. This function can be used when + * a URL for {{camelCaseOperationId}}Job is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl{{#allParams?}}, {{#allParams}}{{>joinedParamDecl}}{{/allParams}}{{/allParams?}}); +{{/bodyParams}} + explicit {{camelCaseOperationId}}Job({{#allParams}}{{>joinedParamDecl}}{{/allParams}});{{!skip EOL }}{{# responses}}{{#normalResponse?}}{{#allProperties?}} ~{{camelCaseOperationId}}Job() override; {{#allProperties}} -- cgit v1.2.3 From dafb0e10a421a36d976d8d8f18fb3aadeaece994 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 27 Feb 2018 20:14:47 +0900 Subject: jobs/generated: SetAccountDataJob, SetAccountDataPerRoomJob --- jobs/generated/account-data.cpp | 28 ++++++++++++++++++++++++++++ jobs/generated/account-data.h | 27 +++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 jobs/generated/account-data.cpp create mode 100644 jobs/generated/account-data.h diff --git a/jobs/generated/account-data.cpp b/jobs/generated/account-data.cpp new file mode 100644 index 00000000..35ee94c0 --- /dev/null +++ b/jobs/generated/account-data.cpp @@ -0,0 +1,28 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "account-data.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type, const QJsonObject& content) + : BaseJob(HttpVerb::Put, "SetAccountDataJob", + basePath % "/user/" % userId % "/account_data/" % type) +{ + setRequestData(Data(content)); +} + +SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type, const QJsonObject& content) + : BaseJob(HttpVerb::Put, "SetAccountDataPerRoomJob", + basePath % "/user/" % userId % "/rooms/" % roomId % "/account_data/" % type) +{ + setRequestData(Data(content)); +} + diff --git a/jobs/generated/account-data.h b/jobs/generated/account-data.h new file mode 100644 index 00000000..69ad9fb4 --- /dev/null +++ b/jobs/generated/account-data.h @@ -0,0 +1,27 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class SetAccountDataJob : public BaseJob + { + public: + explicit SetAccountDataJob(const QString& userId, const QString& type, const QJsonObject& content = {}); + }; + + class SetAccountDataPerRoomJob : public BaseJob + { + public: + explicit SetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type, const QJsonObject& content = {}); + }; +} // namespace QMatrixClient -- cgit v1.2.3 From 292ed58962fb11d6572e273bcb4d2ad762d60365 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 27 Feb 2018 20:15:48 +0900 Subject: jobs/generated: GetJoinedRoomsJob --- jobs/generated/list_joined_rooms.cpp | 50 ++++++++++++++++++++++++++++++++++++ jobs/generated/list_joined_rooms.h | 38 +++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 jobs/generated/list_joined_rooms.cpp create mode 100644 jobs/generated/list_joined_rooms.h diff --git a/jobs/generated/list_joined_rooms.cpp b/jobs/generated/list_joined_rooms.cpp new file mode 100644 index 00000000..f902f94c --- /dev/null +++ b/jobs/generated/list_joined_rooms.cpp @@ -0,0 +1,50 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "list_joined_rooms.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class GetJoinedRoomsJob::Private +{ + public: + QVector joinedRooms; +}; + +QUrl GetJoinedRoomsJob::makeRequestUrl(QUrl baseUrl) +{ + return BaseJob::makeRequestUrl(baseUrl, + basePath % "/joined_rooms"); +} + +GetJoinedRoomsJob::GetJoinedRoomsJob() + : BaseJob(HttpVerb::Get, "GetJoinedRoomsJob", + basePath % "/joined_rooms") + , d(new Private) +{ +} + +GetJoinedRoomsJob::~GetJoinedRoomsJob() = default; + +const QVector& GetJoinedRoomsJob::joinedRooms() const +{ + return d->joinedRooms; +} + +BaseJob::Status GetJoinedRoomsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("joined_rooms")) + return { JsonParseError, + "The key 'joined_rooms' not found in the response" }; + d->joinedRooms = fromJson>(json.value("joined_rooms")); + return Success; +} + diff --git a/jobs/generated/list_joined_rooms.h b/jobs/generated/list_joined_rooms.h new file mode 100644 index 00000000..768f5166 --- /dev/null +++ b/jobs/generated/list_joined_rooms.h @@ -0,0 +1,38 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class GetJoinedRoomsJob : public BaseJob + { + public: + /** Construct a URL out of baseUrl and usual parameters passed to + * GetJoinedRoomsJob. This function can be used when + * a URL for GetJoinedRoomsJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl); + + explicit GetJoinedRoomsJob(); + ~GetJoinedRoomsJob() override; + + const QVector& joinedRooms() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient -- cgit v1.2.3 From f1f71255fb1a9e90dadd34fd055d14155da485ea Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 27 Feb 2018 20:18:32 +0900 Subject: jobs/generated: GetPushersJob, PostPusherJob --- jobs/generated/pusher.cpp | 153 ++++++++++++++++++++++++++++++++++++++++++++++ jobs/generated/pusher.h | 81 ++++++++++++++++++++++++ 2 files changed, 234 insertions(+) create mode 100644 jobs/generated/pusher.cpp create mode 100644 jobs/generated/pusher.h diff --git a/jobs/generated/pusher.cpp b/jobs/generated/pusher.cpp new file mode 100644 index 00000000..4fddac45 --- /dev/null +++ b/jobs/generated/pusher.cpp @@ -0,0 +1,153 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "pusher.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +GetPushersJob::PusherData::operator QJsonObject() const +{ + QJsonObject o; + o.insert("url", toJson(url)); + + return o; +} +namespace QMatrixClient +{ + template <> struct FromJson + { + GetPushersJob::PusherData operator()(QJsonValue jv) + { + QJsonObject o = jv.toObject(); + GetPushersJob::PusherData result; + result.url = + fromJson(o.value("url")); + + return result; + } + }; +} // namespace QMatrixClient + +GetPushersJob::Pusher::operator QJsonObject() const +{ + QJsonObject o; + o.insert("pushkey", toJson(pushkey)); + o.insert("kind", toJson(kind)); + o.insert("app_id", toJson(appId)); + o.insert("app_display_name", toJson(appDisplayName)); + o.insert("device_display_name", toJson(deviceDisplayName)); + o.insert("profile_tag", toJson(profileTag)); + o.insert("lang", toJson(lang)); + o.insert("data", toJson(data)); + + return o; +} +namespace QMatrixClient +{ + template <> struct FromJson + { + GetPushersJob::Pusher operator()(QJsonValue jv) + { + QJsonObject o = jv.toObject(); + GetPushersJob::Pusher result; + result.pushkey = + fromJson(o.value("pushkey")); + result.kind = + fromJson(o.value("kind")); + result.appId = + fromJson(o.value("app_id")); + result.appDisplayName = + fromJson(o.value("app_display_name")); + result.deviceDisplayName = + fromJson(o.value("device_display_name")); + result.profileTag = + fromJson(o.value("profile_tag")); + result.lang = + fromJson(o.value("lang")); + result.data = + fromJson(o.value("data")); + + return result; + } + }; +} // namespace QMatrixClient + +class GetPushersJob::Private +{ + public: + QVector pushers; +}; + +QUrl GetPushersJob::makeRequestUrl(QUrl baseUrl) +{ + return BaseJob::makeRequestUrl(baseUrl, + basePath % "/pushers"); +} + +GetPushersJob::GetPushersJob() + : BaseJob(HttpVerb::Get, "GetPushersJob", + basePath % "/pushers") + , d(new Private) +{ +} + +GetPushersJob::~GetPushersJob() = default; + +const QVector& GetPushersJob::pushers() const +{ + return d->pushers; +} + +BaseJob::Status GetPushersJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->pushers = fromJson>(json.value("pushers")); + return Success; +} + +PostPusherJob::PusherData::operator QJsonObject() const +{ + QJsonObject o; + o.insert("url", toJson(url)); + + return o; +} +namespace QMatrixClient +{ + template <> struct FromJson + { + PostPusherJob::PusherData operator()(QJsonValue jv) + { + QJsonObject o = jv.toObject(); + PostPusherJob::PusherData result; + result.url = + fromJson(o.value("url")); + + return result; + } + }; +} // namespace QMatrixClient + +PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag, bool append) + : BaseJob(HttpVerb::Post, "PostPusherJob", + basePath % "/pushers/set") +{ + QJsonObject _data; + _data.insert("pushkey", toJson(pushkey)); + _data.insert("kind", toJson(kind)); + _data.insert("app_id", toJson(appId)); + _data.insert("app_display_name", toJson(appDisplayName)); + _data.insert("device_display_name", toJson(deviceDisplayName)); + if (!profileTag.isEmpty()) + _data.insert("profile_tag", toJson(profileTag)); + _data.insert("lang", toJson(lang)); + _data.insert("data", toJson(data)); + _data.insert("append", toJson(append)); + setRequestData(_data); +} + diff --git a/jobs/generated/pusher.h b/jobs/generated/pusher.h new file mode 100644 index 00000000..36576996 --- /dev/null +++ b/jobs/generated/pusher.h @@ -0,0 +1,81 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class GetPushersJob : public BaseJob + { + public: + // Inner data structures + + struct PusherData + { + QString url; + + operator QJsonObject() const; + }; + + struct Pusher + { + QString pushkey; + QString kind; + QString appId; + QString appDisplayName; + QString deviceDisplayName; + QString profileTag; + QString lang; + PusherData data; + + operator QJsonObject() const; + }; + + // End of inner data structures + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetPushersJob. This function can be used when + * a URL for GetPushersJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl); + + explicit GetPushersJob(); + ~GetPushersJob() override; + + const QVector& pushers() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class PostPusherJob : public BaseJob + { + public: + // Inner data structures + + struct PusherData + { + QString url; + + operator QJsonObject() const; + }; + + // End of inner data structures + + explicit PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag = {}, bool append = {}); + }; +} // namespace QMatrixClient -- cgit v1.2.3 From 52afbb96cee8ea1aa739909fc54b28dd7dcb4a2f Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 27 Feb 2018 20:20:28 +0900 Subject: jobs/generated: SendMessageJob (might or might not preempt non-generated SendEventJob) --- jobs/generated/room_send.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++ jobs/generated/room_send.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 jobs/generated/room_send.cpp create mode 100644 jobs/generated/room_send.h diff --git a/jobs/generated/room_send.cpp b/jobs/generated/room_send.cpp new file mode 100644 index 00000000..c9a3280d --- /dev/null +++ b/jobs/generated/room_send.cpp @@ -0,0 +1,42 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "room_send.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class SendMessageJob::Private +{ + public: + QString eventId; +}; + +SendMessageJob::SendMessageJob(const QString& roomId, const QString& eventType, const QString& txnId, const QJsonObject& body) + : BaseJob(HttpVerb::Put, "SendMessageJob", + basePath % "/rooms/" % roomId % "/send/" % eventType % "/" % txnId) + , d(new Private) +{ + setRequestData(Data(body)); +} + +SendMessageJob::~SendMessageJob() = default; + +const QString& SendMessageJob::eventId() const +{ + return d->eventId; +} + +BaseJob::Status SendMessageJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->eventId = fromJson(json.value("event_id")); + return Success; +} + diff --git a/jobs/generated/room_send.h b/jobs/generated/room_send.h new file mode 100644 index 00000000..d20ce523 --- /dev/null +++ b/jobs/generated/room_send.h @@ -0,0 +1,31 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class SendMessageJob : public BaseJob + { + public: + explicit SendMessageJob(const QString& roomId, const QString& eventType, const QString& txnId, const QJsonObject& body = {}); + ~SendMessageJob() override; + + const QString& eventId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient -- cgit v1.2.3 From dce6f26a125f237471c579675ac149a33a951d84 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 27 Feb 2018 20:22:38 +0900 Subject: jobs/generated: GetRoomTagsJob, SetRoomTagJob, DeleteRoomTagJob --- jobs/generated/tags.cpp | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ jobs/generated/tags.h | 57 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 jobs/generated/tags.cpp create mode 100644 jobs/generated/tags.h diff --git a/jobs/generated/tags.cpp b/jobs/generated/tags.cpp new file mode 100644 index 00000000..dc4faf04 --- /dev/null +++ b/jobs/generated/tags.cpp @@ -0,0 +1,66 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "tags.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class GetRoomTagsJob::Private +{ + public: + QJsonObject tags; +}; + +QUrl GetRoomTagsJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId) +{ + return BaseJob::makeRequestUrl(baseUrl, + basePath % "/user/" % userId % "/rooms/" % roomId % "/tags"); +} + +GetRoomTagsJob::GetRoomTagsJob(const QString& userId, const QString& roomId) + : BaseJob(HttpVerb::Get, "GetRoomTagsJob", + basePath % "/user/" % userId % "/rooms/" % roomId % "/tags") + , d(new Private) +{ +} + +GetRoomTagsJob::~GetRoomTagsJob() = default; + +const QJsonObject& GetRoomTagsJob::tags() const +{ + return d->tags; +} + +BaseJob::Status GetRoomTagsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->tags = fromJson(json.value("tags")); + return Success; +} + +SetRoomTagJob::SetRoomTagJob(const QString& userId, const QString& roomId, const QString& tag, const QJsonObject& body) + : BaseJob(HttpVerb::Put, "SetRoomTagJob", + basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag) +{ + setRequestData(Data(body)); +} + +QUrl DeleteRoomTagJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& tag) +{ + return BaseJob::makeRequestUrl(baseUrl, + basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag); +} + +DeleteRoomTagJob::DeleteRoomTagJob(const QString& userId, const QString& roomId, const QString& tag) + : BaseJob(HttpVerb::Delete, "DeleteRoomTagJob", + basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag) +{ +} + diff --git a/jobs/generated/tags.h b/jobs/generated/tags.h new file mode 100644 index 00000000..7a375527 --- /dev/null +++ b/jobs/generated/tags.h @@ -0,0 +1,57 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class GetRoomTagsJob : public BaseJob + { + public: + /** Construct a URL out of baseUrl and usual parameters passed to + * GetRoomTagsJob. This function can be used when + * a URL for GetRoomTagsJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId); + + explicit GetRoomTagsJob(const QString& userId, const QString& roomId); + ~GetRoomTagsJob() override; + + const QJsonObject& tags() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class SetRoomTagJob : public BaseJob + { + public: + explicit SetRoomTagJob(const QString& userId, const QString& roomId, const QString& tag, const QJsonObject& body = {}); + }; + + class DeleteRoomTagJob : public BaseJob + { + public: + /** Construct a URL out of baseUrl and usual parameters passed to + * DeleteRoomTagJob. This function can be used when + * a URL for DeleteRoomTagJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& tag); + + explicit DeleteRoomTagJob(const QString& userId, const QString& roomId, const QString& tag); + }; +} // namespace QMatrixClient -- cgit v1.2.3 From e9e407ba2aca7e3dc0cea5040738953f1961e09c Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 27 Feb 2018 20:23:57 +0900 Subject: jobs/generated: SearchUserDirectoryJob --- jobs/generated/users.cpp | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ jobs/generated/users.h | 46 ++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 jobs/generated/users.cpp create mode 100644 jobs/generated/users.h diff --git a/jobs/generated/users.cpp b/jobs/generated/users.cpp new file mode 100644 index 00000000..33da4b43 --- /dev/null +++ b/jobs/generated/users.cpp @@ -0,0 +1,85 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "users.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +SearchUserDirectoryJob::User::operator QJsonObject() const +{ + QJsonObject o; + o.insert("user_id", toJson(userId)); + o.insert("display_name", toJson(displayName)); + o.insert("avatar_url", toJson(avatarUrl)); + + return o; +} +namespace QMatrixClient +{ + template <> struct FromJson + { + SearchUserDirectoryJob::User operator()(QJsonValue jv) + { + QJsonObject o = jv.toObject(); + SearchUserDirectoryJob::User result; + result.userId = + fromJson(o.value("user_id")); + result.displayName = + fromJson(o.value("display_name")); + result.avatarUrl = + fromJson(o.value("avatar_url")); + + return result; + } + }; +} // namespace QMatrixClient + +class SearchUserDirectoryJob::Private +{ + public: + QVector results; + bool limited; +}; + +SearchUserDirectoryJob::SearchUserDirectoryJob(const QString& searchTerm, double limit) + : BaseJob(HttpVerb::Post, "SearchUserDirectoryJob", + basePath % "/user_directory/search") + , d(new Private) +{ + QJsonObject _data; + _data.insert("search_term", toJson(searchTerm)); + _data.insert("limit", toJson(limit)); + setRequestData(_data); +} + +SearchUserDirectoryJob::~SearchUserDirectoryJob() = default; + +const QVector& SearchUserDirectoryJob::results() const +{ + return d->results; +} + +bool SearchUserDirectoryJob::limited() const +{ + return d->limited; +} + +BaseJob::Status SearchUserDirectoryJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("results")) + return { JsonParseError, + "The key 'results' not found in the response" }; + d->results = fromJson>(json.value("results")); + if (!json.contains("limited")) + return { JsonParseError, + "The key 'limited' not found in the response" }; + d->limited = fromJson(json.value("limited")); + return Success; +} + diff --git a/jobs/generated/users.h b/jobs/generated/users.h new file mode 100644 index 00000000..7be250a5 --- /dev/null +++ b/jobs/generated/users.h @@ -0,0 +1,46 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class SearchUserDirectoryJob : public BaseJob + { + public: + // Inner data structures + + struct User + { + QString userId; + QString displayName; + QString avatarUrl; + + operator QJsonObject() const; + }; + + // End of inner data structures + + explicit SearchUserDirectoryJob(const QString& searchTerm, double limit = {}); + ~SearchUserDirectoryJob() override; + + const QVector& results() const; + bool limited() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient -- cgit v1.2.3 From a95618af600c8c72c15ece48682ee6260de27aff Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 27 Feb 2018 20:27:39 +0900 Subject: jobs/generated: SendToDeviceJob --- jobs/generated/to_device.cpp | 23 +++++++++++++++++++++++ jobs/generated/to_device.h | 21 +++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 jobs/generated/to_device.cpp create mode 100644 jobs/generated/to_device.h diff --git a/jobs/generated/to_device.cpp b/jobs/generated/to_device.cpp new file mode 100644 index 00000000..cfb860c7 --- /dev/null +++ b/jobs/generated/to_device.cpp @@ -0,0 +1,23 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "to_device.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +SendToDeviceJob::SendToDeviceJob(const QString& eventType, const QString& txnId, const QJsonObject& messages) + : BaseJob(HttpVerb::Put, "SendToDeviceJob", + basePath % "/sendToDevice/" % eventType % "/" % txnId) +{ + QJsonObject _data; + _data.insert("messages", toJson(messages)); + setRequestData(_data); +} + diff --git a/jobs/generated/to_device.h b/jobs/generated/to_device.h new file mode 100644 index 00000000..0de8fb0a --- /dev/null +++ b/jobs/generated/to_device.h @@ -0,0 +1,21 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class SendToDeviceJob : public BaseJob + { + public: + explicit SendToDeviceJob(const QString& eventType, const QString& txnId, const QJsonObject& messages = {}); + }; +} // namespace QMatrixClient -- cgit v1.2.3 From 341bea5fc7df0143fa118072d2dbb8158cc6eb23 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 13 Apr 2018 20:31:05 +0900 Subject: CMakeLists.txt: minor refactoring --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29171e7e..094ec488 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,9 +97,10 @@ file(GLOB_RECURSE API_DEFS RELATIVE ${PROJECT_SOURCE_DIR} ${API_DEF_PATH}/definitions/*.yaml ${MATRIX_DOC_PATH}/event-schemas/schema/* ) +set(JOBS_SRC_DIR lib/jobs) if (MATRIX_DOC_PATH AND GTAD_PATH) add_custom_target(update-api - ${GTAD_PATH} --config jobs/gtad.yaml --out jobs/generated + ${GTAD_PATH} --config ${JOBS_SRC_DIR}/gtad.yaml --out ${JOBS_SRC_DIR}/generated ${MATRIX_DOC_PATH}/api/client-server cas_login_redirect.yaml- cas_login_ticket.yaml- old_sync.yaml- room_initial_sync.yaml- @@ -108,14 +109,14 @@ if (MATRIX_DOC_PATH AND GTAD_PATH) notifications.yaml- peeking_events.yaml- pushrules.yaml- rooms.yaml- search.yaml- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - SOURCES lib/jobs/gtad.yaml - lib/jobs/{{base}}.h.mustache lib/jobs/{{base}}.cpp.mustache + SOURCES ${JOBS_SRC_DIR}/gtad.yaml + ${JOBS_SRC_DIR}/{{base}}.h.mustache ${JOBS_SRC_DIR}/{{base}}.cpp.mustache ${API_DEFS} VERBATIM ) endif() -aux_source_directory(lib/jobs/generated libqmatrixclient_job_SRCS) +aux_source_directory(${JOBS_SRC_DIR}/generated libqmatrixclient_job_SRCS) set(example_SRCS examples/qmc-example.cpp) -- cgit v1.2.3 From 07d2b179bb08c4b941eca3f20b9ef31740ad95bd Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 14 Apr 2018 14:08:44 +0900 Subject: Mustache: {{#producesNonJson?}} -> {{#producesNotJson?}} According to the most recent changes in GTAD. --- lib/jobs/{{base}}.cpp.mustache | 14 +++++++------- lib/jobs/{{base}}.h.mustache | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/jobs/{{base}}.cpp.mustache b/lib/jobs/{{base}}.cpp.mustache index b8532c51..5e94dcf0 100644 --- a/lib/jobs/{{base}}.cpp.mustache +++ b/lib/jobs/{{base}}.cpp.mustache @@ -3,8 +3,8 @@ {{^allModels}} #include "converters.h" {{/allModels}}{{#operations}} -{{#producesNotJson?}}#include -{{/producesNotJson?}}#include +{{#producesNonJson?}}#include +{{/producesNonJson?}}#include {{/operations}} using namespace QMatrixClient; {{#models.model}}{{^trivial?}} @@ -88,8 +88,8 @@ QUrl {{camelCaseOperationId}}Job::makeRequestUrl(QUrl baseUrl{{#allParams?}}, {{ {{^required?}}{{#string?}} if (!{{paramName}}.isEmpty()) {{/string?}}{{/required?}} _data.insert("{{baseName}}", toJson({{paramName}}));{{/bodyParams}} setRequestData(_data);{{/inlineBody}} -{{/bodyParams?}}{{#producesNotJson?}} setExpectedContentTypes({ {{#produces}}"{{_}}"{{#@join}}, {{/@join}}{{/produces}} }); -{{/producesNotJson?}}}{{!<- mind the actual brace}} +{{/bodyParams?}}{{#producesNonJson?}} setExpectedContentTypes({ {{#produces}}"{{_}}"{{#@join}}, {{/@join}}{{/produces}} }); +{{/producesNonJson?}}}{{!<- mind the actual brace}} {{# responses}}{{#normalResponse?}}{{#allProperties?}} {{camelCaseOperationId}}Job::~{{camelCaseOperationId}}Job() = default; {{# allProperties}} @@ -97,13 +97,13 @@ QUrl {{camelCaseOperationId}}Job::makeRequestUrl(QUrl baseUrl{{#allParams?}}, {{ { return d->{{paramName}}; } -{{/ allProperties}}{{#producesNotJson?}} +{{/ allProperties}}{{#producesNonJson?}} BaseJob::Status {{camelCaseOperationId}}Job::parseReply(QNetworkReply* reply) { {{#headers}}d->{{paramName}} = reply->rawHeader("{{baseName}}"); {{! We don't check for required headers yet }} {{/headers}}{{#properties}}d->{{paramName}} = reply;{{/properties}} return Success; -}{{/ producesNotJson?}}{{^producesNotJson?}} +}{{/ producesNonJson?}}{{^producesNonJson?}} BaseJob::Status {{camelCaseOperationId}}Job::parseJson(const QJsonDocument& data) { auto json = data.object(); @@ -112,5 +112,5 @@ BaseJob::Status {{camelCaseOperationId}}Job::parseJson(const QJsonDocument& data "The key '{{baseName}}' not found in the response" }; {{/required?}}d->{{paramName}} = fromJson<{{dataType.name}}>(json.value("{{baseName}}")); {{/ properties}}return Success; -}{{/ producesNotJson?}} +}{{/ producesNonJson?}} {{/allProperties?}}{{/normalResponse?}}{{/responses}}{{/operation}}{{/operations}} diff --git a/lib/jobs/{{base}}.h.mustache b/lib/jobs/{{base}}.h.mustache index 63aa53e7..12633604 100644 --- a/lib/jobs/{{base}}.h.mustache +++ b/lib/jobs/{{base}}.h.mustache @@ -57,7 +57,7 @@ namespace QMatrixClient {{>maybeCrefType}} {{paramName}}() const;{{/allProperties}} protected: - Status {{#producesNotJson?}}parseReply(QNetworkReply* reply){{/producesNotJson?}}{{^producesNotJson?}}parseJson(const QJsonDocument& data){{/producesNotJson?}} override; + Status {{#producesNonJson?}}parseReply(QNetworkReply* reply){{/producesNonJson?}}{{^producesNonJson?}}parseJson(const QJsonDocument& data){{/producesNonJson?}} override; private: class Private; -- cgit v1.2.3 From e5cb9b6380040e40de1b3766ac90296d3828375a Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 14 Apr 2018 14:10:33 +0900 Subject: Mustache templates: Overload toJson() instead of operator QJsonObject()/QJsonValue() It slightly reduces the header interface and shortcuts the actual call chain (not that it had any performance implications, just easier reasoning). --- lib/jobs/{{base}}.cpp.mustache | 36 +++++++++++++++++++++--------------- lib/jobs/{{base}}.h.mustache | 4 ++-- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/lib/jobs/{{base}}.cpp.mustache b/lib/jobs/{{base}}.cpp.mustache index 5e94dcf0..e44e6a2a 100644 --- a/lib/jobs/{{base}}.cpp.mustache +++ b/lib/jobs/{{base}}.cpp.mustache @@ -8,12 +8,15 @@ {{/operations}} using namespace QMatrixClient; {{#models.model}}{{^trivial?}} -{{qualifiedName}}::operator QJsonValue() const +namespace QMatrixClient { - QJsonObject o; - {{#vars}}o.insert("{{baseName}}", toJson({{nameCamelCase}})); - {{/vars}} - return o; + QJsonObject toJson(const {{qualifiedName}}& pod) + { + QJsonObject o; + {{#vars}}o.insert("{{baseName}}", toJson(pod.{{nameCamelCase}})); + {{/vars}} + return o; + } } {{qualifiedName}} FromJson<{{qualifiedName}}>::operator()(QJsonValue jv) @@ -28,15 +31,16 @@ using namespace QMatrixClient; {{/trivial?}}{{/models.model}}{{#operations}} static const auto basePath = QStringLiteral("{{basePathWithoutHost}}"); {{# operation}}{{#models.model}}{{^trivial?}} -{{qualifiedName}}::operator QJsonObject() const -{ - QJsonObject o; - {{#vars}}o.insert("{{baseName}}", toJson({{nameCamelCase}})); - {{/vars}} - return o; -} namespace QMatrixClient { + QJsonObject toJson(const {{qualifiedName}}& pod) + { + QJsonObject o; + {{#vars}}o.insert("{{baseName}}", toJson(pod.{{nameCamelCase}})); + {{/vars}} + return o; + } + template <> struct FromJson<{{qualifiedName}}> { {{qualifiedName}} operator()(QJsonValue jv) @@ -81,9 +85,11 @@ QUrl {{camelCaseOperationId}}Job::makeRequestUrl(QUrl baseUrl{{#allParams?}}, {{ { {{#headerParams?}}{{#headerParams}} setRequestHeader("{{baseName}}", {{paramName}}.toLatin1()); {{/headerParams}} -{{/headerParams?}}{{! -}}{{#bodyParams?}}{{! -}}{{#inlineBody}} setRequestData(Data({{nameCamelCase}}));{{/inlineBody}}{{! +{{/headerParams? +}}{{#bodyParams? +}}{{#inlineBody}} setRequestData(Data({{! + }}{{#consumesNonJson?}}{{nameCamelCase}}{{/consumesNonJson? + }}{{^consumesNonJson?}}toJson({{nameCamelCase}}){{/consumesNonJson?}}));{{/inlineBody }}{{^inlineBody}} QJsonObject _data;{{#bodyParams}} {{^required?}}{{#string?}} if (!{{paramName}}.isEmpty()) {{/string?}}{{/required?}} _data.insert("{{baseName}}", toJson({{paramName}}));{{/bodyParams}} diff --git a/lib/jobs/{{base}}.h.mustache b/lib/jobs/{{base}}.h.mustache index 12633604..8606e251 100644 --- a/lib/jobs/{{base}}.h.mustache +++ b/lib/jobs/{{base}}.h.mustache @@ -17,9 +17,10 @@ namespace QMatrixClient { {{#vars}}{{dataType.name}} {{nameCamelCase}}; {{/vars}} - operator QJsonObject() const; }; + QJsonObject toJson(const {{name}}& pod); + template <> struct FromJson<{{name}}> { {{name}} operator()(QJsonValue jv); @@ -38,7 +39,6 @@ namespace QMatrixClient { {{#vars}}{{dataType.name}} {{nameCamelCase}}; {{/vars}} - operator QJsonObject() const; }; {{/ trivial?}}{{/model}} // End of inner data structures -- cgit v1.2.3 From 4ced9792f27ed3d891c1f7772ae30d9fe452dd79 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 14 Apr 2018 14:12:03 +0900 Subject: jobs/generated: Overload toJson() instead of operator QJsonObject()/QJsonValue() It slightly reduces the header interface and shortcuts the actual call chain (not that it had any performance implications, just easier reasoning). --- lib/jobs/generated/account-data.cpp | 4 +- lib/jobs/generated/administrative_contact.cpp | 36 ++++---- lib/jobs/generated/administrative_contact.h | 2 - lib/jobs/generated/create_room.cpp | 38 +++++---- lib/jobs/generated/create_room.h | 2 - lib/jobs/generated/list_public_rooms.cpp | 116 ++++++++++++++++++-------- lib/jobs/generated/list_public_rooms.h | 32 ++++++- lib/jobs/generated/pusher.cpp | 59 ++++++------- lib/jobs/generated/pusher.h | 3 - lib/jobs/generated/receipts.cpp | 2 +- lib/jobs/generated/room_send.cpp | 2 +- lib/jobs/generated/tags.cpp | 2 +- lib/jobs/generated/users.cpp | 19 +++-- lib/jobs/generated/users.h | 1 - 14 files changed, 195 insertions(+), 123 deletions(-) diff --git a/lib/jobs/generated/account-data.cpp b/lib/jobs/generated/account-data.cpp index 35ee94c0..ac45cb85 100644 --- a/lib/jobs/generated/account-data.cpp +++ b/lib/jobs/generated/account-data.cpp @@ -16,13 +16,13 @@ SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type, : BaseJob(HttpVerb::Put, "SetAccountDataJob", basePath % "/user/" % userId % "/account_data/" % type) { - setRequestData(Data(content)); + setRequestData(Data(toJson(content))); } SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type, const QJsonObject& content) : BaseJob(HttpVerb::Put, "SetAccountDataPerRoomJob", basePath % "/user/" % userId % "/rooms/" % roomId % "/account_data/" % type) { - setRequestData(Data(content)); + setRequestData(Data(toJson(content))); } diff --git a/lib/jobs/generated/administrative_contact.cpp b/lib/jobs/generated/administrative_contact.cpp index 1af57941..78eb21fe 100644 --- a/lib/jobs/generated/administrative_contact.cpp +++ b/lib/jobs/generated/administrative_contact.cpp @@ -10,16 +10,17 @@ using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -GetAccount3PIDsJob::ThirdPartyIdentifier::operator QJsonObject() const -{ - QJsonObject o; - o.insert("medium", toJson(medium)); - o.insert("address", toJson(address)); - - return o; -} namespace QMatrixClient { + QJsonObject toJson(const GetAccount3PIDsJob::ThirdPartyIdentifier& pod) + { + QJsonObject o; + o.insert("medium", toJson(pod.medium)); + o.insert("address", toJson(pod.address)); + + return o; + } + template <> struct FromJson { GetAccount3PIDsJob::ThirdPartyIdentifier operator()(QJsonValue jv) @@ -69,17 +70,18 @@ BaseJob::Status GetAccount3PIDsJob::parseJson(const QJsonDocument& data) return Success; } -Post3PIDsJob::ThreePidCredentials::operator QJsonObject() const -{ - QJsonObject o; - o.insert("client_secret", toJson(clientSecret)); - o.insert("id_server", toJson(idServer)); - o.insert("sid", toJson(sid)); - - return o; -} namespace QMatrixClient { + QJsonObject toJson(const Post3PIDsJob::ThreePidCredentials& pod) + { + QJsonObject o; + o.insert("client_secret", toJson(pod.clientSecret)); + o.insert("id_server", toJson(pod.idServer)); + o.insert("sid", toJson(pod.sid)); + + return o; + } + template <> struct FromJson { Post3PIDsJob::ThreePidCredentials operator()(QJsonValue jv) diff --git a/lib/jobs/generated/administrative_contact.h b/lib/jobs/generated/administrative_contact.h index c8429d39..bd70f07b 100644 --- a/lib/jobs/generated/administrative_contact.h +++ b/lib/jobs/generated/administrative_contact.h @@ -24,7 +24,6 @@ namespace QMatrixClient QString medium; QString address; - operator QJsonObject() const; }; // End of inner data structures @@ -60,7 +59,6 @@ namespace QMatrixClient QString idServer; QString sid; - operator QJsonObject() const; }; // End of inner data structures diff --git a/lib/jobs/generated/create_room.cpp b/lib/jobs/generated/create_room.cpp index de7807b5..008bc697 100644 --- a/lib/jobs/generated/create_room.cpp +++ b/lib/jobs/generated/create_room.cpp @@ -10,17 +10,18 @@ using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -CreateRoomJob::Invite3pid::operator QJsonObject() const -{ - QJsonObject o; - o.insert("id_server", toJson(idServer)); - o.insert("medium", toJson(medium)); - o.insert("address", toJson(address)); - - return o; -} namespace QMatrixClient { + QJsonObject toJson(const CreateRoomJob::Invite3pid& pod) + { + QJsonObject o; + o.insert("id_server", toJson(pod.idServer)); + o.insert("medium", toJson(pod.medium)); + o.insert("address", toJson(pod.address)); + + return o; + } + template <> struct FromJson { CreateRoomJob::Invite3pid operator()(QJsonValue jv) @@ -39,17 +40,18 @@ namespace QMatrixClient }; } // namespace QMatrixClient -CreateRoomJob::StateEvent::operator QJsonObject() const -{ - QJsonObject o; - o.insert("type", toJson(type)); - o.insert("state_key", toJson(stateKey)); - o.insert("content", toJson(content)); - - return o; -} namespace QMatrixClient { + QJsonObject toJson(const CreateRoomJob::StateEvent& pod) + { + QJsonObject o; + o.insert("type", toJson(pod.type)); + o.insert("state_key", toJson(pod.stateKey)); + o.insert("content", toJson(pod.content)); + + return o; + } + template <> struct FromJson { CreateRoomJob::StateEvent operator()(QJsonValue jv) diff --git a/lib/jobs/generated/create_room.h b/lib/jobs/generated/create_room.h index b479615a..fdb11ada 100644 --- a/lib/jobs/generated/create_room.h +++ b/lib/jobs/generated/create_room.h @@ -26,7 +26,6 @@ namespace QMatrixClient QString medium; QString address; - operator QJsonObject() const; }; struct StateEvent @@ -35,7 +34,6 @@ namespace QMatrixClient QString stateKey; QJsonObject content; - operator QJsonObject() const; }; // End of inner data structures diff --git a/lib/jobs/generated/list_public_rooms.cpp b/lib/jobs/generated/list_public_rooms.cpp index 39653300..2ae7f5d3 100644 --- a/lib/jobs/generated/list_public_rooms.cpp +++ b/lib/jobs/generated/list_public_rooms.cpp @@ -10,23 +10,67 @@ using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -GetPublicRoomsJob::PublicRoomsChunk::operator QJsonObject() const +class GetRoomVisibilityOnDirectoryJob::Private { - QJsonObject o; - o.insert("aliases", toJson(aliases)); - o.insert("canonical_alias", toJson(canonicalAlias)); - o.insert("name", toJson(name)); - o.insert("num_joined_members", toJson(numJoinedMembers)); - o.insert("room_id", toJson(roomId)); - o.insert("topic", toJson(topic)); - o.insert("world_readable", toJson(worldReadable)); - o.insert("guest_can_join", toJson(guestCanJoin)); - o.insert("avatar_url", toJson(avatarUrl)); - - return o; + public: + QString visibility; +}; + +QUrl GetRoomVisibilityOnDirectoryJob::makeRequestUrl(QUrl baseUrl, const QString& roomId) +{ + return BaseJob::makeRequestUrl(baseUrl, + basePath % "/directory/list/room/" % roomId); +} + +GetRoomVisibilityOnDirectoryJob::GetRoomVisibilityOnDirectoryJob(const QString& roomId) + : BaseJob(HttpVerb::Get, "GetRoomVisibilityOnDirectoryJob", + basePath % "/directory/list/room/" % roomId, false) + , d(new Private) +{ +} + +GetRoomVisibilityOnDirectoryJob::~GetRoomVisibilityOnDirectoryJob() = default; + +const QString& GetRoomVisibilityOnDirectoryJob::visibility() const +{ + return d->visibility; +} + +BaseJob::Status GetRoomVisibilityOnDirectoryJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->visibility = fromJson(json.value("visibility")); + return Success; } + +SetRoomVisibilityOnDirectoryJob::SetRoomVisibilityOnDirectoryJob(const QString& roomId, const QString& visibility) + : BaseJob(HttpVerb::Put, "SetRoomVisibilityOnDirectoryJob", + basePath % "/directory/list/room/" % roomId) +{ + QJsonObject _data; + if (!visibility.isEmpty()) + _data.insert("visibility", toJson(visibility)); + setRequestData(_data); +} + namespace QMatrixClient { + QJsonObject toJson(const GetPublicRoomsJob::PublicRoomsChunk& pod) + { + QJsonObject o; + o.insert("aliases", toJson(pod.aliases)); + o.insert("canonical_alias", toJson(pod.canonicalAlias)); + o.insert("name", toJson(pod.name)); + o.insert("num_joined_members", toJson(pod.numJoinedMembers)); + o.insert("room_id", toJson(pod.roomId)); + o.insert("topic", toJson(pod.topic)); + o.insert("world_readable", toJson(pod.worldReadable)); + o.insert("guest_can_join", toJson(pod.guestCanJoin)); + o.insert("avatar_url", toJson(pod.avatarUrl)); + + return o; + } + template <> struct FromJson { GetPublicRoomsJob::PublicRoomsChunk operator()(QJsonValue jv) @@ -128,15 +172,16 @@ BaseJob::Status GetPublicRoomsJob::parseJson(const QJsonDocument& data) return Success; } -QueryPublicRoomsJob::Filter::operator QJsonObject() const -{ - QJsonObject o; - o.insert("generic_search_term", toJson(genericSearchTerm)); - - return o; -} namespace QMatrixClient { + QJsonObject toJson(const QueryPublicRoomsJob::Filter& pod) + { + QJsonObject o; + o.insert("generic_search_term", toJson(pod.genericSearchTerm)); + + return o; + } + template <> struct FromJson { QueryPublicRoomsJob::Filter operator()(QJsonValue jv) @@ -151,23 +196,24 @@ namespace QMatrixClient }; } // namespace QMatrixClient -QueryPublicRoomsJob::PublicRoomsChunk::operator QJsonObject() const -{ - QJsonObject o; - o.insert("aliases", toJson(aliases)); - o.insert("canonical_alias", toJson(canonicalAlias)); - o.insert("name", toJson(name)); - o.insert("num_joined_members", toJson(numJoinedMembers)); - o.insert("room_id", toJson(roomId)); - o.insert("topic", toJson(topic)); - o.insert("world_readable", toJson(worldReadable)); - o.insert("guest_can_join", toJson(guestCanJoin)); - o.insert("avatar_url", toJson(avatarUrl)); - - return o; -} namespace QMatrixClient { + QJsonObject toJson(const QueryPublicRoomsJob::PublicRoomsChunk& pod) + { + QJsonObject o; + o.insert("aliases", toJson(pod.aliases)); + o.insert("canonical_alias", toJson(pod.canonicalAlias)); + o.insert("name", toJson(pod.name)); + o.insert("num_joined_members", toJson(pod.numJoinedMembers)); + o.insert("room_id", toJson(pod.roomId)); + o.insert("topic", toJson(pod.topic)); + o.insert("world_readable", toJson(pod.worldReadable)); + o.insert("guest_can_join", toJson(pod.guestCanJoin)); + o.insert("avatar_url", toJson(pod.avatarUrl)); + + return o; + } + template <> struct FromJson { QueryPublicRoomsJob::PublicRoomsChunk operator()(QJsonValue jv) diff --git a/lib/jobs/generated/list_public_rooms.h b/lib/jobs/generated/list_public_rooms.h index 5c281de3..c8adccb4 100644 --- a/lib/jobs/generated/list_public_rooms.h +++ b/lib/jobs/generated/list_public_rooms.h @@ -14,6 +14,35 @@ namespace QMatrixClient { // Operations + class GetRoomVisibilityOnDirectoryJob : public BaseJob + { + public: + /** Construct a URL out of baseUrl and usual parameters passed to + * GetRoomVisibilityOnDirectoryJob. This function can be used when + * a URL for GetRoomVisibilityOnDirectoryJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId); + + explicit GetRoomVisibilityOnDirectoryJob(const QString& roomId); + ~GetRoomVisibilityOnDirectoryJob() override; + + const QString& visibility() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class SetRoomVisibilityOnDirectoryJob : public BaseJob + { + public: + explicit SetRoomVisibilityOnDirectoryJob(const QString& roomId, const QString& visibility = {}); + }; + class GetPublicRoomsJob : public BaseJob { public: @@ -31,7 +60,6 @@ namespace QMatrixClient bool guestCanJoin; QString avatarUrl; - operator QJsonObject() const; }; // End of inner data structures @@ -68,7 +96,6 @@ namespace QMatrixClient { QString genericSearchTerm; - operator QJsonObject() const; }; struct PublicRoomsChunk @@ -83,7 +110,6 @@ namespace QMatrixClient bool guestCanJoin; QString avatarUrl; - operator QJsonObject() const; }; // End of inner data structures diff --git a/lib/jobs/generated/pusher.cpp b/lib/jobs/generated/pusher.cpp index 4fddac45..2937c124 100644 --- a/lib/jobs/generated/pusher.cpp +++ b/lib/jobs/generated/pusher.cpp @@ -10,15 +10,16 @@ using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -GetPushersJob::PusherData::operator QJsonObject() const -{ - QJsonObject o; - o.insert("url", toJson(url)); - - return o; -} namespace QMatrixClient { + QJsonObject toJson(const GetPushersJob::PusherData& pod) + { + QJsonObject o; + o.insert("url", toJson(pod.url)); + + return o; + } + template <> struct FromJson { GetPushersJob::PusherData operator()(QJsonValue jv) @@ -33,22 +34,23 @@ namespace QMatrixClient }; } // namespace QMatrixClient -GetPushersJob::Pusher::operator QJsonObject() const -{ - QJsonObject o; - o.insert("pushkey", toJson(pushkey)); - o.insert("kind", toJson(kind)); - o.insert("app_id", toJson(appId)); - o.insert("app_display_name", toJson(appDisplayName)); - o.insert("device_display_name", toJson(deviceDisplayName)); - o.insert("profile_tag", toJson(profileTag)); - o.insert("lang", toJson(lang)); - o.insert("data", toJson(data)); - - return o; -} namespace QMatrixClient { + QJsonObject toJson(const GetPushersJob::Pusher& pod) + { + QJsonObject o; + o.insert("pushkey", toJson(pod.pushkey)); + o.insert("kind", toJson(pod.kind)); + o.insert("app_id", toJson(pod.appId)); + o.insert("app_display_name", toJson(pod.appDisplayName)); + o.insert("device_display_name", toJson(pod.deviceDisplayName)); + o.insert("profile_tag", toJson(pod.profileTag)); + o.insert("lang", toJson(pod.lang)); + o.insert("data", toJson(pod.data)); + + return o; + } + template <> struct FromJson { GetPushersJob::Pusher operator()(QJsonValue jv) @@ -110,15 +112,16 @@ BaseJob::Status GetPushersJob::parseJson(const QJsonDocument& data) return Success; } -PostPusherJob::PusherData::operator QJsonObject() const -{ - QJsonObject o; - o.insert("url", toJson(url)); - - return o; -} namespace QMatrixClient { + QJsonObject toJson(const PostPusherJob::PusherData& pod) + { + QJsonObject o; + o.insert("url", toJson(pod.url)); + + return o; + } + template <> struct FromJson { PostPusherJob::PusherData operator()(QJsonValue jv) diff --git a/lib/jobs/generated/pusher.h b/lib/jobs/generated/pusher.h index 36576996..23cd3fb6 100644 --- a/lib/jobs/generated/pusher.h +++ b/lib/jobs/generated/pusher.h @@ -23,7 +23,6 @@ namespace QMatrixClient { QString url; - operator QJsonObject() const; }; struct Pusher @@ -37,7 +36,6 @@ namespace QMatrixClient QString lang; PusherData data; - operator QJsonObject() const; }; // End of inner data structures @@ -71,7 +69,6 @@ namespace QMatrixClient { QString url; - operator QJsonObject() const; }; // End of inner data structures diff --git a/lib/jobs/generated/receipts.cpp b/lib/jobs/generated/receipts.cpp index 83c38b6f..945e8673 100644 --- a/lib/jobs/generated/receipts.cpp +++ b/lib/jobs/generated/receipts.cpp @@ -16,6 +16,6 @@ PostReceiptJob::PostReceiptJob(const QString& roomId, const QString& receiptType : BaseJob(HttpVerb::Post, "PostReceiptJob", basePath % "/rooms/" % roomId % "/receipt/" % receiptType % "/" % eventId) { - setRequestData(Data(receipt)); + setRequestData(Data(toJson(receipt))); } diff --git a/lib/jobs/generated/room_send.cpp b/lib/jobs/generated/room_send.cpp index c9a3280d..9637a205 100644 --- a/lib/jobs/generated/room_send.cpp +++ b/lib/jobs/generated/room_send.cpp @@ -23,7 +23,7 @@ SendMessageJob::SendMessageJob(const QString& roomId, const QString& eventType, basePath % "/rooms/" % roomId % "/send/" % eventType % "/" % txnId) , d(new Private) { - setRequestData(Data(body)); + setRequestData(Data(toJson(body))); } SendMessageJob::~SendMessageJob() = default; diff --git a/lib/jobs/generated/tags.cpp b/lib/jobs/generated/tags.cpp index dc4faf04..ef3b5f34 100644 --- a/lib/jobs/generated/tags.cpp +++ b/lib/jobs/generated/tags.cpp @@ -49,7 +49,7 @@ SetRoomTagJob::SetRoomTagJob(const QString& userId, const QString& roomId, const : BaseJob(HttpVerb::Put, "SetRoomTagJob", basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag) { - setRequestData(Data(body)); + setRequestData(Data(toJson(body))); } QUrl DeleteRoomTagJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& tag) diff --git a/lib/jobs/generated/users.cpp b/lib/jobs/generated/users.cpp index 33da4b43..b222cac5 100644 --- a/lib/jobs/generated/users.cpp +++ b/lib/jobs/generated/users.cpp @@ -10,17 +10,18 @@ using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -SearchUserDirectoryJob::User::operator QJsonObject() const -{ - QJsonObject o; - o.insert("user_id", toJson(userId)); - o.insert("display_name", toJson(displayName)); - o.insert("avatar_url", toJson(avatarUrl)); - - return o; -} namespace QMatrixClient { + QJsonObject toJson(const SearchUserDirectoryJob::User& pod) + { + QJsonObject o; + o.insert("user_id", toJson(pod.userId)); + o.insert("display_name", toJson(pod.displayName)); + o.insert("avatar_url", toJson(pod.avatarUrl)); + + return o; + } + template <> struct FromJson { SearchUserDirectoryJob::User operator()(QJsonValue jv) diff --git a/lib/jobs/generated/users.h b/lib/jobs/generated/users.h index 7be250a5..ce7f5aba 100644 --- a/lib/jobs/generated/users.h +++ b/lib/jobs/generated/users.h @@ -25,7 +25,6 @@ namespace QMatrixClient QString displayName; QString avatarUrl; - operator QJsonObject() const; }; // End of inner data structures -- cgit v1.2.3 From 7c9037bdf4c2f6fee5d800d87e7f9dd9b4070990 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 30 Apr 2018 22:14:41 +0900 Subject: ConnectionsGuard: suppress the copying assignment operator It accidentally leaked through using QPointer::operator= --- lib/util.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/util.h b/lib/util.h index 7ab1e20d..2a323cf3 100644 --- a/lib/util.h +++ b/lib/util.h @@ -78,6 +78,7 @@ namespace QMatrixClient } ConnectionsGuard(ConnectionsGuard&&) noexcept = default; ConnectionsGuard& operator=(ConnectionsGuard&&) noexcept = default; + ConnectionsGuard& operator=(const ConnectionsGuard&) = delete; using QPointer::operator=; private: -- cgit v1.2.3 From 228d379967ca0627564e1db5669029792f72bf06 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 30 Apr 2018 22:15:39 +0900 Subject: Mustache templates: cleanup C++ --- lib/jobs/{{base}}.cpp.mustache | 10 +++++----- lib/jobs/{{base}}.h.mustache | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/jobs/{{base}}.cpp.mustache b/lib/jobs/{{base}}.cpp.mustache index e44e6a2a..87205caa 100644 --- a/lib/jobs/{{base}}.cpp.mustache +++ b/lib/jobs/{{base}}.cpp.mustache @@ -19,9 +19,9 @@ namespace QMatrixClient } } -{{qualifiedName}} FromJson<{{qualifiedName}}>::operator()(QJsonValue jv) +{{qualifiedName}} FromJson<{{qualifiedName}}>::operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); {{qualifiedName}} result; {{#vars}}result.{{nameCamelCase}} = fromJson<{{dataType.name}}>(o.value("{{baseName}}")); @@ -43,12 +43,12 @@ namespace QMatrixClient template <> struct FromJson<{{qualifiedName}}> { - {{qualifiedName}} operator()(QJsonValue jv) + {{qualifiedName}} operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); {{qualifiedName}} result; {{#vars}}result.{{nameCamelCase}} = - fromJson<{{dataType.qualifiedName}}>(o.value("{{baseName}}")); + fromJson<{{dataType.qualifiedName}}>(o.value("{{baseName}}")); {{/vars}} return result; } diff --git a/lib/jobs/{{base}}.h.mustache b/lib/jobs/{{base}}.h.mustache index 8606e251..941662de 100644 --- a/lib/jobs/{{base}}.h.mustache +++ b/lib/jobs/{{base}}.h.mustache @@ -23,7 +23,7 @@ namespace QMatrixClient template <> struct FromJson<{{name}}> { - {{name}} operator()(QJsonValue jv); + {{name}} operator()(const QJsonValue& jv); }; {{/ trivial?}}{{/model}} {{/models}}{{#operations}} // Operations -- cgit v1.2.3 From cbb7c2d7eff7ac8724d766ade2c3e659d15d97e2 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 30 Apr 2018 22:17:04 +0900 Subject: jobs/generated: cleanup C++ --- lib/jobs/generated/administrative_contact.cpp | 18 +++++----- lib/jobs/generated/create_room.cpp | 20 +++++------ lib/jobs/generated/list_public_rooms.cpp | 50 +++++++++++++-------------- lib/jobs/generated/pusher.cpp | 32 ++++++++--------- lib/jobs/generated/users.cpp | 10 +++--- 5 files changed, 65 insertions(+), 65 deletions(-) diff --git a/lib/jobs/generated/administrative_contact.cpp b/lib/jobs/generated/administrative_contact.cpp index 78eb21fe..fc75fd85 100644 --- a/lib/jobs/generated/administrative_contact.cpp +++ b/lib/jobs/generated/administrative_contact.cpp @@ -23,14 +23,14 @@ namespace QMatrixClient template <> struct FromJson { - GetAccount3PIDsJob::ThirdPartyIdentifier operator()(QJsonValue jv) + GetAccount3PIDsJob::ThirdPartyIdentifier operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); GetAccount3PIDsJob::ThirdPartyIdentifier result; result.medium = - fromJson(o.value("medium")); + fromJson(o.value("medium")); result.address = - fromJson(o.value("address")); + fromJson(o.value("address")); return result; } @@ -84,16 +84,16 @@ namespace QMatrixClient template <> struct FromJson { - Post3PIDsJob::ThreePidCredentials operator()(QJsonValue jv) + Post3PIDsJob::ThreePidCredentials operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); Post3PIDsJob::ThreePidCredentials result; result.clientSecret = - fromJson(o.value("client_secret")); + fromJson(o.value("client_secret")); result.idServer = - fromJson(o.value("id_server")); + fromJson(o.value("id_server")); result.sid = - fromJson(o.value("sid")); + fromJson(o.value("sid")); return result; } diff --git a/lib/jobs/generated/create_room.cpp b/lib/jobs/generated/create_room.cpp index 008bc697..4fc75974 100644 --- a/lib/jobs/generated/create_room.cpp +++ b/lib/jobs/generated/create_room.cpp @@ -24,16 +24,16 @@ namespace QMatrixClient template <> struct FromJson { - CreateRoomJob::Invite3pid operator()(QJsonValue jv) + CreateRoomJob::Invite3pid operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); CreateRoomJob::Invite3pid result; result.idServer = - fromJson(o.value("id_server")); + fromJson(o.value("id_server")); result.medium = - fromJson(o.value("medium")); + fromJson(o.value("medium")); result.address = - fromJson(o.value("address")); + fromJson(o.value("address")); return result; } @@ -54,16 +54,16 @@ namespace QMatrixClient template <> struct FromJson { - CreateRoomJob::StateEvent operator()(QJsonValue jv) + CreateRoomJob::StateEvent operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); CreateRoomJob::StateEvent result; result.type = - fromJson(o.value("type")); + fromJson(o.value("type")); result.stateKey = - fromJson(o.value("state_key")); + fromJson(o.value("state_key")); result.content = - fromJson(o.value("content")); + fromJson(o.value("content")); return result; } diff --git a/lib/jobs/generated/list_public_rooms.cpp b/lib/jobs/generated/list_public_rooms.cpp index 2ae7f5d3..35a670fb 100644 --- a/lib/jobs/generated/list_public_rooms.cpp +++ b/lib/jobs/generated/list_public_rooms.cpp @@ -73,28 +73,28 @@ namespace QMatrixClient template <> struct FromJson { - GetPublicRoomsJob::PublicRoomsChunk operator()(QJsonValue jv) + GetPublicRoomsJob::PublicRoomsChunk operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); GetPublicRoomsJob::PublicRoomsChunk result; result.aliases = - fromJson>(o.value("aliases")); + fromJson>(o.value("aliases")); result.canonicalAlias = - fromJson(o.value("canonical_alias")); + fromJson(o.value("canonical_alias")); result.name = - fromJson(o.value("name")); + fromJson(o.value("name")); result.numJoinedMembers = - fromJson(o.value("num_joined_members")); + fromJson(o.value("num_joined_members")); result.roomId = - fromJson(o.value("room_id")); + fromJson(o.value("room_id")); result.topic = - fromJson(o.value("topic")); + fromJson(o.value("topic")); result.worldReadable = - fromJson(o.value("world_readable")); + fromJson(o.value("world_readable")); result.guestCanJoin = - fromJson(o.value("guest_can_join")); + fromJson(o.value("guest_can_join")); result.avatarUrl = - fromJson(o.value("avatar_url")); + fromJson(o.value("avatar_url")); return result; } @@ -184,12 +184,12 @@ namespace QMatrixClient template <> struct FromJson { - QueryPublicRoomsJob::Filter operator()(QJsonValue jv) + QueryPublicRoomsJob::Filter operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); QueryPublicRoomsJob::Filter result; result.genericSearchTerm = - fromJson(o.value("generic_search_term")); + fromJson(o.value("generic_search_term")); return result; } @@ -216,28 +216,28 @@ namespace QMatrixClient template <> struct FromJson { - QueryPublicRoomsJob::PublicRoomsChunk operator()(QJsonValue jv) + QueryPublicRoomsJob::PublicRoomsChunk operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); QueryPublicRoomsJob::PublicRoomsChunk result; result.aliases = - fromJson>(o.value("aliases")); + fromJson>(o.value("aliases")); result.canonicalAlias = - fromJson(o.value("canonical_alias")); + fromJson(o.value("canonical_alias")); result.name = - fromJson(o.value("name")); + fromJson(o.value("name")); result.numJoinedMembers = - fromJson(o.value("num_joined_members")); + fromJson(o.value("num_joined_members")); result.roomId = - fromJson(o.value("room_id")); + fromJson(o.value("room_id")); result.topic = - fromJson(o.value("topic")); + fromJson(o.value("topic")); result.worldReadable = - fromJson(o.value("world_readable")); + fromJson(o.value("world_readable")); result.guestCanJoin = - fromJson(o.value("guest_can_join")); + fromJson(o.value("guest_can_join")); result.avatarUrl = - fromJson(o.value("avatar_url")); + fromJson(o.value("avatar_url")); return result; } diff --git a/lib/jobs/generated/pusher.cpp b/lib/jobs/generated/pusher.cpp index 2937c124..4a9bde95 100644 --- a/lib/jobs/generated/pusher.cpp +++ b/lib/jobs/generated/pusher.cpp @@ -22,12 +22,12 @@ namespace QMatrixClient template <> struct FromJson { - GetPushersJob::PusherData operator()(QJsonValue jv) + GetPushersJob::PusherData operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); GetPushersJob::PusherData result; result.url = - fromJson(o.value("url")); + fromJson(o.value("url")); return result; } @@ -53,26 +53,26 @@ namespace QMatrixClient template <> struct FromJson { - GetPushersJob::Pusher operator()(QJsonValue jv) + GetPushersJob::Pusher operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); GetPushersJob::Pusher result; result.pushkey = - fromJson(o.value("pushkey")); + fromJson(o.value("pushkey")); result.kind = - fromJson(o.value("kind")); + fromJson(o.value("kind")); result.appId = - fromJson(o.value("app_id")); + fromJson(o.value("app_id")); result.appDisplayName = - fromJson(o.value("app_display_name")); + fromJson(o.value("app_display_name")); result.deviceDisplayName = - fromJson(o.value("device_display_name")); + fromJson(o.value("device_display_name")); result.profileTag = - fromJson(o.value("profile_tag")); + fromJson(o.value("profile_tag")); result.lang = - fromJson(o.value("lang")); + fromJson(o.value("lang")); result.data = - fromJson(o.value("data")); + fromJson(o.value("data")); return result; } @@ -124,12 +124,12 @@ namespace QMatrixClient template <> struct FromJson { - PostPusherJob::PusherData operator()(QJsonValue jv) + PostPusherJob::PusherData operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); PostPusherJob::PusherData result; result.url = - fromJson(o.value("url")); + fromJson(o.value("url")); return result; } diff --git a/lib/jobs/generated/users.cpp b/lib/jobs/generated/users.cpp index b222cac5..6af3be3c 100644 --- a/lib/jobs/generated/users.cpp +++ b/lib/jobs/generated/users.cpp @@ -24,16 +24,16 @@ namespace QMatrixClient template <> struct FromJson { - SearchUserDirectoryJob::User operator()(QJsonValue jv) + SearchUserDirectoryJob::User operator()(const QJsonValue& jv) { - QJsonObject o = jv.toObject(); + const auto& o = jv.toObject(); SearchUserDirectoryJob::User result; result.userId = - fromJson(o.value("user_id")); + fromJson(o.value("user_id")); result.displayName = - fromJson(o.value("display_name")); + fromJson(o.value("display_name")); result.avatarUrl = - fromJson(o.value("avatar_url")); + fromJson(o.value("avatar_url")); return result; } -- cgit v1.2.3 From dbb70c537f017e94bd7e97c05357e89f38f6e69c Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 30 Apr 2018 22:18:17 +0900 Subject: gtad.yaml: Migrate to GTAD 0.5 config format --- lib/jobs/gtad.yaml | 160 +++++++++++++++++++++++++++-------------------------- 1 file changed, 81 insertions(+), 79 deletions(-) diff --git a/lib/jobs/gtad.yaml b/lib/jobs/gtad.yaml index 78c879e4..7cfbab8f 100644 --- a/lib/jobs/gtad.yaml +++ b/lib/jobs/gtad.yaml @@ -1,87 +1,89 @@ -preprocess: - "%CLIENT_RELEASE_LABEL%": r0 - "%CLIENT_MAJOR_VERSION%": r0 - # FIXME: the below only fixes C++ compilation but not actual work - the code - # will try to reach out for wrong values in JSON payloads - #"signed:": "signedData:" - #"unsigned:": "unsignedData:" - #"default:": "isDefault:" +analyzer: + subst: + "%CLIENT_RELEASE_LABEL%": r0 + "%CLIENT_MAJOR_VERSION%": r0 + identifiers: + signed: signedData + unsigned: unsignedData + default: isDefault + origin_server_ts: originServerTimestamp -# Structure: -# swaggerType: -# OR -# swaggerType: -# - swaggerFormat: -# - /swaggerFormatRegEx/: -# - //: # default, if the format doesn't mach anything above -# WHERE -# targetTypeSpec = targetType OR -# { type: targetType, imports: , } -types: - integer: - - int64: qint64 - - int32: qint32 - - //: int - number: - - float: float - - //: double - boolean: { type: bool, initializer: false } - string: - - byte: &ByteStream - type: QIODevice* - #initializer: '"{{defaultValue}}"' - #string?: true - imports: - - binary: *ByteStream - - date: - type: QDate - initializer: QDate::fromString("{{defaultValue}}") + types: + # Structure: + # swaggerType: + # OR + # swaggerType: + # - swaggerFormat: + # - /swaggerFormatRegEx/: + # - //: # default, if the format doesn't mach anything above + # WHERE + # targetTypeSpec = targetType OR + # { type: targetType, imports: , } + integer: + - int64: qint64 + - int32: qint32 + - //: int + number: + - float: float + - //: double + boolean: { type: bool, initializer: false } + string: + - byte: &ByteStream + type: QIODevice* + #initializer: '"{{defaultValue}}"' + #string?: true + imports: + - binary: *ByteStream + - date: + type: QDate + initializer: QDate::fromString("{{defaultValue}}") + avoidCopy?: true + imports: + - dateTime: + type: QDateTime + initializer: QDateTime::fromString("{{defaultValue}}") + avoidCopy?: true + imports: + - //: + type: QString + initializer: QStringLiteral("{{defaultValue}}") + string?: true + avoidCopy?: true + file: *ByteStream + object: + type: QJsonObject avoidCopy?: true - imports: - - dateTime: - type: QDateTime - initializer: QDateTime::fromString("{{defaultValue}}") + imports: + array: + - /.+/: + type: "QVector<{{1}}>" + avoidCopy?: true + imports: + - //: { type: QJsonArray, "avoidCopy?": true, imports: } + schema: avoidCopy?: true - imports: - - //: - type: QString - initializer: QStringLiteral("{{defaultValue}}") - string?: true - avoidCopy?: true - file: *ByteStream - object: - type: QJsonObject - avoidCopy?: true - imports: - array: - - /.+/: - type: "QVector<{{1}}>" - avoidCopy?: true - imports: - - //: { type: QJsonArray, "avoidCopy?": true, imports: } - schema: - avoidCopy?: true -#operations: + #operations: -env: - _scopeRenderer: "{{scopeCamelCase}}Job::" - _literalQuote: '"' - maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}" - qualifiedMaybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}" - initializeDefaultValue: "{{#defaultValue}}{{>initializer}}{{/defaultValue}}{{^defaultValue}}{}{{/defaultValue}}" - joinedParamDecl: '{{>maybeCrefType}} {{paramName}}{{^required?}} = {{>initializeDefaultValue}}{{/required?}}{{#@join}}, {{/@join}}' - joinedParamDef: '{{>maybeCrefType}} {{paramName}}{{#@join}}, {{/@join}}' - passQueryParams: '{{#queryParams}}{{paramName}}{{#@join}}, {{/@join}}{{/queryParams}}' - paramToString: '{{#string?}}{{nameCamelCase}}{{/string?}}{{^string?}}QString("%1").arg({{nameCamelCase}}){{/string?}}' -# preamble: preamble.mustache - copyrightName: Kitsune Ral - copyrightEmail: -# imports: { set: } +mustache: + definitions: + _scopeRenderer: "{{scopeCamelCase}}Job::" + _literalQuote: '"' + maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}" + qualifiedMaybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}" + initializeDefaultValue: "{{#defaultValue}}{{>initializer}}{{/defaultValue}}{{^defaultValue}}{}{{/defaultValue}}" + joinedParamDecl: '{{>maybeCrefType}} {{paramName}}{{^required?}} = {{>initializeDefaultValue}}{{/required?}}{{#@join}}, {{/@join}}' + joinedParamDef: '{{>maybeCrefType}} {{paramName}}{{#@join}}, {{/@join}}' + passQueryParams: '{{#queryParams}}{{paramName}}{{#@join}}, {{/@join}}{{/queryParams}}' + paramToString: '{{#string?}}{{nameCamelCase}}{{/string?}}{{^string?}}QString("%1").arg({{nameCamelCase}}){{/string?}}' + # preamble: preamble.mustache + copyrightName: Kitsune Ral + copyrightEmail: + # imports: { set: } -templates: -- "{{base}}.h.mustache" -- "{{base}}.cpp.mustache" + templates: + - "{{base}}.h.mustache" + - "{{base}}.cpp.mustache" -#outFilesList: apifiles.txt + #outFilesList: apifiles.txt -- cgit v1.2.3 From d6c9f76d4c2b27869b8590665a9001ff77477421 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 30 Apr 2018 22:19:00 +0900 Subject: Build systems: add jobs/generated/definitions to the mix --- CMakeLists.txt | 27 ++++++++++++++------------- libqmatrixclient.pri | 2 ++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b966476f..49608f95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,36 +91,37 @@ set(libqmatrixclient_SRCS lib/jobs/downloadfilejob.cpp ) -set(API_DEF_PATH ${MATRIX_DOC_PATH}/api/client-server/) +set(API_DEF_PATH ${MATRIX_DOC_PATH}/api/client-server) file(GLOB_RECURSE API_DEFS RELATIVE ${PROJECT_SOURCE_DIR} ${API_DEF_PATH}/*.yaml ${API_DEF_PATH}/definitions/*.yaml ${MATRIX_DOC_PATH}/event-schemas/schema/* ) -set(JOBS_SRC_DIR lib/jobs) +set(GTAD_CONFIG_DIR lib/jobs) +set(GEN_SRC_DIR lib/jobs/generated) if (MATRIX_DOC_PATH AND GTAD_PATH) add_custom_target(update-api - ${GTAD_PATH} --config ${JOBS_SRC_DIR}/gtad.yaml --out ${JOBS_SRC_DIR}/generated - ${MATRIX_DOC_PATH}/api/client-server + ${GTAD_PATH} --config ${GTAD_CONFIG_DIR}/gtad.yaml --out ${GEN_SRC_DIR} + ${API_DEF_PATH} cas_login_redirect.yaml- cas_login_ticket.yaml- - old_sync.yaml- room_initial_sync.yaml- - sync.yaml- room_state.yaml- - event_context.yaml- joining.yaml- - notifications.yaml- peeking_events.yaml- - pushrules.yaml- rooms.yaml- search.yaml- + old_sync.yaml- room_initial_sync.yaml- # deprecated + sync.yaml- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - SOURCES ${JOBS_SRC_DIR}/gtad.yaml - ${JOBS_SRC_DIR}/{{base}}.h.mustache ${JOBS_SRC_DIR}/{{base}}.cpp.mustache + SOURCES ${GTAD_CONFIG_DIR}/gtad.yaml + ${GTAD_CONFIG_DIR}/{{base}}.h.mustache + ${GTAD_CONFIG_DIR}/{{base}}.cpp.mustache ${API_DEFS} VERBATIM ) endif() -aux_source_directory(${JOBS_SRC_DIR}/generated libqmatrixclient_job_SRCS) +aux_source_directory(${GEN_SRC_DIR} libqmatrixclient_job_SRCS) +aux_source_directory(${GEN_SRC_DIR}/definitions libqmatrixclient_def_SRCS) set(example_SRCS examples/qmc-example.cpp) -add_library(QMatrixClient ${libqmatrixclient_SRCS} ${libqmatrixclient_job_SRCS}) +add_library(QMatrixClient ${libqmatrixclient_SRCS} + ${libqmatrixclient_job_SRCS} ${libqmatrixclient_def_SRCS}) set(API_VERSION "0.2") set_property(TARGET QMatrixClient PROPERTY VERSION "${API_VERSION}.0") set_property(TARGET QMatrixClient PROPERTY SOVERSION 0 ) diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri index edba623e..4a0928b0 100644 --- a/libqmatrixclient.pri +++ b/libqmatrixclient.pri @@ -42,6 +42,7 @@ HEADERS += \ $$SRCPATH/jobs/downloadfilejob.h \ $$SRCPATH/jobs/postreadmarkersjob.h \ $$files($$SRCPATH/jobs/generated/*.h, false) \ + $$files($$SRCPATH/jobs/generated/definitions/*.h, false) \ $$SRCPATH/logging.h \ $$SRCPATH/settings.h \ $$SRCPATH/networksettings.h \ @@ -73,6 +74,7 @@ SOURCES += \ $$SRCPATH/jobs/setroomstatejob.cpp \ $$SRCPATH/jobs/downloadfilejob.cpp \ $$files($$SRCPATH/jobs/generated/*.cpp, false) \ + $$files($$SRCPATH/jobs/generated/definitions/*.cpp, false) \ $$SRCPATH/logging.cpp \ $$SRCPATH/settings.cpp \ $$SRCPATH/networksettings.cpp \ -- cgit v1.2.3 From f79544e0fad0b531d49dba9be001995805f18974 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 30 Apr 2018 22:33:45 +0900 Subject: jobs/generated: GetNotificationsJob --- lib/jobs/generated/notifications.cpp | 182 +++++++++++++++++++++++++++++++++++ lib/jobs/generated/notifications.h | 77 +++++++++++++++ 2 files changed, 259 insertions(+) create mode 100644 lib/jobs/generated/notifications.cpp create mode 100644 lib/jobs/generated/notifications.h diff --git a/lib/jobs/generated/notifications.cpp b/lib/jobs/generated/notifications.cpp new file mode 100644 index 00000000..e3558097 --- /dev/null +++ b/lib/jobs/generated/notifications.cpp @@ -0,0 +1,182 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "notifications.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +namespace QMatrixClient +{ + QJsonObject toJson(const GetNotificationsJob::Unsigned& pod) + { + QJsonObject o; + o.insert("age", toJson(pod.age)); + o.insert("prev_content", toJson(pod.prevContent)); + o.insert("transaction_id", toJson(pod.transactionId)); + o.insert("redacted_because", toJson(pod.redactedBecause)); + + return o; + } + + template <> struct FromJson + { + GetNotificationsJob::Unsigned operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + GetNotificationsJob::Unsigned result; + result.age = + fromJson(o.value("age")); + result.prevContent = + fromJson(o.value("prev_content")); + result.transactionId = + fromJson(o.value("transaction_id")); + result.redactedBecause = + fromJson(o.value("redacted_because")); + + return result; + } + }; +} // namespace QMatrixClient + +namespace QMatrixClient +{ + QJsonObject toJson(const GetNotificationsJob::Event& pod) + { + QJsonObject o; + o.insert("event_id", toJson(pod.eventId)); + o.insert("content", toJson(pod.content)); + o.insert("origin_server_ts", toJson(pod.originServerTimestamp)); + o.insert("sender", toJson(pod.sender)); + o.insert("state_key", toJson(pod.stateKey)); + o.insert("type", toJson(pod.type)); + o.insert("unsigned", toJson(pod.unsignedData)); + + return o; + } + + template <> struct FromJson + { + GetNotificationsJob::Event operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + GetNotificationsJob::Event result; + result.eventId = + fromJson(o.value("event_id")); + result.content = + fromJson(o.value("content")); + result.originServerTimestamp = + fromJson(o.value("origin_server_ts")); + result.sender = + fromJson(o.value("sender")); + result.stateKey = + fromJson(o.value("state_key")); + result.type = + fromJson(o.value("type")); + result.unsignedData = + fromJson(o.value("unsigned")); + + return result; + } + }; +} // namespace QMatrixClient + +namespace QMatrixClient +{ + QJsonObject toJson(const GetNotificationsJob::Notification& pod) + { + QJsonObject o; + o.insert("actions", toJson(pod.actions)); + o.insert("event", toJson(pod.event)); + o.insert("profile_tag", toJson(pod.profileTag)); + o.insert("read", toJson(pod.read)); + o.insert("room_id", toJson(pod.roomId)); + o.insert("ts", toJson(pod.ts)); + + return o; + } + + template <> struct FromJson + { + GetNotificationsJob::Notification operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + GetNotificationsJob::Notification result; + result.actions = + fromJson>(o.value("actions")); + result.event = + fromJson(o.value("event")); + result.profileTag = + fromJson(o.value("profile_tag")); + result.read = + fromJson(o.value("read")); + result.roomId = + fromJson(o.value("room_id")); + result.ts = + fromJson(o.value("ts")); + + return result; + } + }; +} // namespace QMatrixClient + +class GetNotificationsJob::Private +{ + public: + QString nextToken; + QVector notifications; +}; + +BaseJob::Query queryToGetNotifications(const QString& from, int limit, const QString& only) +{ + BaseJob::Query _q; + if (!from.isEmpty()) + _q.addQueryItem("from", from); + _q.addQueryItem("limit", QString("%1").arg(limit)); + if (!only.isEmpty()) + _q.addQueryItem("only", only); + return _q; +} + +QUrl GetNotificationsJob::makeRequestUrl(QUrl baseUrl, const QString& from, int limit, const QString& only) +{ + return BaseJob::makeRequestUrl(baseUrl, + basePath % "/notifications", + queryToGetNotifications(from, limit, only)); +} + +GetNotificationsJob::GetNotificationsJob(const QString& from, int limit, const QString& only) + : BaseJob(HttpVerb::Get, "GetNotificationsJob", + basePath % "/notifications", + queryToGetNotifications(from, limit, only)) + , d(new Private) +{ +} + +GetNotificationsJob::~GetNotificationsJob() = default; + +const QString& GetNotificationsJob::nextToken() const +{ + return d->nextToken; +} + +const QVector& GetNotificationsJob::notifications() const +{ + return d->notifications; +} + +BaseJob::Status GetNotificationsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->nextToken = fromJson(json.value("next_token")); + if (!json.contains("notifications")) + return { JsonParseError, + "The key 'notifications' not found in the response" }; + d->notifications = fromJson>(json.value("notifications")); + return Success; +} + diff --git a/lib/jobs/generated/notifications.h b/lib/jobs/generated/notifications.h new file mode 100644 index 00000000..9249a1b7 --- /dev/null +++ b/lib/jobs/generated/notifications.h @@ -0,0 +1,77 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class GetNotificationsJob : public BaseJob + { + public: + // Inner data structures + + struct Unsigned + { + qint64 age; + QJsonObject prevContent; + QString transactionId; + QJsonObject redactedBecause; + + }; + + struct Event + { + QString eventId; + QJsonObject content; + qint64 originServerTimestamp; + QString sender; + QString stateKey; + QString type; + Unsigned unsignedData; + + }; + + struct Notification + { + QVector actions; + Event event; + QString profileTag; + bool read; + QString roomId; + qint64 ts; + + }; + + // End of inner data structures + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetNotificationsJob. This function can be used when + * a URL for GetNotificationsJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& from = {}, int limit = {}, const QString& only = {}); + + explicit GetNotificationsJob(const QString& from = {}, int limit = {}, const QString& only = {}); + ~GetNotificationsJob() override; + + const QString& nextToken() const; + const QVector& notifications() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient -- cgit v1.2.3 From 8d7ff5d3741ff525d337871185ee9f7f2e885af5 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 30 Apr 2018 22:45:56 +0900 Subject: ConnectionsGuard: one more fix about defaults --- lib/util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.h b/lib/util.h index 2a323cf3..55f3af6a 100644 --- a/lib/util.h +++ b/lib/util.h @@ -76,8 +76,8 @@ namespace QMatrixClient if (*this) (*this)->disconnect(subscriber); } - ConnectionsGuard(ConnectionsGuard&&) noexcept = default; - ConnectionsGuard& operator=(ConnectionsGuard&&) noexcept = default; + ConnectionsGuard(ConnectionsGuard&&) = default; + ConnectionsGuard& operator=(ConnectionsGuard&&) = default; ConnectionsGuard& operator=(const ConnectionsGuard&) = delete; using QPointer::operator=; -- cgit v1.2.3 From df268cad0ad517a75c813606bf3ef11bdba6f4e6 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 1 May 2018 12:53:00 +0900 Subject: Mustache: more C++ tidying and empty lines removal --- lib/jobs/{{base}}.cpp.mustache | 2 +- lib/jobs/{{base}}.h.mustache | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/jobs/{{base}}.cpp.mustache b/lib/jobs/{{base}}.cpp.mustache index 87205caa..1ca23799 100644 --- a/lib/jobs/{{base}}.cpp.mustache +++ b/lib/jobs/{{base}}.cpp.mustache @@ -71,7 +71,7 @@ BaseJob::Query queryTo{{camelCaseOperationId}}({{#queryParams}}{{>joinedParamDef {{/queryParams?}}{{^bodyParams}} QUrl {{camelCaseOperationId}}Job::makeRequestUrl(QUrl baseUrl{{#allParams?}}, {{#allParams}}{{>joinedParamDef}}{{/allParams}}{{/allParams?}}) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath{{#pathParts}} % {{_}}{{/pathParts}}{{#queryParams?}}, queryTo{{camelCaseOperationId}}({{>passQueryParams}}){{/queryParams?}}); } diff --git a/lib/jobs/{{base}}.h.mustache b/lib/jobs/{{base}}.h.mustache index 941662de..f49945d4 100644 --- a/lib/jobs/{{base}}.h.mustache +++ b/lib/jobs/{{base}}.h.mustache @@ -16,8 +16,8 @@ namespace QMatrixClient struct {{name}}{{#parents?}} : {{#parents}}{{name}}{{#@join}}, {{/@join}}{{/parents}}{{/parents?}} { {{#vars}}{{dataType.name}} {{nameCamelCase}}; - {{/vars}} - }; + {{/vars}}{{! +}} }; QJsonObject toJson(const {{name}}& pod); -- cgit v1.2.3 From ea363441269c9100c4bcc8076d4b3d125333a649 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 1 May 2018 20:03:32 +0900 Subject: gtad.yaml: Use EventPtr for Notifications.Event; add variant type to the map Variants are not yet supported but just in case, let's have the line, it's very obvious. --- lib/jobs/gtad.yaml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/jobs/gtad.yaml b/lib/jobs/gtad.yaml index 7cfbab8f..052d8301 100644 --- a/lib/jobs/gtad.yaml +++ b/lib/jobs/gtad.yaml @@ -51,15 +51,24 @@ analyzer: avoidCopy?: true file: *ByteStream object: - type: QJsonObject - avoidCopy?: true - imports: + - definitions/event.yaml: + type: EventPtr + imports: '"events/event.h"' + - //: + type: QJsonObject + avoidCopy?: true + imports: array: + - Notification: + type: "std::vector<{{1}}>" + avoidCopy?: true + imports: - /.+/: type: "QVector<{{1}}>" avoidCopy?: true imports: - //: { type: QJsonArray, "avoidCopy?": true, imports: } + variant: { type: QVariant, "avoidCopy?": true, imports: } schema: avoidCopy?: true -- cgit v1.2.3 From 38934c2310b426be640988dc10f48de88a3d92bc Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 1 May 2018 20:04:51 +0900 Subject: jobs/generated: use std::move in baseURL; type updates from the API files The type updates are a matter of pending PR to matrix-doc yet. --- lib/jobs/generated/administrative_contact.cpp | 4 +- lib/jobs/generated/content-repo.cpp | 20 +++--- lib/jobs/generated/content-repo.h | 6 +- lib/jobs/generated/directory.cpp | 4 +- lib/jobs/generated/leaving.cpp | 4 +- lib/jobs/generated/list_joined_rooms.cpp | 2 +- lib/jobs/generated/list_public_rooms.cpp | 28 ++++---- lib/jobs/generated/list_public_rooms.h | 14 ++-- lib/jobs/generated/logout.cpp | 2 +- lib/jobs/generated/notifications.cpp | 96 ++------------------------- lib/jobs/generated/notifications.h | 25 ++----- lib/jobs/generated/profile.cpp | 6 +- lib/jobs/generated/pusher.cpp | 2 +- lib/jobs/generated/tags.cpp | 4 +- lib/jobs/generated/users.cpp | 2 +- lib/jobs/generated/users.h | 2 +- lib/jobs/generated/versions.cpp | 2 +- lib/jobs/generated/whoami.cpp | 2 +- 18 files changed, 60 insertions(+), 165 deletions(-) diff --git a/lib/jobs/generated/administrative_contact.cpp b/lib/jobs/generated/administrative_contact.cpp index fc75fd85..b003c92d 100644 --- a/lib/jobs/generated/administrative_contact.cpp +++ b/lib/jobs/generated/administrative_contact.cpp @@ -45,7 +45,7 @@ class GetAccount3PIDsJob::Private QUrl GetAccount3PIDsJob::makeRequestUrl(QUrl baseUrl) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/account/3pid"); } @@ -112,7 +112,7 @@ Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind) QUrl RequestTokenTo3PIDJob::makeRequestUrl(QUrl baseUrl) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/account/3pid/email/requestToken"); } diff --git a/lib/jobs/generated/content-repo.cpp b/lib/jobs/generated/content-repo.cpp index 51011251..95fc5aed 100644 --- a/lib/jobs/generated/content-repo.cpp +++ b/lib/jobs/generated/content-repo.cpp @@ -65,7 +65,7 @@ class GetContentJob::Private QUrl GetContentJob::makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/download/" % serverName % "/" % mediaId); } @@ -112,7 +112,7 @@ class GetContentOverrideNameJob::Private QUrl GetContentOverrideNameJob::makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, const QString& fileName) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/download/" % serverName % "/" % mediaId % "/" % fileName); } @@ -168,7 +168,7 @@ BaseJob::Query queryToGetContentThumbnail(int width, int height, const QString& QUrl GetContentThumbnailJob::makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, int width, int height, const QString& method) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/thumbnail/" % serverName % "/" % mediaId, queryToGetContentThumbnail(width, height, method)); } @@ -205,11 +205,11 @@ BaseJob::Status GetContentThumbnailJob::parseReply(QNetworkReply* reply) class GetUrlPreviewJob::Private { public: - double matrixImageSize; + qint64 matrixImageSize; QString ogImage; }; -BaseJob::Query queryToGetUrlPreview(const QString& url, double ts) +BaseJob::Query queryToGetUrlPreview(const QString& url, qint64 ts) { BaseJob::Query _q; _q.addQueryItem("url", url); @@ -217,14 +217,14 @@ BaseJob::Query queryToGetUrlPreview(const QString& url, double ts) return _q; } -QUrl GetUrlPreviewJob::makeRequestUrl(QUrl baseUrl, const QString& url, double ts) +QUrl GetUrlPreviewJob::makeRequestUrl(QUrl baseUrl, const QString& url, qint64 ts) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/preview_url", queryToGetUrlPreview(url, ts)); } -GetUrlPreviewJob::GetUrlPreviewJob(const QString& url, double ts) +GetUrlPreviewJob::GetUrlPreviewJob(const QString& url, qint64 ts) : BaseJob(HttpVerb::Get, "GetUrlPreviewJob", basePath % "/preview_url", queryToGetUrlPreview(url, ts)) @@ -234,7 +234,7 @@ GetUrlPreviewJob::GetUrlPreviewJob(const QString& url, double ts) GetUrlPreviewJob::~GetUrlPreviewJob() = default; -double GetUrlPreviewJob::matrixImageSize() const +qint64 GetUrlPreviewJob::matrixImageSize() const { return d->matrixImageSize; } @@ -247,7 +247,7 @@ const QString& GetUrlPreviewJob::ogImage() const BaseJob::Status GetUrlPreviewJob::parseJson(const QJsonDocument& data) { auto json = data.object(); - d->matrixImageSize = fromJson(json.value("matrix:image:size")); + d->matrixImageSize = fromJson(json.value("matrix:image:size")); d->ogImage = fromJson(json.value("og:image")); return Success; } diff --git a/lib/jobs/generated/content-repo.h b/lib/jobs/generated/content-repo.h index b4ea562f..e1e58f88 100644 --- a/lib/jobs/generated/content-repo.h +++ b/lib/jobs/generated/content-repo.h @@ -111,12 +111,12 @@ namespace QMatrixClient * a URL for GetUrlPreviewJob is necessary but the job * itself isn't. */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& url, double ts = {}); + static QUrl makeRequestUrl(QUrl baseUrl, const QString& url, qint64 ts = {}); - explicit GetUrlPreviewJob(const QString& url, double ts = {}); + explicit GetUrlPreviewJob(const QString& url, qint64 ts = {}); ~GetUrlPreviewJob() override; - double matrixImageSize() const; + qint64 matrixImageSize() const; const QString& ogImage() const; protected: diff --git a/lib/jobs/generated/directory.cpp b/lib/jobs/generated/directory.cpp index 9428dcee..6324a1f5 100644 --- a/lib/jobs/generated/directory.cpp +++ b/lib/jobs/generated/directory.cpp @@ -31,7 +31,7 @@ class GetRoomIdByAliasJob::Private QUrl GetRoomIdByAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/room/" % roomAlias); } @@ -64,7 +64,7 @@ BaseJob::Status GetRoomIdByAliasJob::parseJson(const QJsonDocument& data) QUrl DeleteRoomAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/room/" % roomAlias); } diff --git a/lib/jobs/generated/leaving.cpp b/lib/jobs/generated/leaving.cpp index fbc40d11..afc4adbd 100644 --- a/lib/jobs/generated/leaving.cpp +++ b/lib/jobs/generated/leaving.cpp @@ -14,7 +14,7 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); QUrl LeaveRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/rooms/" % roomId % "/leave"); } @@ -26,7 +26,7 @@ LeaveRoomJob::LeaveRoomJob(const QString& roomId) QUrl ForgetRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/rooms/" % roomId % "/forget"); } diff --git a/lib/jobs/generated/list_joined_rooms.cpp b/lib/jobs/generated/list_joined_rooms.cpp index f902f94c..8ea44721 100644 --- a/lib/jobs/generated/list_joined_rooms.cpp +++ b/lib/jobs/generated/list_joined_rooms.cpp @@ -20,7 +20,7 @@ class GetJoinedRoomsJob::Private QUrl GetJoinedRoomsJob::makeRequestUrl(QUrl baseUrl) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/joined_rooms"); } diff --git a/lib/jobs/generated/list_public_rooms.cpp b/lib/jobs/generated/list_public_rooms.cpp index 35a670fb..9b4174cb 100644 --- a/lib/jobs/generated/list_public_rooms.cpp +++ b/lib/jobs/generated/list_public_rooms.cpp @@ -18,7 +18,7 @@ class GetRoomVisibilityOnDirectoryJob::Private QUrl GetRoomVisibilityOnDirectoryJob::makeRequestUrl(QUrl baseUrl, const QString& roomId) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/directory/list/room/" % roomId); } @@ -84,7 +84,7 @@ namespace QMatrixClient result.name = fromJson(o.value("name")); result.numJoinedMembers = - fromJson(o.value("num_joined_members")); + fromJson(o.value("num_joined_members")); result.roomId = fromJson(o.value("room_id")); result.topic = @@ -107,10 +107,10 @@ class GetPublicRoomsJob::Private QVector chunk; QString nextBatch; QString prevBatch; - double totalRoomCountEstimate; + qint64 totalRoomCountEstimate; }; -BaseJob::Query queryToGetPublicRooms(double limit, const QString& since, const QString& server) +BaseJob::Query queryToGetPublicRooms(int limit, const QString& since, const QString& server) { BaseJob::Query _q; _q.addQueryItem("limit", QString("%1").arg(limit)); @@ -121,14 +121,14 @@ BaseJob::Query queryToGetPublicRooms(double limit, const QString& since, const Q return _q; } -QUrl GetPublicRoomsJob::makeRequestUrl(QUrl baseUrl, double limit, const QString& since, const QString& server) +QUrl GetPublicRoomsJob::makeRequestUrl(QUrl baseUrl, int limit, const QString& since, const QString& server) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/publicRooms", queryToGetPublicRooms(limit, since, server)); } -GetPublicRoomsJob::GetPublicRoomsJob(double limit, const QString& since, const QString& server) +GetPublicRoomsJob::GetPublicRoomsJob(int limit, const QString& since, const QString& server) : BaseJob(HttpVerb::Get, "GetPublicRoomsJob", basePath % "/publicRooms", queryToGetPublicRooms(limit, since, server), @@ -154,7 +154,7 @@ const QString& GetPublicRoomsJob::prevBatch() const return d->prevBatch; } -double GetPublicRoomsJob::totalRoomCountEstimate() const +qint64 GetPublicRoomsJob::totalRoomCountEstimate() const { return d->totalRoomCountEstimate; } @@ -168,7 +168,7 @@ BaseJob::Status GetPublicRoomsJob::parseJson(const QJsonDocument& data) d->chunk = fromJson>(json.value("chunk")); d->nextBatch = fromJson(json.value("next_batch")); d->prevBatch = fromJson(json.value("prev_batch")); - d->totalRoomCountEstimate = fromJson(json.value("total_room_count_estimate")); + d->totalRoomCountEstimate = fromJson(json.value("total_room_count_estimate")); return Success; } @@ -227,7 +227,7 @@ namespace QMatrixClient result.name = fromJson(o.value("name")); result.numJoinedMembers = - fromJson(o.value("num_joined_members")); + fromJson(o.value("num_joined_members")); result.roomId = fromJson(o.value("room_id")); result.topic = @@ -250,7 +250,7 @@ class QueryPublicRoomsJob::Private QVector chunk; QString nextBatch; QString prevBatch; - double totalRoomCountEstimate; + qint64 totalRoomCountEstimate; }; BaseJob::Query queryToQueryPublicRooms(const QString& server) @@ -261,7 +261,7 @@ BaseJob::Query queryToQueryPublicRooms(const QString& server) return _q; } -QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server, double limit, const QString& since, const Filter& filter) +QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server, int limit, const QString& since, const Filter& filter) : BaseJob(HttpVerb::Post, "QueryPublicRoomsJob", basePath % "/publicRooms", queryToQueryPublicRooms(server)) @@ -292,7 +292,7 @@ const QString& QueryPublicRoomsJob::prevBatch() const return d->prevBatch; } -double QueryPublicRoomsJob::totalRoomCountEstimate() const +qint64 QueryPublicRoomsJob::totalRoomCountEstimate() const { return d->totalRoomCountEstimate; } @@ -306,7 +306,7 @@ BaseJob::Status QueryPublicRoomsJob::parseJson(const QJsonDocument& data) d->chunk = fromJson>(json.value("chunk")); d->nextBatch = fromJson(json.value("next_batch")); d->prevBatch = fromJson(json.value("prev_batch")); - d->totalRoomCountEstimate = fromJson(json.value("total_room_count_estimate")); + d->totalRoomCountEstimate = fromJson(json.value("total_room_count_estimate")); return Success; } diff --git a/lib/jobs/generated/list_public_rooms.h b/lib/jobs/generated/list_public_rooms.h index c8adccb4..1e44e8b2 100644 --- a/lib/jobs/generated/list_public_rooms.h +++ b/lib/jobs/generated/list_public_rooms.h @@ -53,7 +53,7 @@ namespace QMatrixClient QVector aliases; QString canonicalAlias; QString name; - double numJoinedMembers; + qint64 numJoinedMembers; QString roomId; QString topic; bool worldReadable; @@ -69,15 +69,15 @@ namespace QMatrixClient * a URL for GetPublicRoomsJob is necessary but the job * itself isn't. */ - static QUrl makeRequestUrl(QUrl baseUrl, double limit = {}, const QString& since = {}, const QString& server = {}); + static QUrl makeRequestUrl(QUrl baseUrl, int limit = {}, const QString& since = {}, const QString& server = {}); - explicit GetPublicRoomsJob(double limit = {}, const QString& since = {}, const QString& server = {}); + explicit GetPublicRoomsJob(int limit = {}, const QString& since = {}, const QString& server = {}); ~GetPublicRoomsJob() override; const QVector& chunk() const; const QString& nextBatch() const; const QString& prevBatch() const; - double totalRoomCountEstimate() const; + qint64 totalRoomCountEstimate() const; protected: Status parseJson(const QJsonDocument& data) override; @@ -103,7 +103,7 @@ namespace QMatrixClient QVector aliases; QString canonicalAlias; QString name; - double numJoinedMembers; + qint64 numJoinedMembers; QString roomId; QString topic; bool worldReadable; @@ -114,13 +114,13 @@ namespace QMatrixClient // End of inner data structures - explicit QueryPublicRoomsJob(const QString& server = {}, double limit = {}, const QString& since = {}, const Filter& filter = {}); + explicit QueryPublicRoomsJob(const QString& server = {}, int limit = {}, const QString& since = {}, const Filter& filter = {}); ~QueryPublicRoomsJob() override; const QVector& chunk() const; const QString& nextBatch() const; const QString& prevBatch() const; - double totalRoomCountEstimate() const; + qint64 totalRoomCountEstimate() const; protected: Status parseJson(const QJsonDocument& data) override; diff --git a/lib/jobs/generated/logout.cpp b/lib/jobs/generated/logout.cpp index 83139842..b943dcd3 100644 --- a/lib/jobs/generated/logout.cpp +++ b/lib/jobs/generated/logout.cpp @@ -14,7 +14,7 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); QUrl LogoutJob::makeRequestUrl(QUrl baseUrl) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/logout"); } diff --git a/lib/jobs/generated/notifications.cpp b/lib/jobs/generated/notifications.cpp index e3558097..ffd17b8a 100644 --- a/lib/jobs/generated/notifications.cpp +++ b/lib/jobs/generated/notifications.cpp @@ -12,94 +12,6 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); namespace QMatrixClient { - QJsonObject toJson(const GetNotificationsJob::Unsigned& pod) - { - QJsonObject o; - o.insert("age", toJson(pod.age)); - o.insert("prev_content", toJson(pod.prevContent)); - o.insert("transaction_id", toJson(pod.transactionId)); - o.insert("redacted_because", toJson(pod.redactedBecause)); - - return o; - } - - template <> struct FromJson - { - GetNotificationsJob::Unsigned operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - GetNotificationsJob::Unsigned result; - result.age = - fromJson(o.value("age")); - result.prevContent = - fromJson(o.value("prev_content")); - result.transactionId = - fromJson(o.value("transaction_id")); - result.redactedBecause = - fromJson(o.value("redacted_because")); - - return result; - } - }; -} // namespace QMatrixClient - -namespace QMatrixClient -{ - QJsonObject toJson(const GetNotificationsJob::Event& pod) - { - QJsonObject o; - o.insert("event_id", toJson(pod.eventId)); - o.insert("content", toJson(pod.content)); - o.insert("origin_server_ts", toJson(pod.originServerTimestamp)); - o.insert("sender", toJson(pod.sender)); - o.insert("state_key", toJson(pod.stateKey)); - o.insert("type", toJson(pod.type)); - o.insert("unsigned", toJson(pod.unsignedData)); - - return o; - } - - template <> struct FromJson - { - GetNotificationsJob::Event operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - GetNotificationsJob::Event result; - result.eventId = - fromJson(o.value("event_id")); - result.content = - fromJson(o.value("content")); - result.originServerTimestamp = - fromJson(o.value("origin_server_ts")); - result.sender = - fromJson(o.value("sender")); - result.stateKey = - fromJson(o.value("state_key")); - result.type = - fromJson(o.value("type")); - result.unsignedData = - fromJson(o.value("unsigned")); - - return result; - } - }; -} // namespace QMatrixClient - -namespace QMatrixClient -{ - QJsonObject toJson(const GetNotificationsJob::Notification& pod) - { - QJsonObject o; - o.insert("actions", toJson(pod.actions)); - o.insert("event", toJson(pod.event)); - o.insert("profile_tag", toJson(pod.profileTag)); - o.insert("read", toJson(pod.read)); - o.insert("room_id", toJson(pod.roomId)); - o.insert("ts", toJson(pod.ts)); - - return o; - } - template <> struct FromJson { GetNotificationsJob::Notification operator()(const QJsonValue& jv) @@ -128,7 +40,7 @@ class GetNotificationsJob::Private { public: QString nextToken; - QVector notifications; + std::vector notifications; }; BaseJob::Query queryToGetNotifications(const QString& from, int limit, const QString& only) @@ -144,7 +56,7 @@ BaseJob::Query queryToGetNotifications(const QString& from, int limit, const QSt QUrl GetNotificationsJob::makeRequestUrl(QUrl baseUrl, const QString& from, int limit, const QString& only) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/notifications", queryToGetNotifications(from, limit, only)); } @@ -164,7 +76,7 @@ const QString& GetNotificationsJob::nextToken() const return d->nextToken; } -const QVector& GetNotificationsJob::notifications() const +const std::vector& GetNotificationsJob::notifications() const { return d->notifications; } @@ -176,7 +88,7 @@ BaseJob::Status GetNotificationsJob::parseJson(const QJsonDocument& data) if (!json.contains("notifications")) return { JsonParseError, "The key 'notifications' not found in the response" }; - d->notifications = fromJson>(json.value("notifications")); + d->notifications = fromJson>(json.value("notifications")); return Success; } diff --git a/lib/jobs/generated/notifications.h b/lib/jobs/generated/notifications.h index 9249a1b7..72318f69 100644 --- a/lib/jobs/generated/notifications.h +++ b/lib/jobs/generated/notifications.h @@ -6,6 +6,8 @@ #include "../basejob.h" +#include +#include "events/event.h" #include #include @@ -20,26 +22,7 @@ namespace QMatrixClient public: // Inner data structures - struct Unsigned - { - qint64 age; - QJsonObject prevContent; - QString transactionId; - QJsonObject redactedBecause; - - }; - - struct Event - { - QString eventId; - QJsonObject content; - qint64 originServerTimestamp; - QString sender; - QString stateKey; - QString type; - Unsigned unsignedData; - - }; + using Event = EventPtr; struct Notification { @@ -65,7 +48,7 @@ namespace QMatrixClient ~GetNotificationsJob() override; const QString& nextToken() const; - const QVector& notifications() const; + const std::vector& notifications() const; protected: Status parseJson(const QJsonDocument& data) override; diff --git a/lib/jobs/generated/profile.cpp b/lib/jobs/generated/profile.cpp index 1f7092d7..d8ddbc14 100644 --- a/lib/jobs/generated/profile.cpp +++ b/lib/jobs/generated/profile.cpp @@ -30,7 +30,7 @@ class GetDisplayNameJob::Private QUrl GetDisplayNameJob::makeRequestUrl(QUrl baseUrl, const QString& userId) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/profile/" % userId % "/displayname"); } @@ -73,7 +73,7 @@ class GetAvatarUrlJob::Private QUrl GetAvatarUrlJob::makeRequestUrl(QUrl baseUrl, const QString& userId) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/profile/" % userId % "/avatar_url"); } @@ -107,7 +107,7 @@ class GetUserProfileJob::Private QUrl GetUserProfileJob::makeRequestUrl(QUrl baseUrl, const QString& userId) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/profile/" % userId); } diff --git a/lib/jobs/generated/pusher.cpp b/lib/jobs/generated/pusher.cpp index 4a9bde95..7d5e80d1 100644 --- a/lib/jobs/generated/pusher.cpp +++ b/lib/jobs/generated/pusher.cpp @@ -87,7 +87,7 @@ class GetPushersJob::Private QUrl GetPushersJob::makeRequestUrl(QUrl baseUrl) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/pushers"); } diff --git a/lib/jobs/generated/tags.cpp b/lib/jobs/generated/tags.cpp index ef3b5f34..9cd78aec 100644 --- a/lib/jobs/generated/tags.cpp +++ b/lib/jobs/generated/tags.cpp @@ -20,7 +20,7 @@ class GetRoomTagsJob::Private QUrl GetRoomTagsJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/user/" % userId % "/rooms/" % roomId % "/tags"); } @@ -54,7 +54,7 @@ SetRoomTagJob::SetRoomTagJob(const QString& userId, const QString& roomId, const QUrl DeleteRoomTagJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& tag) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag); } diff --git a/lib/jobs/generated/users.cpp b/lib/jobs/generated/users.cpp index 6af3be3c..f82a2a64 100644 --- a/lib/jobs/generated/users.cpp +++ b/lib/jobs/generated/users.cpp @@ -47,7 +47,7 @@ class SearchUserDirectoryJob::Private bool limited; }; -SearchUserDirectoryJob::SearchUserDirectoryJob(const QString& searchTerm, double limit) +SearchUserDirectoryJob::SearchUserDirectoryJob(const QString& searchTerm, int limit) : BaseJob(HttpVerb::Post, "SearchUserDirectoryJob", basePath % "/user_directory/search") , d(new Private) diff --git a/lib/jobs/generated/users.h b/lib/jobs/generated/users.h index ce7f5aba..bfa688c8 100644 --- a/lib/jobs/generated/users.h +++ b/lib/jobs/generated/users.h @@ -29,7 +29,7 @@ namespace QMatrixClient // End of inner data structures - explicit SearchUserDirectoryJob(const QString& searchTerm, double limit = {}); + explicit SearchUserDirectoryJob(const QString& searchTerm, int limit = {}); ~SearchUserDirectoryJob() override; const QVector& results() const; diff --git a/lib/jobs/generated/versions.cpp b/lib/jobs/generated/versions.cpp index b12594ca..3b03172c 100644 --- a/lib/jobs/generated/versions.cpp +++ b/lib/jobs/generated/versions.cpp @@ -20,7 +20,7 @@ class GetVersionsJob::Private QUrl GetVersionsJob::makeRequestUrl(QUrl baseUrl) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/versions"); } diff --git a/lib/jobs/generated/whoami.cpp b/lib/jobs/generated/whoami.cpp index cc38fa4d..4c231b5f 100644 --- a/lib/jobs/generated/whoami.cpp +++ b/lib/jobs/generated/whoami.cpp @@ -20,7 +20,7 @@ class GetTokenOwnerJob::Private QUrl GetTokenOwnerJob::makeRequestUrl(QUrl baseUrl) { - return BaseJob::makeRequestUrl(baseUrl, + return BaseJob::makeRequestUrl(std::move(baseUrl), basePath % "/account/whoami"); } -- cgit v1.2.3 From 37700bbf2df8b96c82a193c25764d9020b1140e9 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 3 May 2018 20:14:19 +0900 Subject: GTAD: Use QMatrixClient::Event-derived classes in generated jobs + Mustache cleanup This should make generated jobs buildable across the whole CS API (sync.yaml is disabled as the manual implementation is still considerably better). --- lib/jobs/gtad.yaml | 40 +++++++++++++++++++++++++++++++++------- lib/jobs/{{base}}.cpp.mustache | 41 ++++++++++++++++++++--------------------- lib/jobs/{{base}}.h.mustache | 32 +++++++++++++------------------- 3 files changed, 66 insertions(+), 47 deletions(-) diff --git a/lib/jobs/gtad.yaml b/lib/jobs/gtad.yaml index 052d8301..4ef55bce 100644 --- a/lib/jobs/gtad.yaml +++ b/lib/jobs/gtad.yaml @@ -6,7 +6,8 @@ analyzer: signed: signedData unsigned: unsignedData default: isDefault - origin_server_ts: originServerTimestamp + origin_server_ts: originServerTimestamp # Instead of originServerTs + start: begin # Because start() is a method in BaseJob types: # Structure: @@ -51,18 +52,42 @@ analyzer: avoidCopy?: true file: *ByteStream object: - - definitions/event.yaml: + - /.+m\.room\.member/: # A stub for EventsBatch + type: none + - /.+state_event.yaml/: + type: StateEventPtr + noCopy?: true + imports: '"events/event.h"' + - /.*room_event.yaml/: + type: RoomEventPtr + noCopy?: true + imports: '"events/event.h"' + - /.*event.yaml/: type: EventPtr + noCopy?: true imports: '"events/event.h"' - //: type: QJsonObject avoidCopy?: true imports: array: - - Notification: + - /^Notification|Result$/: type: "std::vector<{{1}}>" - avoidCopy?: true - imports: + noCopy?: true + imports: '"events/event.h"' + - /.+m\.room\.member/: + type: "EventsArray" + noCopy?: true + imports: '"events/roommemberevent.h"' + - /.+state_event.yaml/: + type: StateEvents + noCopy?: true + - /.+room_event.yaml/: + type: RoomEvents + noCopy?: true + - /.+event.yaml/: + type: Events + noCopy?: true - /.+/: type: "QVector<{{1}}>" avoidCopy?: true @@ -78,8 +103,9 @@ mustache: definitions: _scopeRenderer: "{{scopeCamelCase}}Job::" _literalQuote: '"' - maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}" - qualifiedMaybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}" + maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}{{#noCopy?}}&&{{/noCopy?}}" + qualifiedMaybeCrefType: + "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}{{#noCopy?}}&&{{/noCopy?}}" initializeDefaultValue: "{{#defaultValue}}{{>initializer}}{{/defaultValue}}{{^defaultValue}}{}{{/defaultValue}}" joinedParamDecl: '{{>maybeCrefType}} {{paramName}}{{^required?}} = {{>initializeDefaultValue}}{{/required?}}{{#@join}}, {{/@join}}' joinedParamDef: '{{>maybeCrefType}} {{paramName}}{{#@join}}, {{/@join}}' diff --git a/lib/jobs/{{base}}.cpp.mustache b/lib/jobs/{{base}}.cpp.mustache index 1ca23799..d3726f1e 100644 --- a/lib/jobs/{{base}}.cpp.mustache +++ b/lib/jobs/{{base}}.cpp.mustache @@ -7,18 +7,15 @@ {{/producesNonJson?}}#include {{/operations}} using namespace QMatrixClient; -{{#models.model}}{{^trivial?}} -namespace QMatrixClient +{{#models.model}}{{#in?}} +QJsonObject QMatrixClient::toJson(const {{qualifiedName}}& pod) { - QJsonObject toJson(const {{qualifiedName}}& pod) - { - QJsonObject o; - {{#vars}}o.insert("{{baseName}}", toJson(pod.{{nameCamelCase}})); - {{/vars}} - return o; - } + QJsonObject o; +{{#vars}} o.insert("{{baseName}}", toJson(pod.{{nameCamelCase}})); +{{/vars}} + return o; } - +{{/in?}}{{#out?}} {{qualifiedName}} FromJson<{{qualifiedName}}>::operator()(const QJsonValue& jv) { const auto& o = jv.toObject(); @@ -28,33 +25,35 @@ namespace QMatrixClient {{/vars}} return result; } -{{/trivial?}}{{/models.model}}{{#operations}} +{{/out?}}{{/models.model}}{{#operations}} static const auto basePath = QStringLiteral("{{basePathWithoutHost}}"); -{{# operation}}{{#models.model}}{{^trivial?}} +{{# operation}}{{#models}} namespace QMatrixClient { + // Converters +{{#model}}{{#in?}} QJsonObject toJson(const {{qualifiedName}}& pod) { QJsonObject o; - {{#vars}}o.insert("{{baseName}}", toJson(pod.{{nameCamelCase}})); - {{/vars}} +{{#vars}} o.insert("{{baseName}}", toJson(pod.{{nameCamelCase}})); +{{/vars}} return o; } - +{{/in?}}{{#out?}} template <> struct FromJson<{{qualifiedName}}> { {{qualifiedName}} operator()(const QJsonValue& jv) { const auto& o = jv.toObject(); {{qualifiedName}} result; - {{#vars}}result.{{nameCamelCase}} = +{{#vars}} result.{{nameCamelCase}} = fromJson<{{dataType.qualifiedName}}>(o.value("{{baseName}}")); - {{/vars}} +{{/vars}} return result; } }; -} // namespace QMatrixClient -{{/ trivial?}}{{/models.model}}{{#responses}}{{#normalResponse?}}{{#allProperties?}} +{{/out?}}{{/model}}} // namespace QMatrixClient +{{/ models}}{{#responses}}{{#normalResponse?}}{{#allProperties?}} class {{camelCaseOperationId}}Job::Private { public:{{#allProperties}} @@ -99,9 +98,9 @@ QUrl {{camelCaseOperationId}}Job::makeRequestUrl(QUrl baseUrl{{#allParams?}}, {{ {{# responses}}{{#normalResponse?}}{{#allProperties?}} {{camelCaseOperationId}}Job::~{{camelCaseOperationId}}Job() = default; {{# allProperties}} -{{>qualifiedMaybeCrefType}} {{camelCaseOperationId}}Job::{{paramName}}() const +{{>qualifiedMaybeCrefType}} {{camelCaseOperationId}}Job::{{paramName}}(){{^noCopy?}} const{{/noCopy?}} { - return d->{{paramName}}; + return {{#noCopy?}}std::move({{/noCopy?}}d->{{paramName}}{{#noCopy?}}){{/noCopy?}}; } {{/ allProperties}}{{#producesNonJson?}} BaseJob::Status {{camelCaseOperationId}}Job::parseReply(QNetworkReply* reply) diff --git a/lib/jobs/{{base}}.h.mustache b/lib/jobs/{{base}}.h.mustache index f49945d4..ff9a7e7a 100644 --- a/lib/jobs/{{base}}.h.mustache +++ b/lib/jobs/{{base}}.h.mustache @@ -10,39 +10,33 @@ namespace QMatrixClient { {{#models}} // Data structures -{{# model}}{{#trivial?}} - using {{name}} = {{parent.name}}; -{{/ trivial?}}{{^trivial?}} +{{# model}} struct {{name}}{{#parents?}} : {{#parents}}{{name}}{{#@join}}, {{/@join}}{{/parents}}{{/parents?}} { - {{#vars}}{{dataType.name}} {{nameCamelCase}}; - {{/vars}}{{! -}} }; - +{{#vars}} {{dataType.name}} {{nameCamelCase}}; +{{/vars}} }; +{{#in?}} QJsonObject toJson(const {{name}}& pod); - +{{/in?}}{{#out?}} template <> struct FromJson<{{name}}> { {{name}} operator()(const QJsonValue& jv); }; -{{/ trivial?}}{{/model}} +{{/ out?}}{{/model}} {{/models}}{{#operations}} // Operations {{# operation}} class {{camelCaseOperationId}}Job : public BaseJob { - public:{{# models}} + public:{{#models}} // Inner data structures -{{# model}}{{#trivial?}} - using {{name}} = {{parent.name}}; -{{/ trivial?}}{{^trivial?}} +{{# model}} struct {{name}}{{#parents?}} : {{#parents}}{{name}}{{#@join}}, {{/@join}}{{/parents}}{{/parents?}} { - {{#vars}}{{dataType.name}} {{nameCamelCase}}; - {{/vars}} - }; -{{/ trivial?}}{{/model}} +{{#vars}} {{dataType.name}} {{nameCamelCase}}; +{{/vars}} }; +{{/ model}} // End of inner data structures -{{/models}}{{^bodyParams}} +{{/ models}}{{^bodyParams}} /** Construct a URL out of baseUrl and usual parameters passed to * {{camelCaseOperationId}}Job. This function can be used when * a URL for {{camelCaseOperationId}}Job is necessary but the job @@ -54,7 +48,7 @@ namespace QMatrixClient }}{{# responses}}{{#normalResponse?}}{{#allProperties?}} ~{{camelCaseOperationId}}Job() override; {{#allProperties}} - {{>maybeCrefType}} {{paramName}}() const;{{/allProperties}} + {{>maybeCrefType}} {{paramName}}(){{^noCopy?}} const{{/noCopy?}};{{/allProperties}} protected: Status {{#producesNonJson?}}parseReply(QNetworkReply* reply){{/producesNonJson?}}{{^producesNonJson?}}parseJson(const QJsonDocument& data){{/producesNonJson?}} override; -- cgit v1.2.3 From 853fda2e7942ffb3bc8051e6411faa23cff6f3c2 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 3 May 2018 12:14:10 +0900 Subject: Cleanup --- lib/converters.h | 35 ++++++++++++++++++----------------- lib/events/roommemberevent.h | 7 ++++--- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/lib/converters.h b/lib/converters.h index cfe9c01c..baa14c7b 100644 --- a/lib/converters.h +++ b/lib/converters.h @@ -96,32 +96,32 @@ namespace QMatrixClient template <> struct FromJson { - bool operator()(const QJsonValue& jv) const { return jv.toBool(); } + auto operator()(const QJsonValue& jv) const { return jv.toBool(); } }; template <> struct FromJson { - int operator()(const QJsonValue& jv) const { return jv.toInt(); } + auto operator()(const QJsonValue& jv) const { return jv.toInt(); } }; template <> struct FromJson { - double operator()(const QJsonValue& jv) const { return jv.toDouble(); } + auto operator()(const QJsonValue& jv) const { return jv.toDouble(); } }; template <> struct FromJson { - qint64 operator()(const QJsonValue& jv) const { return qint64(jv.toDouble()); } + auto operator()(const QJsonValue& jv) const { return qint64(jv.toDouble()); } }; template <> struct FromJson { - QString operator()(const QJsonValue& jv) const { return jv.toString(); } + auto operator()(const QJsonValue& jv) const { return jv.toString(); } }; template <> struct FromJson { - QDateTime operator()(const QJsonValue& jv) const + auto operator()(const QJsonValue& jv) const { return QDateTime::fromMSecsSinceEpoch(fromJson(jv), Qt::UTC); } @@ -129,7 +129,7 @@ namespace QMatrixClient template <> struct FromJson { - QDate operator()(const QJsonValue& jv) const + auto operator()(const QJsonValue& jv) const { return fromJson(jv).date(); } @@ -137,7 +137,7 @@ namespace QMatrixClient template <> struct FromJson { - QJsonObject operator()(const QJsonValue& jv) const + auto operator()(const QJsonValue& jv) const { return jv.toObject(); } @@ -145,7 +145,7 @@ namespace QMatrixClient template <> struct FromJson { - QJsonArray operator()(const QJsonValue& jv) const + auto operator()(const QJsonValue& jv) const { return jv.toArray(); } @@ -153,10 +153,11 @@ namespace QMatrixClient template struct FromJson> { - std::vector operator()(const QJsonValue& jv) const + auto operator()(const QJsonValue& jv) const { + using size_type = typename std::vector::size_type; const auto jsonArray = jv.toArray(); - std::vector vect; vect.resize(size_t(jsonArray.size())); + std::vector vect; vect.resize(size_type(jsonArray.size())); std::transform(jsonArray.begin(), jsonArray.end(), vect.begin(), FromJson()); return vect; @@ -165,7 +166,7 @@ namespace QMatrixClient template struct FromJson> { - QVector operator()(const QJsonValue& jv) const + auto operator()(const QJsonValue& jv) const { const auto jsonArray = jv.toArray(); QVector vect; vect.resize(jsonArray.size()); @@ -177,7 +178,7 @@ namespace QMatrixClient template struct FromJson> { - QList operator()(const QJsonValue& jv) const + auto operator()(const QJsonValue& jv) const { const auto jsonArray = jv.toArray(); QList sl; sl.reserve(jsonArray.size()); @@ -191,7 +192,7 @@ namespace QMatrixClient template <> struct FromJson { - inline QByteArray operator()(const QJsonValue& jv) const + auto operator()(const QJsonValue& jv) const { return fromJson(jv).toLatin1(); } @@ -199,7 +200,7 @@ namespace QMatrixClient template <> struct FromJson { - inline auto operator()(const QJsonValue& jv) const + auto operator()(const QJsonValue& jv) const { return jv.toObject().toVariantMap(); } @@ -208,7 +209,7 @@ namespace QMatrixClient #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)) template <> struct FromJson { - inline auto operator()(const QJsonValue& jv) const + auto operator()(const QJsonValue& jv) const { return jv.toObject().toVariantHash(); } @@ -217,7 +218,7 @@ namespace QMatrixClient template struct FromJson> { - QHash operator()(const QJsonValue& jv) const + auto operator()(const QJsonValue& jv) const { const auto json = jv.toObject(); QHash h; h.reserve(json.size()); diff --git a/lib/events/roommemberevent.h b/lib/events/roommemberevent.h index 89b970c9..5f1e578d 100644 --- a/lib/events/roommemberevent.h +++ b/lib/events/roommemberevent.h @@ -56,12 +56,14 @@ namespace QMatrixClient using MembershipType = MemberEventContent::MembershipType; + explicit RoomMemberEvent(Type type, const QJsonObject& obj) + : StateEvent(type, obj) + { } RoomMemberEvent(MemberEventContent&& c) : StateEvent(Type::RoomMember, c) { } explicit RoomMemberEvent(const QJsonObject& obj) - : StateEvent(Type::RoomMember, obj) -// , _userId(obj["state_key"].toString()) + : RoomMemberEvent(Type::RoomMember, obj) { } MembershipType membership() const { return content().membership; } @@ -72,7 +74,6 @@ namespace QMatrixClient QUrl avatarUrl() const { return content().avatarUrl; } private: -// QString _userId; REGISTER_ENUM(MembershipType) }; } // namespace QMatrixClient -- cgit v1.2.3 From d304c1b9ac7a86096899b459eba8e36ed310b6ce Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 3 May 2018 19:27:44 +0900 Subject: Room::Private::processRedaction: minor refactoring --- lib/room.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/room.cpp b/lib/room.cpp index a4cfadb4..5771c51d 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -205,7 +205,7 @@ class Room::Private * Tries to find an event in the timeline and redact it; deletes the * redaction event whether the redacted event was found or not. */ - void processRedaction(RoomEventPtr&& redactionEvent); + void processRedaction(event_ptr_tt&& redaction); void broadcastTagUpdates() { @@ -1287,11 +1287,8 @@ inline bool isRedaction(const RoomEventPtr& e) return e->type() == EventType::Redaction; } -void Room::Private::processRedaction(RoomEventPtr&& redactionEvent) +void Room::Private::processRedaction(event_ptr_tt&& redaction) { - Q_ASSERT(redactionEvent && isRedaction(redactionEvent)); - const auto& redaction = ptrCast(move(redactionEvent)); - const auto pIdx = eventsIndex.find(redaction->redactedEvent()); if (pIdx == eventsIndex.end()) { @@ -1385,7 +1382,7 @@ void Room::Private::addNewMessageEvents(RoomEvents&& events) const auto normalsBegin = stable_partition(events.begin(), events.end(), isRedaction); RoomEventsRange redactions { events.begin(), normalsBegin }, - normalEvents { normalsBegin, events.end() }; + normalEvents { normalsBegin, events.end() }; if (!normalEvents.empty()) emit q->aboutToAddNewMessages(normalEvents); @@ -1399,7 +1396,10 @@ void Room::Private::addNewMessageEvents(RoomEvents&& events) q->onAddNewTimelineEvents(from); } for (auto&& r: redactions) - processRedaction(move(r)); + { + Q_ASSERT(isRedaction(r)); + processRedaction(ptrCast(move(r))); + } if (insertedSize > 0) { emit q->addedMessages(); -- cgit v1.2.3 From 564d518c086f2aeab0f0466b7cd1915e20edc7da Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 3 May 2018 21:23:28 +0900 Subject: GetRoomEventsJob (replaces RoomMessagesJob) + refactoring 1. Updates in this commit (see further) allow to generate and build GetRoomEventsJob from message_pagination.yaml; this job completely preempts RoomMessagesJob. 2. EventsBatch<> is no more a thing; there's EventsArray<> to replace it but it's loaded from a JSON array rather than an event batch (a JSON array inside another JSON object). SyncJob that used it extensively has been moved to "conventional" containers (Events, RoomEvents and the newly introduced StateEvents). RoomMessagesJob that also used EventsBatch<> is decommissioned (see above). 3. RoomEventsRange is now an alias for Range, defined in util.h (otherwise almost the same). 4. Connection::getMessages() is no more. Use Room::getPreviousContent() and Connection::callApi() instead. 5. Moving things around in Room, since SyncJob now supplies state events in more specific StateEvents, rather than RoomEvents. --- CMakeLists.txt | 1 - lib/connection.cpp | 6 - lib/connection.h | 4 +- lib/events/event.cpp | 23 ++-- lib/events/event.h | 86 ++++--------- lib/jobs/generated/message_pagination.cpp | 76 ++++++++++++ lib/jobs/generated/message_pagination.h | 40 ++++++ lib/jobs/roommessagesjob.cpp | 65 ---------- lib/jobs/roommessagesjob.h | 47 ------- lib/jobs/syncjob.cpp | 43 ++++--- lib/jobs/syncjob.h | 27 +--- lib/room.cpp | 200 +++++++++++++++--------------- lib/room.h | 11 +- lib/user.cpp | 23 ++-- lib/user.h | 3 +- lib/util.h | 31 +++++ libqmatrixclient.pri | 2 - 17 files changed, 330 insertions(+), 358 deletions(-) create mode 100644 lib/jobs/generated/message_pagination.cpp create mode 100644 lib/jobs/generated/message_pagination.h delete mode 100644 lib/jobs/roommessagesjob.cpp delete mode 100644 lib/jobs/roommessagesjob.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 49608f95..c69d0cfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,6 @@ set(libqmatrixclient_SRCS lib/jobs/sendeventjob.cpp lib/jobs/setroomstatejob.cpp lib/jobs/joinroomjob.cpp - lib/jobs/roommessagesjob.cpp lib/jobs/syncjob.cpp lib/jobs/mediathumbnailjob.cpp lib/jobs/downloadfilejob.cpp diff --git a/lib/connection.cpp b/lib/connection.cpp index adeb7929..b433ccbc 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -30,7 +30,6 @@ #include "jobs/generated/account-data.h" #include "jobs/sendeventjob.h" #include "jobs/joinroomjob.h" -#include "jobs/roommessagesjob.h" #include "jobs/syncjob.h" #include "jobs/mediathumbnailjob.h" #include "jobs/downloadfilejob.h" @@ -372,11 +371,6 @@ void Connection::leaveRoom(Room* room) callApi(room->id()); } -RoomMessagesJob* Connection::getMessages(Room* room, const QString& from) const -{ - return callApi(room->id(), from); -} - inline auto splitMediaId(const QString& mediaId) { auto idParts = mediaId.split('/'); diff --git a/lib/connection.h b/lib/connection.h index 839371ef..22f71eac 100644 --- a/lib/connection.h +++ b/lib/connection.h @@ -331,9 +331,7 @@ namespace QMatrixClient RoomEvent* event) const; /** @deprecated Use callApi() or Room::leaveRoom() instead */ virtual void leaveRoom( Room* room ); - /** @deprecated User callApi() or Room::getPreviousContent() instead */ - virtual RoomMessagesJob* getMessages(Room* room, - const QString& from) const; + signals: /** * @deprecated diff --git a/lib/events/event.cpp b/lib/events/event.cpp index 193250de..57049671 100644 --- a/lib/events/event.cpp +++ b/lib/events/event.cpp @@ -160,14 +160,13 @@ void RoomEvent::addId(const QString& id) template <> RoomEventPtr _impl::doMakeEvent(const QJsonObject& obj) { - return RoomEventPtr { makeIfMatches - (obj, obj["type"].toString()) }; -} + // Check more specific event types first + if (auto e = doMakeEvent(obj)) + return e; -StateEventBase::~StateEventBase() = default; + return makeIfMatches(obj, obj["type"].toString()); +} bool StateEventBase::repeatsState() const { @@ -176,3 +175,13 @@ bool StateEventBase::repeatsState() const .toObject().value("prev_content"); return contentJson == prevContentJson; } + +template<> +StateEventPtr _impl::doMakeEvent(const QJsonObject& obj) +{ + return makeIfMatches(obj, obj["type"].toString()); + +} diff --git a/lib/events/event.h b/lib/events/event.h index 396406f1..8449c2ec 100644 --- a/lib/events/event.h +++ b/lib/events/event.h @@ -53,7 +53,10 @@ namespace QMatrixClient } template - event_ptr_tt doMakeEvent(const QJsonObject& obj); + inline event_ptr_tt doMakeEvent(const QJsonObject& obj) + { + return create(obj); + } } class Event @@ -114,7 +117,7 @@ namespace QMatrixClient * parameter type) and create an event object of that type. */ template - event_ptr_tt makeEvent(const QJsonObject& obj) + inline event_ptr_tt makeEvent(const QJsonObject& obj) { auto e = _impl::doMakeEvent(obj); if (!e) @@ -128,50 +131,17 @@ namespace QMatrixClient EventPtr doMakeEvent(const QJsonObject& obj); } - template <> struct FromJson + template struct FromJson> { - EventPtr operator()(const QJsonValue& jv) const + auto operator()(const QJsonValue& jv) const { - return makeEvent(jv.toObject()); + return makeEvent(jv.toObject()); } }; - /** - * \brief A vector of pointers to events with deserialisation capabilities - * - * This is a simple wrapper over a generic vector type that adds - * a convenience method to deserialise events from QJsonArray. - * \tparam EventT base type of all events in the vector - */ template - class EventsBatch : public std::vector> - { - public: - /** - * \brief Deserialise events from an array - * - * Given the following JSON construct, creates events from - * the array stored at key "node": - * \code - * "container": { - * "node": [ { "event_id": "!evt1:srv.org", ... }, ... ] - * } - * \endcode - * \param container - the wrapping JSON object - * \param node - the key in container that holds the array of events - */ - void fromJson(const QJsonObject& container, const QString& node) - { - const auto objs = container.value(node).toArray(); - using size_type = typename std::vector>::size_type; - // The below line accommodates the difference in size types of - // STL and Qt containers. - this->reserve(static_cast(objs.size())); - for (const auto& objValue: objs) - this->emplace_back(makeEvent(objValue.toObject())); - } - }; - using Events = EventsBatch; + using EventsArray = std::vector>; + using Events = EventsArray; class RedactionEvent; @@ -231,8 +201,9 @@ namespace QMatrixClient event_ptr_tt _redactedBecause; QString _txnId; }; - using RoomEvents = EventsBatch; using RoomEventPtr = event_ptr_tt; + using RoomEvents = EventsArray; + using RoomEventsRange = Range; namespace _impl { @@ -240,29 +211,6 @@ namespace QMatrixClient RoomEventPtr doMakeEvent(const QJsonObject& obj); } - /** - * Conceptually similar to QStringView (but much more primitive), it's a - * simple abstraction over a pair of RoomEvents::const_iterator values - * referring to the beginning and the end of a range in a RoomEvents - * container. - */ - struct RoomEventsRange - { - RoomEvents::iterator from; - RoomEvents::iterator to; - - RoomEvents::size_type size() const - { - Q_ASSERT(std::distance(from, to) >= 0); - return RoomEvents::size_type(std::distance(from, to)); - } - bool empty() const { return from == to; } - RoomEvents::const_iterator begin() const { return from; } - RoomEvents::const_iterator end() const { return to; } - RoomEvents::iterator begin() { return from; } - RoomEvents::iterator end() { return to; } - }; - class StateEventBase: public RoomEvent { public: @@ -273,10 +221,18 @@ namespace QMatrixClient explicit StateEventBase(Type type) : RoomEvent(type) { } - ~StateEventBase() override = 0; + ~StateEventBase() override = default; virtual bool repeatsState() const; }; + using StateEventPtr = event_ptr_tt; + using StateEvents = EventsArray; + + namespace _impl + { + template <> + StateEventPtr doMakeEvent(const QJsonObject& obj); + } template struct Prev diff --git a/lib/jobs/generated/message_pagination.cpp b/lib/jobs/generated/message_pagination.cpp new file mode 100644 index 00000000..f89ccd03 --- /dev/null +++ b/lib/jobs/generated/message_pagination.cpp @@ -0,0 +1,76 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "message_pagination.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class GetRoomEventsJob::Private +{ + public: + QString begin; + QString end; + RoomEvents chunk; +}; + +BaseJob::Query queryToGetRoomEvents(const QString& from, const QString& to, const QString& dir, int limit, const QString& filter) +{ + BaseJob::Query _q; + _q.addQueryItem("from", from); + if (!to.isEmpty()) + _q.addQueryItem("to", to); + _q.addQueryItem("dir", dir); + _q.addQueryItem("limit", QString("%1").arg(limit)); + if (!filter.isEmpty()) + _q.addQueryItem("filter", filter); + return _q; +} + +QUrl GetRoomEventsJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& from, const QString& dir, const QString& to, int limit, const QString& filter) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/rooms/" % roomId % "/messages", + queryToGetRoomEvents(from, to, dir, limit, filter)); +} + +GetRoomEventsJob::GetRoomEventsJob(const QString& roomId, const QString& from, const QString& dir, const QString& to, int limit, const QString& filter) + : BaseJob(HttpVerb::Get, "GetRoomEventsJob", + basePath % "/rooms/" % roomId % "/messages", + queryToGetRoomEvents(from, to, dir, limit, filter)) + , d(new Private) +{ +} + +GetRoomEventsJob::~GetRoomEventsJob() = default; + +const QString& GetRoomEventsJob::begin() const +{ + return d->begin; +} + +const QString& GetRoomEventsJob::end() const +{ + return d->end; +} + +RoomEvents&& GetRoomEventsJob::chunk() +{ + return std::move(d->chunk); +} + +BaseJob::Status GetRoomEventsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->begin = fromJson(json.value("start")); + d->end = fromJson(json.value("end")); + d->chunk = fromJson(json.value("chunk")); + return Success; +} + diff --git a/lib/jobs/generated/message_pagination.h b/lib/jobs/generated/message_pagination.h new file mode 100644 index 00000000..b8588ad1 --- /dev/null +++ b/lib/jobs/generated/message_pagination.h @@ -0,0 +1,40 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include "events/event.h" + + +namespace QMatrixClient +{ + // Operations + + class GetRoomEventsJob : public BaseJob + { + public: + /** Construct a URL out of baseUrl and usual parameters passed to + * GetRoomEventsJob. This function can be used when + * a URL for GetRoomEventsJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& from, const QString& dir, const QString& to = {}, int limit = {}, const QString& filter = {}); + + explicit GetRoomEventsJob(const QString& roomId, const QString& from, const QString& dir, const QString& to = {}, int limit = {}, const QString& filter = {}); + ~GetRoomEventsJob() override; + + const QString& begin() const; + const QString& end() const; + RoomEvents&& chunk(); + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/jobs/roommessagesjob.cpp b/lib/jobs/roommessagesjob.cpp deleted file mode 100644 index e5568f17..00000000 --- a/lib/jobs/roommessagesjob.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/****************************************************************************** - * Copyright (C) 2016 Felix Rohrbach - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "roommessagesjob.h" - -using namespace QMatrixClient; - -class RoomMessagesJob::Private -{ - public: - RoomEvents events; - QString end; -}; - -RoomMessagesJob::RoomMessagesJob(const QString& roomId, const QString& from, - int limit, FetchDirection dir) - : BaseJob(HttpVerb::Get, "RoomMessagesJob", - QStringLiteral("/_matrix/client/r0/rooms/%1/messages").arg(roomId), - Query( - { { "from", from } - , { "dir", dir == FetchDirection::Backward ? "b" : "f" } - , { "limit", QString::number(limit) } - })) - , d(new Private) -{ - qCDebug(JOBS) << "Room messages query:" << query().toString(QUrl::PrettyDecoded); -} - -RoomMessagesJob::~RoomMessagesJob() -{ - delete d; -} - -RoomEvents&& RoomMessagesJob::releaseEvents() -{ - return move(d->events); -} - -QString RoomMessagesJob::end() const -{ - return d->end; -} - -BaseJob::Status RoomMessagesJob::parseJson(const QJsonDocument& data) -{ - const auto obj = data.object(); - d->events.fromJson(obj, "chunk"); - d->end = obj.value("end").toString(); - return Success; -} diff --git a/lib/jobs/roommessagesjob.h b/lib/jobs/roommessagesjob.h deleted file mode 100644 index 7b3fd9c9..00000000 --- a/lib/jobs/roommessagesjob.h +++ /dev/null @@ -1,47 +0,0 @@ -/****************************************************************************** - * Copyright (C) 2016 Felix Rohrbach - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#pragma once - -#include "basejob.h" - -#include "../events/event.h" - -namespace QMatrixClient -{ - enum class FetchDirection { Backward, Forward }; - - class RoomMessagesJob: public BaseJob - { - public: - RoomMessagesJob(const QString& roomId, const QString& from, - int limit = 10, - FetchDirection dir = FetchDirection::Backward); - virtual ~RoomMessagesJob(); - - RoomEvents&& releaseEvents(); - QString end() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - Private* d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/syncjob.cpp b/lib/jobs/syncjob.cpp index 435dfd0e..a739ea0d 100644 --- a/lib/jobs/syncjob.cpp +++ b/lib/jobs/syncjob.cpp @@ -54,11 +54,17 @@ SyncDataList&& SyncData::takeRoomData() return std::move(roomData); } -SyncBatch&& SyncData::takeAccountData() +Events&& SyncData::takeAccountData() { return std::move(accountData); } +template +inline EventsArrayT load(const QJsonObject& batches, StrT keyName) +{ + return fromJson(batches[keyName].toObject().value("events")); +} + BaseJob::Status SyncJob::parseJson(const QJsonDocument& data) { return d.parseJson(data); @@ -71,7 +77,7 @@ BaseJob::Status SyncData::parseJson(const QJsonDocument &data) auto json = data.object(); nextBatch_ = json.value("next_batch").toString(); // TODO: presence - accountData.fromJson(json); + accountData = load(json, "account_data"); QJsonObject rooms = json.value("rooms").toObject(); JoinStates::Int ii = 1; // ii is used to make a JoinState value @@ -96,33 +102,26 @@ SyncRoomData::SyncRoomData(const QString& roomId_, JoinState joinState_, const QJsonObject& room_) : roomId(roomId_) , joinState(joinState_) - , state(joinState == JoinState::Invite ? "invite_state" : "state") - , timeline("timeline") - , ephemeral("ephemeral") - , accountData("account_data") + , state(load(room_, + joinState == JoinState::Invite ? "invite_state" : "state")) { switch (joinState) { - case JoinState::Invite: - state.fromJson(room_); - break; case JoinState::Join: - state.fromJson(room_); - timeline.fromJson(room_); - ephemeral.fromJson(room_); - accountData.fromJson(room_); - break; + ephemeral = load(room_, "ephemeral"); + accountData = load(room_, "account_data"); + // [[fallthrough]] case JoinState::Leave: - state.fromJson(room_); - timeline.fromJson(room_); + { + timeline = load(room_, "timeline"); + auto timelineJson = room_.value("timeline").toObject(); + timelineLimited = timelineJson.value("limited").toBool(); + timelinePrevBatch = timelineJson.value("prev_batch").toString(); + break; - default: - qCWarning(SYNCJOB) << "SyncRoomData: Unknown JoinState value, ignoring:" << int(joinState); + } + default: /* nothing on top of state */; } - auto timelineJson = room_.value("timeline").toObject(); - timelineLimited = timelineJson.value("limited").toBool(); - timelinePrevBatch = timelineJson.value("prev_batch").toString(); - auto unreadJson = room_.value("unread_notifications").toObject(); unreadCount = unreadJson.value(UnreadCountKey).toInt(-2); highlightCount = unreadJson.value("highlight_count").toInt(); diff --git a/lib/jobs/syncjob.h b/lib/jobs/syncjob.h index 919060be..b12f9fff 100644 --- a/lib/jobs/syncjob.h +++ b/lib/jobs/syncjob.h @@ -26,30 +26,15 @@ namespace QMatrixClient { - template - class SyncBatch : public EventsBatch - { - public: - explicit SyncBatch(QString k) : jsonKey(std::move(k)) { } - void fromJson(const QJsonObject& roomContents) - { - EventsBatch::fromJson( - roomContents[jsonKey].toObject(), "events"); - } - - private: - QString jsonKey; - }; - class SyncRoomData { public: QString roomId; JoinState joinState; - SyncBatch state; - SyncBatch timeline; - SyncBatch ephemeral; - SyncBatch accountData; + StateEvents state; + RoomEvents timeline; + Events ephemeral; + Events accountData; bool timelineLimited; QString timelinePrevBatch; @@ -71,13 +56,13 @@ namespace QMatrixClient { public: BaseJob::Status parseJson(const QJsonDocument &data); - SyncBatch&& takeAccountData(); + Events&& takeAccountData(); SyncDataList&& takeRoomData(); QString nextBatch() const; private: QString nextBatch_; - SyncBatch accountData { "account_data" }; + Events accountData; SyncDataList roomData; }; diff --git a/lib/room.cpp b/lib/room.cpp index 5771c51d..6c708a42 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -25,6 +25,7 @@ #include "jobs/generated/receipts.h" #include "jobs/generated/redaction.h" #include "jobs/generated/account-data.h" +#include "jobs/generated/message_pagination.h" #include "jobs/setroomstatejob.h" #include "events/simplestateevents.h" #include "events/roomavatarevent.h" @@ -33,7 +34,6 @@ #include "events/receiptevent.h" #include "events/redactionevent.h" #include "jobs/sendeventjob.h" -#include "jobs/roommessagesjob.h" #include "jobs/mediathumbnailjob.h" #include "jobs/downloadfilejob.h" #include "jobs/postreadmarkersjob.h" @@ -112,7 +112,7 @@ class Room::Private TagsMap tags; QHash accountData; QString prevBatch; - QPointer roomMessagesJob; + QPointer eventsHistoryJob; struct FileTransferPrivateInfo { @@ -1036,21 +1036,31 @@ void Room::updateData(SyncRoomData&& data) for (auto&& event: data.accountData) processAccountDataEvent(move(event)); + bool emitNamesChanged = false; if (!data.state.empty()) { et.restart(); - processStateEvents(data.state); - qCDebug(PROFILER) << "*** Room::processStateEvents(state):" + for (const auto& e: data.state) + emitNamesChanged |= processStateEvent(*e); + + qCDebug(PROFILER) << "*** Room::processStateEvents():" << data.state.size() << "event(s)," << et; } if (!data.timeline.empty()) { et.restart(); // State changes can arrive in a timeline event; so check those. - processStateEvents(data.timeline); + for (const auto& e: data.timeline) + emitNamesChanged |= processStateEvent(*e); qCDebug(PROFILER) << "*** Room::processStateEvents(timeline):" << data.timeline.size() << "event(s)," << et; + } + if (emitNamesChanged) + emit namesChanged(this); + d->updateDisplayname(); + if (!data.timeline.empty()) + { et.restart(); d->addNewMessageEvents(move(data.timeline)); qCDebug(PROFILER) << "*** Room::addNewMessageEvents():" << et; @@ -1122,13 +1132,13 @@ void Room::getPreviousContent(int limit) void Room::Private::getPreviousContent(int limit) { - if( !isJobRunning(roomMessagesJob) ) + if( !isJobRunning(eventsHistoryJob) ) { - roomMessagesJob = - connection->callApi(id, prevBatch, limit); - connect( roomMessagesJob, &RoomMessagesJob::success, [=] { - prevBatch = roomMessagesJob->end(); - addHistoricalMessageEvents(roomMessagesJob->releaseEvents()); + eventsHistoryJob = + connection->callApi(id, prevBatch, "b", "", limit); + connect( eventsHistoryJob, &BaseJob::success, q, [=] { + prevBatch = eventsHistoryJob->end(); + addHistoricalMessageEvents(eventsHistoryJob->chunk()); }); } } @@ -1450,107 +1460,95 @@ void Room::Private::addHistoricalMessageEvents(RoomEvents&& events) Q_ASSERT(timeline.size() == timelineSize + insertedSize); } -void Room::processStateEvents(const RoomEvents& events) +bool Room::processStateEvent(const RoomEvent& e) { - bool emitNamesChanged = false; - for (const auto& e: events) + switch (e.type()) { - switch (e->type()) - { - case EventType::RoomName: { - auto* nameEvent = weakPtr(e); - d->name = nameEvent->name(); - qCDebug(MAIN) << "Room name updated:" << d->name; - emitNamesChanged = true; - break; - } - case EventType::RoomAliases: { - auto* aliasesEvent = weakPtr(e); - d->aliases = aliasesEvent->aliases(); - qCDebug(MAIN) << "Room aliases updated:" << d->aliases; - emitNamesChanged = true; - break; - } - case EventType::RoomCanonicalAlias: { - auto* aliasEvent = weakPtr(e); - d->canonicalAlias = aliasEvent->alias(); - setObjectName(d->canonicalAlias); - qCDebug(MAIN) << "Room canonical alias updated:" << d->canonicalAlias; - emitNamesChanged = true; - break; - } - case EventType::RoomTopic: { - auto* topicEvent = weakPtr(e); - d->topic = topicEvent->topic(); - qCDebug(MAIN) << "Room topic updated:" << d->topic; - emit topicChanged(); - break; + case EventType::RoomName: { + d->name = static_cast(e).name(); + qCDebug(MAIN) << "Room name updated:" << d->name; + return true; + } + case EventType::RoomAliases: { + d->aliases = static_cast(e).aliases(); + qCDebug(MAIN) << "Room aliases updated:" << d->aliases; + return true; + } + case EventType::RoomCanonicalAlias: { + d->canonicalAlias = + static_cast(e).alias(); + setObjectName(d->canonicalAlias); + qCDebug(MAIN) << "Room canonical alias updated:" << d->canonicalAlias; + return true; + } + case EventType::RoomTopic: { + d->topic = static_cast(e).topic(); + qCDebug(MAIN) << "Room topic updated:" << d->topic; + emit topicChanged(); + return false; + } + case EventType::RoomAvatar: { + const auto& avatarEventContent = + static_cast(e).content(); + if (d->avatar.updateUrl(avatarEventContent.url)) + { + qCDebug(MAIN) << "Room avatar URL updated:" + << avatarEventContent.url.toString(); + emit avatarChanged(); } - case EventType::RoomAvatar: { - const auto& avatarEventContent = - weakPtr(e)->content(); - if (d->avatar.updateUrl(avatarEventContent.url)) + return false; + } + case EventType::RoomMember: { + const auto& memberEvent = static_cast(e); + auto* u = user(memberEvent.userId()); + u->processEvent(memberEvent, this); + if (u == localUser() && memberJoinState(u) == JoinState::Invite + && memberEvent.isDirect()) + connection()->addToDirectChats(this, + user(memberEvent.senderId())); + + if( memberEvent.membership() == MembershipType::Join ) + { + if (memberJoinState(u) != JoinState::Join) { - qCDebug(MAIN) << "Room avatar URL updated:" - << avatarEventContent.url.toString(); - emit avatarChanged(); + d->insertMemberIntoMap(u); + connect(u, &User::nameAboutToChange, this, + [=] (QString newName, QString, const Room* context) { + if (context == this) + emit memberAboutToRename(u, newName); + }); + connect(u, &User::nameChanged, this, + [=] (QString, QString oldName, const Room* context) { + if (context == this) + d->renameMember(u, oldName); + }); + emit userAdded(u); } - break; } - case EventType::RoomMember: { - auto* memberEvent = weakPtr(e); - auto u = user(memberEvent->userId()); - u->processEvent(memberEvent, this); - if (u == localUser() && memberJoinState(u) == JoinState::Invite - && memberEvent->isDirect()) - connection()->addToDirectChats(this, - user(memberEvent->senderId())); - - if( memberEvent->membership() == MembershipType::Join ) - { - if (memberJoinState(u) != JoinState::Join) - { - d->insertMemberIntoMap(u); - connect(u, &User::nameAboutToChange, this, - [=] (QString newName, QString, const Room* context) { - if (context == this) - emit memberAboutToRename(u, newName); - }); - connect(u, &User::nameChanged, this, - [=] (QString, QString oldName, const Room* context) { - if (context == this) - d->renameMember(u, oldName); - }); - emit userAdded(u); - } - } - else if( memberEvent->membership() == MembershipType::Leave ) + else if( memberEvent.membership() == MembershipType::Leave ) + { + if (memberJoinState(u) == JoinState::Join) { - if (memberJoinState(u) == JoinState::Join) - { - if (!d->membersLeft.contains(u)) - d->membersLeft.append(u); - d->removeMemberFromMap(u->name(this), u); - emit userRemoved(u); - } + if (!d->membersLeft.contains(u)) + d->membersLeft.append(u); + d->removeMemberFromMap(u->name(this), u); + emit userRemoved(u); } - break; } - case EventType::RoomEncryption: - { - d->encryptionAlgorithm = - weakPtr(e)->algorithm(); - qCDebug(MAIN) << "Encryption switched on in" << displayName(); - emit encryption(); - break; - } - default: /* Ignore events of other types */; + return false; } + case EventType::RoomEncryption: + { + d->encryptionAlgorithm = + static_cast(e).algorithm(); + qCDebug(MAIN) << "Encryption switched on in" << displayName(); + emit encryption(); + return false; + } + default: + /* Ignore events of other types */ + return false; } - if (emitNamesChanged) { - emit namesChanged(this); - } - d->updateDisplayname(); } void Room::processEphemeralEvent(EventPtr&& event) diff --git a/lib/room.h b/lib/room.h index 288db5fb..7b4b3578 100644 --- a/lib/room.h +++ b/lib/room.h @@ -408,13 +408,14 @@ namespace QMatrixClient void fileTransferCancelled(QString id); protected: - virtual void processStateEvents(const RoomEvents& events); + /// Returns true if any of room names/aliases has changed + virtual bool processStateEvent(const RoomEvent& e); virtual void processEphemeralEvent(EventPtr&& event); virtual void processAccountDataEvent(EventPtr&& event); - virtual void onAddNewTimelineEvents(timeline_iter_t from) { } - virtual void onAddHistoricalTimelineEvents(rev_iter_t from) { } - virtual void onRedaction(const RoomEvent& prevEvent, - const RoomEvent& after) { } + virtual void onAddNewTimelineEvents(timeline_iter_t /*from*/) { } + virtual void onAddHistoricalTimelineEvents(rev_iter_t /*from*/) { } + virtual void onRedaction(const RoomEvent& /*prevEvent*/, + const RoomEvent& /*after*/) { } private: class Private; diff --git a/lib/user.cpp b/lib/user.cpp index 91b340d5..89e324f9 100644 --- a/lib/user.cpp +++ b/lib/user.cpp @@ -358,19 +358,20 @@ QUrl User::avatarUrl(const Room* room) const return avatarObject(room).url(); } -void User::processEvent(const RoomMemberEvent* event, const Room* room) +void User::processEvent(const RoomMemberEvent& event, const Room* room) { - if (event->membership() != MembershipType::Invite && - event->membership() != MembershipType::Join) + Q_ASSERT(room); + if (event.membership() != MembershipType::Invite && + event.membership() != MembershipType::Join) return; auto aboutToEnter = room->memberJoinState(this) == JoinState::Leave && - (event->membership() == MembershipType::Join || - event->membership() == MembershipType::Invite); + (event.membership() == MembershipType::Join || + event.membership() == MembershipType::Invite); if (aboutToEnter) ++d->totalRooms; - auto newName = event->displayName(); + auto newName = event.displayName(); // `bridged` value uses the same notification signal as the name; // it is assumed that first setting of the bridge occurs together with // the first setting of the name, and further bridge updates are @@ -390,17 +391,17 @@ void User::processEvent(const RoomMemberEvent* event, const Room* room) } newName.truncate(match.capturedStart(0)); } - if (event->prevContent()) + if (event.prevContent()) { // FIXME: the hint doesn't work for bridged users auto oldNameHint = - d->nameForRoom(room, event->prevContent()->displayName); + d->nameForRoom(room, event.prevContent()->displayName); updateName(newName, oldNameHint, room); - updateAvatarUrl(event->avatarUrl(), - d->avatarUrlForRoom(room, event->prevContent()->avatarUrl), + updateAvatarUrl(event.avatarUrl(), + d->avatarUrlForRoom(room, event.prevContent()->avatarUrl), room); } else { updateName(newName, room); - updateAvatarUrl(event->avatarUrl(), d->avatarUrlForRoom(room), room); + updateAvatarUrl(event.avatarUrl(), d->avatarUrlForRoom(room), room); } } diff --git a/lib/user.h b/lib/user.h index 8ac96539..76aa672f 100644 --- a/lib/user.h +++ b/lib/user.h @@ -103,8 +103,7 @@ namespace QMatrixClient QString avatarMediaId(const Room* room = nullptr) const; QUrl avatarUrl(const Room* room = nullptr) const; - void processEvent(const RoomMemberEvent* event, - const Room* r = nullptr); + void processEvent(const RoomMemberEvent& event, const Room* r); public slots: void rename(const QString& newName); diff --git a/lib/util.h b/lib/util.h index 55f3af6a..f65b05a3 100644 --- a/lib/util.h +++ b/lib/util.h @@ -58,6 +58,37 @@ namespace QMatrixClient static void qAsConst(const T &&) Q_DECL_EQ_DELETE; #endif + /** An abstraction over a pair of iterators + * This is a very basic range type over a container with iterators that + * are at least ForwardIterators. Inspired by Ranges TS. + */ + template + class Range + { + // Looking forward for Ranges TS to produce something (in C++23?..) + using iterator = typename ArrayT::iterator; + using const_iterator = typename ArrayT::const_iterator; + using size_type = typename ArrayT::size_type; + public: + Range(ArrayT& arr) : from(std::begin(arr)), to(std::end(arr)) { } + Range(iterator from, iterator to) : from(from), to(to) { } + + size_type size() const + { + Q_ASSERT(std::distance(from, to) >= 0); + return size_type(std::distance(from, to)); + } + bool empty() const { return from == to; } + const_iterator begin() const { return from; } + const_iterator end() const { return to; } + iterator begin() { return from; } + iterator end() { return to; } + + private: + iterator from; + iterator to; + }; + /** A guard pointer that disconnects an interested object upon destruction * It's almost QPointer<> except that you have to initialise it with one * more additional parameter - a pointer to a QObject that will be diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri index 4a0928b0..52a12be0 100644 --- a/libqmatrixclient.pri +++ b/libqmatrixclient.pri @@ -35,7 +35,6 @@ HEADERS += \ $$SRCPATH/jobs/sendeventjob.h \ $$SRCPATH/jobs/postreceiptjob.h \ $$SRCPATH/jobs/joinroomjob.h \ - $$SRCPATH/jobs/roommessagesjob.h \ $$SRCPATH/jobs/syncjob.h \ $$SRCPATH/jobs/mediathumbnailjob.h \ $$SRCPATH/jobs/setroomstatejob.h \ @@ -68,7 +67,6 @@ SOURCES += \ $$SRCPATH/jobs/sendeventjob.cpp \ $$SRCPATH/jobs/postreceiptjob.cpp \ $$SRCPATH/jobs/joinroomjob.cpp \ - $$SRCPATH/jobs/roommessagesjob.cpp \ $$SRCPATH/jobs/syncjob.cpp \ $$SRCPATH/jobs/mediathumbnailjob.cpp \ $$SRCPATH/jobs/setroomstatejob.cpp \ -- cgit v1.2.3 From f3927ca0c16a61fcb0933333ecff8095917a5b47 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 3 May 2018 20:10:14 +0900 Subject: jobs/generated: Drop unused code --- lib/jobs/generated/administrative_contact.cpp | 32 +++------------- lib/jobs/generated/administrative_contact.h | 2 - lib/jobs/generated/create_room.cpp | 43 ++------------------- lib/jobs/generated/create_room.h | 2 - lib/jobs/generated/list_public_rooms.cpp | 54 +++------------------------ lib/jobs/generated/list_public_rooms.h | 3 -- lib/jobs/generated/notifications.cpp | 8 ++-- lib/jobs/generated/notifications.h | 4 +- lib/jobs/generated/pusher.cpp | 47 +++-------------------- lib/jobs/generated/pusher.h | 3 -- lib/jobs/generated/users.cpp | 12 +----- lib/jobs/generated/users.h | 1 - 12 files changed, 28 insertions(+), 183 deletions(-) diff --git a/lib/jobs/generated/administrative_contact.cpp b/lib/jobs/generated/administrative_contact.cpp index b003c92d..ec7c77c3 100644 --- a/lib/jobs/generated/administrative_contact.cpp +++ b/lib/jobs/generated/administrative_contact.cpp @@ -12,14 +12,7 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); namespace QMatrixClient { - QJsonObject toJson(const GetAccount3PIDsJob::ThirdPartyIdentifier& pod) - { - QJsonObject o; - o.insert("medium", toJson(pod.medium)); - o.insert("address", toJson(pod.address)); - - return o; - } + // Converters template <> struct FromJson { @@ -31,7 +24,7 @@ namespace QMatrixClient fromJson(o.value("medium")); result.address = fromJson(o.value("address")); - + return result; } }; @@ -72,32 +65,17 @@ BaseJob::Status GetAccount3PIDsJob::parseJson(const QJsonDocument& data) namespace QMatrixClient { + // Converters + QJsonObject toJson(const Post3PIDsJob::ThreePidCredentials& pod) { QJsonObject o; o.insert("client_secret", toJson(pod.clientSecret)); o.insert("id_server", toJson(pod.idServer)); o.insert("sid", toJson(pod.sid)); - + return o; } - - template <> struct FromJson - { - Post3PIDsJob::ThreePidCredentials operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - Post3PIDsJob::ThreePidCredentials result; - result.clientSecret = - fromJson(o.value("client_secret")); - result.idServer = - fromJson(o.value("id_server")); - result.sid = - fromJson(o.value("sid")); - - return result; - } - }; } // namespace QMatrixClient Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind) diff --git a/lib/jobs/generated/administrative_contact.h b/lib/jobs/generated/administrative_contact.h index bd70f07b..9cb09a3c 100644 --- a/lib/jobs/generated/administrative_contact.h +++ b/lib/jobs/generated/administrative_contact.h @@ -23,7 +23,6 @@ namespace QMatrixClient { QString medium; QString address; - }; // End of inner data structures @@ -58,7 +57,6 @@ namespace QMatrixClient QString clientSecret; QString idServer; QString sid; - }; // End of inner data structures diff --git a/lib/jobs/generated/create_room.cpp b/lib/jobs/generated/create_room.cpp index 4fc75974..a417c2b1 100644 --- a/lib/jobs/generated/create_room.cpp +++ b/lib/jobs/generated/create_room.cpp @@ -12,62 +12,27 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); namespace QMatrixClient { + // Converters + QJsonObject toJson(const CreateRoomJob::Invite3pid& pod) { QJsonObject o; o.insert("id_server", toJson(pod.idServer)); o.insert("medium", toJson(pod.medium)); o.insert("address", toJson(pod.address)); - + return o; } - template <> struct FromJson - { - CreateRoomJob::Invite3pid operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - CreateRoomJob::Invite3pid result; - result.idServer = - fromJson(o.value("id_server")); - result.medium = - fromJson(o.value("medium")); - result.address = - fromJson(o.value("address")); - - return result; - } - }; -} // namespace QMatrixClient - -namespace QMatrixClient -{ QJsonObject toJson(const CreateRoomJob::StateEvent& pod) { QJsonObject o; o.insert("type", toJson(pod.type)); o.insert("state_key", toJson(pod.stateKey)); o.insert("content", toJson(pod.content)); - + return o; } - - template <> struct FromJson - { - CreateRoomJob::StateEvent operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - CreateRoomJob::StateEvent result; - result.type = - fromJson(o.value("type")); - result.stateKey = - fromJson(o.value("state_key")); - result.content = - fromJson(o.value("content")); - - return result; - } - }; } // namespace QMatrixClient class CreateRoomJob::Private diff --git a/lib/jobs/generated/create_room.h b/lib/jobs/generated/create_room.h index fdb11ada..526463b0 100644 --- a/lib/jobs/generated/create_room.h +++ b/lib/jobs/generated/create_room.h @@ -25,7 +25,6 @@ namespace QMatrixClient QString idServer; QString medium; QString address; - }; struct StateEvent @@ -33,7 +32,6 @@ namespace QMatrixClient QString type; QString stateKey; QJsonObject content; - }; // End of inner data structures diff --git a/lib/jobs/generated/list_public_rooms.cpp b/lib/jobs/generated/list_public_rooms.cpp index 9b4174cb..03664def 100644 --- a/lib/jobs/generated/list_public_rooms.cpp +++ b/lib/jobs/generated/list_public_rooms.cpp @@ -55,21 +55,7 @@ SetRoomVisibilityOnDirectoryJob::SetRoomVisibilityOnDirectoryJob(const QString& namespace QMatrixClient { - QJsonObject toJson(const GetPublicRoomsJob::PublicRoomsChunk& pod) - { - QJsonObject o; - o.insert("aliases", toJson(pod.aliases)); - o.insert("canonical_alias", toJson(pod.canonicalAlias)); - o.insert("name", toJson(pod.name)); - o.insert("num_joined_members", toJson(pod.numJoinedMembers)); - o.insert("room_id", toJson(pod.roomId)); - o.insert("topic", toJson(pod.topic)); - o.insert("world_readable", toJson(pod.worldReadable)); - o.insert("guest_can_join", toJson(pod.guestCanJoin)); - o.insert("avatar_url", toJson(pod.avatarUrl)); - - return o; - } + // Converters template <> struct FromJson { @@ -95,7 +81,7 @@ namespace QMatrixClient fromJson(o.value("guest_can_join")); result.avatarUrl = fromJson(o.value("avatar_url")); - + return result; } }; @@ -174,43 +160,13 @@ BaseJob::Status GetPublicRoomsJob::parseJson(const QJsonDocument& data) namespace QMatrixClient { + // Converters + QJsonObject toJson(const QueryPublicRoomsJob::Filter& pod) { QJsonObject o; o.insert("generic_search_term", toJson(pod.genericSearchTerm)); - - return o; - } - template <> struct FromJson - { - QueryPublicRoomsJob::Filter operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - QueryPublicRoomsJob::Filter result; - result.genericSearchTerm = - fromJson(o.value("generic_search_term")); - - return result; - } - }; -} // namespace QMatrixClient - -namespace QMatrixClient -{ - QJsonObject toJson(const QueryPublicRoomsJob::PublicRoomsChunk& pod) - { - QJsonObject o; - o.insert("aliases", toJson(pod.aliases)); - o.insert("canonical_alias", toJson(pod.canonicalAlias)); - o.insert("name", toJson(pod.name)); - o.insert("num_joined_members", toJson(pod.numJoinedMembers)); - o.insert("room_id", toJson(pod.roomId)); - o.insert("topic", toJson(pod.topic)); - o.insert("world_readable", toJson(pod.worldReadable)); - o.insert("guest_can_join", toJson(pod.guestCanJoin)); - o.insert("avatar_url", toJson(pod.avatarUrl)); - return o; } @@ -238,7 +194,7 @@ namespace QMatrixClient fromJson(o.value("guest_can_join")); result.avatarUrl = fromJson(o.value("avatar_url")); - + return result; } }; diff --git a/lib/jobs/generated/list_public_rooms.h b/lib/jobs/generated/list_public_rooms.h index 1e44e8b2..8e8fddca 100644 --- a/lib/jobs/generated/list_public_rooms.h +++ b/lib/jobs/generated/list_public_rooms.h @@ -59,7 +59,6 @@ namespace QMatrixClient bool worldReadable; bool guestCanJoin; QString avatarUrl; - }; // End of inner data structures @@ -95,7 +94,6 @@ namespace QMatrixClient struct Filter { QString genericSearchTerm; - }; struct PublicRoomsChunk @@ -109,7 +107,6 @@ namespace QMatrixClient bool worldReadable; bool guestCanJoin; QString avatarUrl; - }; // End of inner data structures diff --git a/lib/jobs/generated/notifications.cpp b/lib/jobs/generated/notifications.cpp index df6b10ba..04ad0175 100644 --- a/lib/jobs/generated/notifications.cpp +++ b/lib/jobs/generated/notifications.cpp @@ -12,6 +12,8 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); namespace QMatrixClient { + // Converters + template <> struct FromJson { GetNotificationsJob::Notification operator()(const QJsonValue& jv) @@ -30,7 +32,7 @@ namespace QMatrixClient fromJson(o.value("room_id")); result.ts = fromJson(o.value("ts")); - + return result; } }; @@ -76,9 +78,9 @@ const QString& GetNotificationsJob::nextToken() const return d->nextToken; } -const std::vector& GetNotificationsJob::notifications() const +std::vector&& GetNotificationsJob::notifications() { - return d->notifications; + return std::move(d->notifications); } BaseJob::Status GetNotificationsJob::parseJson(const QJsonDocument& data) diff --git a/lib/jobs/generated/notifications.h b/lib/jobs/generated/notifications.h index 798b9576..d66e15be 100644 --- a/lib/jobs/generated/notifications.h +++ b/lib/jobs/generated/notifications.h @@ -6,7 +6,6 @@ #include "../basejob.h" -#include #include "events/event.h" #include #include @@ -30,7 +29,6 @@ namespace QMatrixClient bool read; QString roomId; qint64 ts; - }; // End of inner data structures @@ -46,7 +44,7 @@ namespace QMatrixClient ~GetNotificationsJob() override; const QString& nextToken() const; - const std::vector& notifications() const; + std::vector&& notifications(); protected: Status parseJson(const QJsonDocument& data) override; diff --git a/lib/jobs/generated/pusher.cpp b/lib/jobs/generated/pusher.cpp index 7d5e80d1..dea7cf8b 100644 --- a/lib/jobs/generated/pusher.cpp +++ b/lib/jobs/generated/pusher.cpp @@ -12,13 +12,7 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); namespace QMatrixClient { - QJsonObject toJson(const GetPushersJob::PusherData& pod) - { - QJsonObject o; - o.insert("url", toJson(pod.url)); - - return o; - } + // Converters template <> struct FromJson { @@ -28,28 +22,10 @@ namespace QMatrixClient GetPushersJob::PusherData result; result.url = fromJson(o.value("url")); - + return result; } }; -} // namespace QMatrixClient - -namespace QMatrixClient -{ - QJsonObject toJson(const GetPushersJob::Pusher& pod) - { - QJsonObject o; - o.insert("pushkey", toJson(pod.pushkey)); - o.insert("kind", toJson(pod.kind)); - o.insert("app_id", toJson(pod.appId)); - o.insert("app_display_name", toJson(pod.appDisplayName)); - o.insert("device_display_name", toJson(pod.deviceDisplayName)); - o.insert("profile_tag", toJson(pod.profileTag)); - o.insert("lang", toJson(pod.lang)); - o.insert("data", toJson(pod.data)); - - return o; - } template <> struct FromJson { @@ -73,7 +49,7 @@ namespace QMatrixClient fromJson(o.value("lang")); result.data = fromJson(o.value("data")); - + return result; } }; @@ -114,26 +90,15 @@ BaseJob::Status GetPushersJob::parseJson(const QJsonDocument& data) namespace QMatrixClient { + // Converters + QJsonObject toJson(const PostPusherJob::PusherData& pod) { QJsonObject o; o.insert("url", toJson(pod.url)); - + return o; } - - template <> struct FromJson - { - PostPusherJob::PusherData operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - PostPusherJob::PusherData result; - result.url = - fromJson(o.value("url")); - - return result; - } - }; } // namespace QMatrixClient PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag, bool append) diff --git a/lib/jobs/generated/pusher.h b/lib/jobs/generated/pusher.h index 23cd3fb6..06a2c832 100644 --- a/lib/jobs/generated/pusher.h +++ b/lib/jobs/generated/pusher.h @@ -22,7 +22,6 @@ namespace QMatrixClient struct PusherData { QString url; - }; struct Pusher @@ -35,7 +34,6 @@ namespace QMatrixClient QString profileTag; QString lang; PusherData data; - }; // End of inner data structures @@ -68,7 +66,6 @@ namespace QMatrixClient struct PusherData { QString url; - }; // End of inner data structures diff --git a/lib/jobs/generated/users.cpp b/lib/jobs/generated/users.cpp index f82a2a64..fd2944e4 100644 --- a/lib/jobs/generated/users.cpp +++ b/lib/jobs/generated/users.cpp @@ -12,15 +12,7 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); namespace QMatrixClient { - QJsonObject toJson(const SearchUserDirectoryJob::User& pod) - { - QJsonObject o; - o.insert("user_id", toJson(pod.userId)); - o.insert("display_name", toJson(pod.displayName)); - o.insert("avatar_url", toJson(pod.avatarUrl)); - - return o; - } + // Converters template <> struct FromJson { @@ -34,7 +26,7 @@ namespace QMatrixClient fromJson(o.value("display_name")); result.avatarUrl = fromJson(o.value("avatar_url")); - + return result; } }; diff --git a/lib/jobs/generated/users.h b/lib/jobs/generated/users.h index bfa688c8..50b8b648 100644 --- a/lib/jobs/generated/users.h +++ b/lib/jobs/generated/users.h @@ -24,7 +24,6 @@ namespace QMatrixClient QString userId; QString displayName; QString avatarUrl; - }; // End of inner data structures -- cgit v1.2.3 From a5b6d786878ab5c67a7b436ba475e8ac4d22f1f0 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 3 May 2018 22:41:12 +0900 Subject: Preempt jobs/joinroomjob.* with jobs/generated/joining.* Enables responding to third-party invites. --- CMakeLists.txt | 1 - lib/connection.cpp | 2 +- lib/jobs/generated/joining.cpp | 118 +++++++++++++++++++++++++++++++++++++++++ lib/jobs/generated/joining.h | 77 +++++++++++++++++++++++++++ lib/jobs/joinroomjob.cpp | 58 -------------------- lib/jobs/joinroomjob.h | 40 -------------- libqmatrixclient.pri | 2 - 7 files changed, 196 insertions(+), 102 deletions(-) create mode 100644 lib/jobs/generated/joining.cpp create mode 100644 lib/jobs/generated/joining.h delete mode 100644 lib/jobs/joinroomjob.cpp delete mode 100644 lib/jobs/joinroomjob.h diff --git a/CMakeLists.txt b/CMakeLists.txt index c69d0cfa..5da87063 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,7 +84,6 @@ set(libqmatrixclient_SRCS lib/jobs/checkauthmethods.cpp lib/jobs/sendeventjob.cpp lib/jobs/setroomstatejob.cpp - lib/jobs/joinroomjob.cpp lib/jobs/syncjob.cpp lib/jobs/mediathumbnailjob.cpp lib/jobs/downloadfilejob.cpp diff --git a/lib/connection.cpp b/lib/connection.cpp index b433ccbc..05640c66 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -28,8 +28,8 @@ #include "jobs/generated/receipts.h" #include "jobs/generated/leaving.h" #include "jobs/generated/account-data.h" +#include "jobs/generated/joining.h" #include "jobs/sendeventjob.h" -#include "jobs/joinroomjob.h" #include "jobs/syncjob.h" #include "jobs/mediathumbnailjob.h" #include "jobs/downloadfilejob.h" diff --git a/lib/jobs/generated/joining.cpp b/lib/jobs/generated/joining.cpp new file mode 100644 index 00000000..705e8f83 --- /dev/null +++ b/lib/jobs/generated/joining.cpp @@ -0,0 +1,118 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "joining.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +namespace QMatrixClient +{ + // Converters + + QJsonObject toJson(const JoinRoomByIdJob::ThirdPartySigned& pod) + { + QJsonObject o; + o.insert("sender", toJson(pod.sender)); + o.insert("mxid", toJson(pod.mxid)); + o.insert("token", toJson(pod.token)); + o.insert("signatures", toJson(pod.signatures)); + + return o; + } +} // namespace QMatrixClient + +class JoinRoomByIdJob::Private +{ + public: + QString roomId; +}; + +JoinRoomByIdJob::JoinRoomByIdJob(const QString& roomId, const ThirdPartySigned& thirdPartySigned) + : BaseJob(HttpVerb::Post, "JoinRoomByIdJob", + basePath % "/rooms/" % roomId % "/join") + , d(new Private) +{ + QJsonObject _data; + _data.insert("third_party_signed", toJson(thirdPartySigned)); + setRequestData(_data); +} + +JoinRoomByIdJob::~JoinRoomByIdJob() = default; + +const QString& JoinRoomByIdJob::roomId() const +{ + return d->roomId; +} + +BaseJob::Status JoinRoomByIdJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("room_id")) + return { JsonParseError, + "The key 'room_id' not found in the response" }; + d->roomId = fromJson(json.value("room_id")); + return Success; +} + +namespace QMatrixClient +{ + // Converters + + QJsonObject toJson(const JoinRoomJob::Signed& pod) + { + QJsonObject o; + o.insert("sender", toJson(pod.sender)); + o.insert("mxid", toJson(pod.mxid)); + o.insert("token", toJson(pod.token)); + o.insert("signatures", toJson(pod.signatures)); + + return o; + } + + QJsonObject toJson(const JoinRoomJob::ThirdPartySigned& pod) + { + QJsonObject o; + o.insert("signed", toJson(pod.signedData)); + + return o; + } +} // namespace QMatrixClient + +class JoinRoomJob::Private +{ + public: + QString roomId; +}; + +JoinRoomJob::JoinRoomJob(const QString& roomIdOrAlias, const ThirdPartySigned& thirdPartySigned) + : BaseJob(HttpVerb::Post, "JoinRoomJob", + basePath % "/join/" % roomIdOrAlias) + , d(new Private) +{ + QJsonObject _data; + _data.insert("third_party_signed", toJson(thirdPartySigned)); + setRequestData(_data); +} + +JoinRoomJob::~JoinRoomJob() = default; + +const QString& JoinRoomJob::roomId() const +{ + return d->roomId; +} + +BaseJob::Status JoinRoomJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("room_id")) + return { JsonParseError, + "The key 'room_id' not found in the response" }; + d->roomId = fromJson(json.value("room_id")); + return Success; +} + diff --git a/lib/jobs/generated/joining.h b/lib/jobs/generated/joining.h new file mode 100644 index 00000000..76edb339 --- /dev/null +++ b/lib/jobs/generated/joining.h @@ -0,0 +1,77 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class JoinRoomByIdJob : public BaseJob + { + public: + // Inner data structures + + struct ThirdPartySigned + { + QString sender; + QString mxid; + QString token; + QJsonObject signatures; + }; + + // End of inner data structures + + explicit JoinRoomByIdJob(const QString& roomId, const ThirdPartySigned& thirdPartySigned = {}); + ~JoinRoomByIdJob() override; + + const QString& roomId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class JoinRoomJob : public BaseJob + { + public: + // Inner data structures + + struct Signed + { + QString sender; + QString mxid; + QString token; + QJsonObject signatures; + }; + + struct ThirdPartySigned + { + Signed signedData; + }; + + // End of inner data structures + + explicit JoinRoomJob(const QString& roomIdOrAlias, const ThirdPartySigned& thirdPartySigned = {}); + ~JoinRoomJob() override; + + const QString& roomId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/jobs/joinroomjob.cpp b/lib/jobs/joinroomjob.cpp deleted file mode 100644 index 66a75089..00000000 --- a/lib/jobs/joinroomjob.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/****************************************************************************** - * Copyright (C) 2015 Felix Rohrbach - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "joinroomjob.h" -#include "util.h" - -using namespace QMatrixClient; - -class JoinRoomJob::Private -{ - public: - QString roomId; -}; - -JoinRoomJob::JoinRoomJob(const QString& roomAlias) - : BaseJob(HttpVerb::Post, "JoinRoomJob", - QStringLiteral("_matrix/client/r0/join/%1").arg(roomAlias)) - , d(new Private) -{ -} - -JoinRoomJob::~JoinRoomJob() -{ - delete d; -} - -QString JoinRoomJob::roomId() -{ - return d->roomId; -} - -BaseJob::Status JoinRoomJob::parseJson(const QJsonDocument& data) -{ - QJsonObject json = data.object(); - if( json.contains("room_id") ) - { - d->roomId = json.value("room_id").toString(); - return Success; - } - - qCDebug(JOBS) << data; - return { UserDefinedError, "No room_id in the JSON response" }; -} diff --git a/lib/jobs/joinroomjob.h b/lib/jobs/joinroomjob.h deleted file mode 100644 index f3ba216f..00000000 --- a/lib/jobs/joinroomjob.h +++ /dev/null @@ -1,40 +0,0 @@ -/****************************************************************************** - * Copyright (C) 2015 Felix Rohrbach - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#pragma once - -#include "basejob.h" - -namespace QMatrixClient -{ - class JoinRoomJob: public BaseJob - { - public: - explicit JoinRoomJob(const QString& roomAlias); - virtual ~JoinRoomJob(); - - QString roomId(); - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - Private* d; - }; -} // namespace QMatrixClient diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri index 52a12be0..39e153a2 100644 --- a/libqmatrixclient.pri +++ b/libqmatrixclient.pri @@ -34,7 +34,6 @@ HEADERS += \ $$SRCPATH/jobs/passwordlogin.h \ $$SRCPATH/jobs/sendeventjob.h \ $$SRCPATH/jobs/postreceiptjob.h \ - $$SRCPATH/jobs/joinroomjob.h \ $$SRCPATH/jobs/syncjob.h \ $$SRCPATH/jobs/mediathumbnailjob.h \ $$SRCPATH/jobs/setroomstatejob.h \ @@ -66,7 +65,6 @@ SOURCES += \ $$SRCPATH/jobs/passwordlogin.cpp \ $$SRCPATH/jobs/sendeventjob.cpp \ $$SRCPATH/jobs/postreceiptjob.cpp \ - $$SRCPATH/jobs/joinroomjob.cpp \ $$SRCPATH/jobs/syncjob.cpp \ $$SRCPATH/jobs/mediathumbnailjob.cpp \ $$SRCPATH/jobs/setroomstatejob.cpp \ -- cgit v1.2.3 From 90868cac42ab8ad69cb3f3a29949e0815cc5a7ce Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 3 May 2018 23:15:06 +0900 Subject: gtad.yaml: Update regexes to match string parts According to KitsuneRal/gtad#31. --- lib/jobs/gtad.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/jobs/gtad.yaml b/lib/jobs/gtad.yaml index 4ef55bce..89862da2 100644 --- a/lib/jobs/gtad.yaml +++ b/lib/jobs/gtad.yaml @@ -52,17 +52,17 @@ analyzer: avoidCopy?: true file: *ByteStream object: - - /.+m\.room\.member/: # A stub for EventsBatch + - /m\.room\.member$/: # A stub for EventsBatch type: none - - /.+state_event.yaml/: + - /state_event.yaml$/: type: StateEventPtr noCopy?: true imports: '"events/event.h"' - - /.*room_event.yaml/: + - /room_event.yaml$/: type: RoomEventPtr noCopy?: true imports: '"events/event.h"' - - /.*event.yaml/: + - /event.yaml$/: type: EventPtr noCopy?: true imports: '"events/event.h"' @@ -75,17 +75,17 @@ analyzer: type: "std::vector<{{1}}>" noCopy?: true imports: '"events/event.h"' - - /.+m\.room\.member/: + - /m\.room\.member$/: type: "EventsArray" noCopy?: true imports: '"events/roommemberevent.h"' - - /.+state_event.yaml/: + - /state_event.yaml$/: type: StateEvents noCopy?: true - - /.+room_event.yaml/: + - /room_event.yaml$/: type: RoomEvents noCopy?: true - - /.+event.yaml/: + - /event.yaml$/: type: Events noCopy?: true - /.+/: -- cgit v1.2.3 From 844eddfffb8e1ee5d213371299dee0d15614bef8 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 3 May 2018 23:20:31 +0900 Subject: .travis.yml: Use newer Qt Because GTAD needs it. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 531eec3e..0b2967cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,10 @@ addons: apt: sources: - ubuntu-toolchain-r-test - - sourceline: 'ppa:beineri/opt-qt563-trusty' + - sourceline: 'ppa:beineri/opt-qt571-trusty' packages: - g++-5 - - qt56base + - qt57base - valgrind matrix: @@ -22,7 +22,7 @@ matrix: before_install: - eval "${ENV_EVAL}" -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then VALGRIND="valgrind $VALGRIND_OPTIONS"; . /opt/qt56/bin/qt56-env.sh; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then VALGRIND="valgrind $VALGRIND_OPTIONS"; . /opt/qt57/bin/qt57-env.sh; fi install: - git clone https://github.com/QMatrixClient/matrix-doc.git -- cgit v1.2.3 From 28a0d70164e2596d306521cd18d25c0e8c0b5336 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 12:13:43 +0900 Subject: EvT::TypeId: Use a member function instead of a variable The latter one causes linkage errors when used from a template method (but not from a template class, puzzlingly). --- lib/events/accountdataevents.h | 3 +-- lib/events/directchatevent.h | 2 +- lib/events/event.cpp | 2 +- lib/events/receiptevent.cpp | 2 +- lib/events/receiptevent.h | 2 +- lib/events/redactionevent.h | 2 +- lib/events/roomavatarevent.h | 2 +- lib/events/roommemberevent.h | 2 +- lib/events/roommessageevent.h | 2 +- lib/events/simplestateevents.h | 2 +- lib/events/typingevent.h | 2 +- lib/jobs/sendeventjob.h | 2 +- lib/jobs/setroomstatejob.h | 4 ++-- lib/room.cpp | 2 +- 14 files changed, 15 insertions(+), 16 deletions(-) diff --git a/lib/events/accountdataevents.h b/lib/events/accountdataevents.h index f3ba27bb..11667172 100644 --- a/lib/events/accountdataevents.h +++ b/lib/events/accountdataevents.h @@ -54,8 +54,7 @@ namespace QMatrixClient class _Name : public Event \ { \ public: \ - static constexpr const char* TypeId = _TypeId; \ - static const char* typeId() { return TypeId; } \ + static constexpr const char* typeId() { return _TypeId; } \ explicit _Name(const QJsonObject& obj) \ : Event((_EnumType), obj) \ , _content(contentJson(), QStringLiteral(#_ContentKey)) \ diff --git a/lib/events/directchatevent.h b/lib/events/directchatevent.h index 2b0ad0a0..bd8f2d35 100644 --- a/lib/events/directchatevent.h +++ b/lib/events/directchatevent.h @@ -29,6 +29,6 @@ namespace QMatrixClient QMultiHash usersToDirectChats() const; - static constexpr const char * TypeId = "m.direct"; + static constexpr const char* typeId() { return "m.direct"; } }; } diff --git a/lib/events/event.cpp b/lib/events/event.cpp index 57049671..c2b92a50 100644 --- a/lib/events/event.cpp +++ b/lib/events/event.cpp @@ -76,7 +76,7 @@ template inline event_ptr_tt makeIfMatches(const QJsonObject& o, const QString& selector) { - if (selector == EventT::TypeId) + if (selector == EventT::typeId()) return _impl::create(o); return makeIfMatches(o, selector); diff --git a/lib/events/receiptevent.cpp b/lib/events/receiptevent.cpp index 7555db82..a12f4c05 100644 --- a/lib/events/receiptevent.cpp +++ b/lib/events/receiptevent.cpp @@ -43,7 +43,7 @@ using namespace QMatrixClient; ReceiptEvent::ReceiptEvent(const QJsonObject& obj) : Event(Type::Receipt, obj) { - Q_ASSERT(obj["type"].toString() == TypeId); + Q_ASSERT(obj["type"].toString() == typeId()); const QJsonObject contents = contentJson(); _eventsWithReceipts.reserve(contents.size()); diff --git a/lib/events/receiptevent.h b/lib/events/receiptevent.h index 5b99ae3f..e1d2d1ec 100644 --- a/lib/events/receiptevent.h +++ b/lib/events/receiptevent.h @@ -42,7 +42,7 @@ namespace QMatrixClient EventsWithReceipts eventsWithReceipts() const { return _eventsWithReceipts; } - static constexpr const char* const TypeId = "m.receipt"; + static constexpr const char* typeId() { return "m.receipt"; } private: EventsWithReceipts _eventsWithReceipts; diff --git a/lib/events/redactionevent.h b/lib/events/redactionevent.h index 829b9085..dad54788 100644 --- a/lib/events/redactionevent.h +++ b/lib/events/redactionevent.h @@ -25,7 +25,7 @@ namespace QMatrixClient class RedactionEvent : public RoomEvent { public: - static constexpr const char* const TypeId = "m.room.redaction"; + static constexpr const char* typeId() { return "m.room.redaction"; } explicit RedactionEvent(const QJsonObject& obj) : RoomEvent(Type::Redaction, obj) diff --git a/lib/events/roomavatarevent.h b/lib/events/roomavatarevent.h index ccfe8fbf..0e44ad7c 100644 --- a/lib/events/roomavatarevent.h +++ b/lib/events/roomavatarevent.h @@ -37,7 +37,7 @@ namespace QMatrixClient : StateEvent(Type::RoomAvatar, obj) { } - static constexpr const char* TypeId = "m.room.avatar"; + static constexpr const char* typeId() { return "m.room.avatar"; } }; } // namespace QMatrixClient diff --git a/lib/events/roommemberevent.h b/lib/events/roommemberevent.h index 5f1e578d..8e0cc0a4 100644 --- a/lib/events/roommemberevent.h +++ b/lib/events/roommemberevent.h @@ -52,7 +52,7 @@ namespace QMatrixClient { Q_GADGET public: - static constexpr const char* TypeId = "m.room.member"; + static constexpr const char* typeId() { return "m.room.member"; } using MembershipType = MemberEventContent::MembershipType; diff --git a/lib/events/roommessageevent.h b/lib/events/roommessageevent.h index a55564ed..dc734b6e 100644 --- a/lib/events/roommessageevent.h +++ b/lib/events/roommessageevent.h @@ -65,7 +65,7 @@ namespace QMatrixClient QJsonObject toJson() const; - static constexpr const char* TypeId = "m.room.message"; + static constexpr const char* typeId() { return "m.room.message"; } private: QString _msgtype; diff --git a/lib/events/simplestateevents.h b/lib/events/simplestateevents.h index 6b0cd51a..d9f403e8 100644 --- a/lib/events/simplestateevents.h +++ b/lib/events/simplestateevents.h @@ -28,7 +28,7 @@ namespace QMatrixClient : public StateEvent> \ { \ public: \ - static constexpr const char* TypeId = _TypeId; \ + static constexpr const char* typeId() { return _TypeId; } \ explicit _Name(const QJsonObject& obj) \ : StateEvent(_EnumType, obj, QStringLiteral(#_ContentKey)) \ { } \ diff --git a/lib/events/typingevent.h b/lib/events/typingevent.h index 8c9551a4..6ccbc1c8 100644 --- a/lib/events/typingevent.h +++ b/lib/events/typingevent.h @@ -27,7 +27,7 @@ namespace QMatrixClient class TypingEvent: public Event { public: - static constexpr const char* const TypeId = "m.typing"; + static constexpr const char* typeId() { return "m.typing"; } TypingEvent(const QJsonObject& obj); diff --git a/lib/jobs/sendeventjob.h b/lib/jobs/sendeventjob.h index 3a11eb6a..a3e9a291 100644 --- a/lib/jobs/sendeventjob.h +++ b/lib/jobs/sendeventjob.h @@ -32,7 +32,7 @@ namespace QMatrixClient SendEventJob(const QString& roomId, const EvT& event) : BaseJob(HttpVerb::Put, QStringLiteral("SendEventJob"), QStringLiteral("_matrix/client/r0/rooms/%1/send/%2/") - .arg(roomId, EvT::TypeId), // See also beforeStart() + .arg(roomId, EvT::typeId()), // See also beforeStart() Query(), Data(event.toJson())) { } diff --git a/lib/jobs/setroomstatejob.h b/lib/jobs/setroomstatejob.h index b7e6d4a1..36047667 100644 --- a/lib/jobs/setroomstatejob.h +++ b/lib/jobs/setroomstatejob.h @@ -36,7 +36,7 @@ namespace QMatrixClient const EvT& event) : BaseJob(HttpVerb::Put, "SetRoomStateJob", QStringLiteral("_matrix/client/r0/rooms/%1/state/%2/%3") - .arg(roomId, EvT::TypeId, stateKey), + .arg(roomId, EvT::typeId(), stateKey), Query(), Data(event.toJson())) { } @@ -48,7 +48,7 @@ namespace QMatrixClient SetRoomStateJob(const QString& roomId, const EvT& event) : BaseJob(HttpVerb::Put, "SetRoomStateJob", QStringLiteral("_matrix/client/r0/rooms/%1/state/%2") - .arg(roomId, EvT::TypeId), + .arg(roomId, EvT::typeId()), Query(), Data(event.toJson())) { } diff --git a/lib/room.cpp b/lib/room.cpp index 6c708a42..f8f195e1 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -1774,7 +1774,7 @@ void appendEvent(QJsonArray& events, const QString& type, template void appendEvent(QJsonArray& events, const EvtT& event) { - appendEvent(events, EvtT::TypeId, event.toJson()); + appendEvent(events, EvtT::typeId(), event.toJson()); } QJsonObject Room::Private::toJson() const -- cgit v1.2.3 From 4cbe1a5fe9b0ae17e89425c3127db2af9b328320 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 12:12:07 +0900 Subject: Preempt job/setroomstatejob.* with jobs/generated/room_state.* The template part (not exposed in the auto-generated class) goes to Room::Private::requestSetState(). Also, Room::setMemberState() to interface with User class. --- CMakeLists.txt | 1 - lib/jobs/generated/room_state.cpp | 70 +++++++++++++++++++++++++++++++++++++++ lib/jobs/generated/room_state.h | 47 ++++++++++++++++++++++++++ lib/jobs/setroomstatejob.cpp | 32 ------------------ lib/jobs/setroomstatejob.h | 64 ----------------------------------- lib/room.cpp | 29 ++++++++++++---- lib/room.h | 4 +++ lib/user.cpp | 5 ++- libqmatrixclient.pri | 2 -- 9 files changed, 146 insertions(+), 108 deletions(-) create mode 100644 lib/jobs/generated/room_state.cpp create mode 100644 lib/jobs/generated/room_state.h delete mode 100644 lib/jobs/setroomstatejob.cpp delete mode 100644 lib/jobs/setroomstatejob.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 5da87063..96bca983 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,6 @@ set(libqmatrixclient_SRCS lib/jobs/basejob.cpp lib/jobs/checkauthmethods.cpp lib/jobs/sendeventjob.cpp - lib/jobs/setroomstatejob.cpp lib/jobs/syncjob.cpp lib/jobs/mediathumbnailjob.cpp lib/jobs/downloadfilejob.cpp diff --git a/lib/jobs/generated/room_state.cpp b/lib/jobs/generated/room_state.cpp new file mode 100644 index 00000000..39f36afb --- /dev/null +++ b/lib/jobs/generated/room_state.cpp @@ -0,0 +1,70 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "room_state.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class SetRoomStateWithKeyJob::Private +{ + public: + QString eventId; +}; + +SetRoomStateWithKeyJob::SetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey, const QJsonObject& body) + : BaseJob(HttpVerb::Put, "SetRoomStateWithKeyJob", + basePath % "/rooms/" % roomId % "/state/" % eventType % "/" % stateKey) + , d(new Private) +{ + setRequestData(Data(toJson(body))); +} + +SetRoomStateWithKeyJob::~SetRoomStateWithKeyJob() = default; + +const QString& SetRoomStateWithKeyJob::eventId() const +{ + return d->eventId; +} + +BaseJob::Status SetRoomStateWithKeyJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->eventId = fromJson(json.value("event_id")); + return Success; +} + +class SetRoomStateJob::Private +{ + public: + QString eventId; +}; + +SetRoomStateJob::SetRoomStateJob(const QString& roomId, const QString& eventType, const QJsonObject& body) + : BaseJob(HttpVerb::Put, "SetRoomStateJob", + basePath % "/rooms/" % roomId % "/state/" % eventType) + , d(new Private) +{ + setRequestData(Data(toJson(body))); +} + +SetRoomStateJob::~SetRoomStateJob() = default; + +const QString& SetRoomStateJob::eventId() const +{ + return d->eventId; +} + +BaseJob::Status SetRoomStateJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->eventId = fromJson(json.value("event_id")); + return Success; +} + diff --git a/lib/jobs/generated/room_state.h b/lib/jobs/generated/room_state.h new file mode 100644 index 00000000..5d16b2a6 --- /dev/null +++ b/lib/jobs/generated/room_state.h @@ -0,0 +1,47 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "../basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class SetRoomStateWithKeyJob : public BaseJob + { + public: + explicit SetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey, const QJsonObject& body = {}); + ~SetRoomStateWithKeyJob() override; + + const QString& eventId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class SetRoomStateJob : public BaseJob + { + public: + explicit SetRoomStateJob(const QString& roomId, const QString& eventType, const QJsonObject& body = {}); + ~SetRoomStateJob() override; + + const QString& eventId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/jobs/setroomstatejob.cpp b/lib/jobs/setroomstatejob.cpp deleted file mode 100644 index c2beb87b..00000000 --- a/lib/jobs/setroomstatejob.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/****************************************************************************** - * Copyright (C) 2015 Felix Rohrbach - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "setroomstatejob.h" - -using namespace QMatrixClient; - -BaseJob::Status SetRoomStateJob::parseJson(const QJsonDocument& data) -{ - _eventId = data.object().value("event_id").toString(); - if (!_eventId.isEmpty()) - return Success; - - qCDebug(JOBS) << data; - return { UserDefinedError, "No event_id in the JSON response" }; -} - diff --git a/lib/jobs/setroomstatejob.h b/lib/jobs/setroomstatejob.h deleted file mode 100644 index 36047667..00000000 --- a/lib/jobs/setroomstatejob.h +++ /dev/null @@ -1,64 +0,0 @@ -/****************************************************************************** - * Copyright (C) 2015 Felix Rohrbach - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#pragma once - -#include "basejob.h" - -#include "connectiondata.h" - -namespace QMatrixClient -{ - class SetRoomStateJob: public BaseJob - { - public: - /** - * Constructs a job that sets a state using an arbitrary room event - * with a state key. - */ - template - SetRoomStateJob(const QString& roomId, const QString& stateKey, - const EvT& event) - : BaseJob(HttpVerb::Put, "SetRoomStateJob", - QStringLiteral("_matrix/client/r0/rooms/%1/state/%2/%3") - .arg(roomId, EvT::typeId(), stateKey), - Query(), - Data(event.toJson())) - { } - /** - * Constructs a job that sets a state using an arbitrary room event - * without a state key. - */ - template - SetRoomStateJob(const QString& roomId, const EvT& event) - : BaseJob(HttpVerb::Put, "SetRoomStateJob", - QStringLiteral("_matrix/client/r0/rooms/%1/state/%2") - .arg(roomId, EvT::typeId()), - Query(), - Data(event.toJson())) - { } - - QString eventId() const { return _eventId; } - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - QString _eventId; - }; -} // namespace QMatrixClient diff --git a/lib/room.cpp b/lib/room.cpp index f8f195e1..2ec5a591 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -26,7 +26,7 @@ #include "jobs/generated/redaction.h" #include "jobs/generated/account-data.h" #include "jobs/generated/message_pagination.h" -#include "jobs/setroomstatejob.h" +#include "jobs/generated/room_state.h" #include "events/simplestateevents.h" #include "events/roomavatarevent.h" #include "events/roommemberevent.h" @@ -199,6 +199,20 @@ class Room::Private void markMessagesAsRead(rev_iter_t upToMarker); + template + auto requestSetState(const QString& stateKey, const EvT& event) + { + return connection->callApi( + id, EvT::typeId(), stateKey, event.toJson()); + } + + template + auto requestSetState(const EvT& event) + { + return connection->callApi( + id, EvT::typeId(), event.toJson()); + } + /** * @brief Apply redaction to the timeline * @@ -1110,19 +1124,17 @@ void Room::postMessage(const RoomMessageEvent& event) void Room::setName(const QString& newName) { - connection()->callApi(id(), RoomNameEvent(newName)); + d->requestSetState(RoomNameEvent(newName)); } void Room::setCanonicalAlias(const QString& newAlias) { - connection()->callApi(id(), - RoomCanonicalAliasEvent(newAlias)); + d->requestSetState(RoomCanonicalAliasEvent(newAlias)); } void Room::setTopic(const QString& newTopic) { - RoomTopicEvent evt(newTopic); - connection()->callApi(id(), evt); + d->requestSetState(RoomTopicEvent(newTopic)); } void Room::getPreviousContent(int limit) @@ -1153,6 +1165,11 @@ LeaveRoomJob* Room::leaveRoom() return connection()->callApi(id()); } +SetRoomStateWithKeyJob*Room::setMemberState(const QString& memberId, const RoomMemberEvent& event) const +{ + return d->requestSetState(memberId, event); +} + void Room::kickMember(const QString& memberId, const QString& reason) { connection()->callApi(id(), memberId, reason); diff --git a/lib/room.h b/lib/room.h index 7b4b3578..0d629e20 100644 --- a/lib/room.h +++ b/lib/room.h @@ -32,10 +32,12 @@ namespace QMatrixClient { class Event; + class RoomMemberEvent; class Connection; class User; class MemberSorter; class LeaveRoomJob; + class SetRoomStateWithKeyJob; class RedactEventJob; class TimelineItem @@ -344,6 +346,8 @@ namespace QMatrixClient void inviteToRoom(const QString& memberId); LeaveRoomJob* leaveRoom(); + SetRoomStateWithKeyJob* setMemberState( + const QString& memberId, const RoomMemberEvent& event) const; void kickMember(const QString& memberId, const QString& reason = {}); void ban(const QString& userId, const QString& reason = {}); void unban(const QString& userId); diff --git a/lib/user.cpp b/lib/user.cpp index 89e324f9..5c380424 100644 --- a/lib/user.cpp +++ b/lib/user.cpp @@ -23,7 +23,7 @@ #include "avatar.h" #include "events/event.h" #include "events/roommemberevent.h" -#include "jobs/setroomstatejob.h" +#include "jobs/generated/room_state.h" #include "jobs/generated/profile.h" #include "jobs/generated/content-repo.h" @@ -277,8 +277,7 @@ void User::rename(const QString& newName, const Room* r) "Attempt to rename a user that's not a room member"); MemberEventContent evtC; evtC.displayName = newName; - auto job = d->connection->callApi( - r->id(), id(), RoomMemberEvent(move(evtC))); + auto job = r->setMemberState(id(), RoomMemberEvent(move(evtC))); connect(job, &BaseJob::success, this, [=] { updateName(newName, r); }); } diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri index 39e153a2..3aa419bb 100644 --- a/libqmatrixclient.pri +++ b/libqmatrixclient.pri @@ -36,7 +36,6 @@ HEADERS += \ $$SRCPATH/jobs/postreceiptjob.h \ $$SRCPATH/jobs/syncjob.h \ $$SRCPATH/jobs/mediathumbnailjob.h \ - $$SRCPATH/jobs/setroomstatejob.h \ $$SRCPATH/jobs/downloadfilejob.h \ $$SRCPATH/jobs/postreadmarkersjob.h \ $$files($$SRCPATH/jobs/generated/*.h, false) \ @@ -67,7 +66,6 @@ SOURCES += \ $$SRCPATH/jobs/postreceiptjob.cpp \ $$SRCPATH/jobs/syncjob.cpp \ $$SRCPATH/jobs/mediathumbnailjob.cpp \ - $$SRCPATH/jobs/setroomstatejob.cpp \ $$SRCPATH/jobs/downloadfilejob.cpp \ $$files($$SRCPATH/jobs/generated/*.cpp, false) \ $$files($$SRCPATH/jobs/generated/definitions/*.cpp, false) \ -- cgit v1.2.3 From d03cf06707ef99ae02442d95a489eaf29f8bb900 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 13:27:51 +0900 Subject: Ignore non-shadow qmake builds --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e9b0b91c..5d8126f4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,6 @@ build # qmake derivatives Makefile* object_script.* -.qmake* \ No newline at end of file +.qmake* +debug/ +release/ \ No newline at end of file -- cgit v1.2.3 From 4289e72fdbe14b92d14fc18b9aa23cd0e2ae7eba Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 18:00:28 +0900 Subject: gtad.yaml: Support OpenAPI value maps (aka additionalProperties) This is useful for things like tags map in m.tags event, or the map-of-maps-of-messages in SendToDeviceJob (coming in the next commit). Requires GTAD 0.4.9 or later. --- lib/jobs/gtad.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/jobs/gtad.yaml b/lib/jobs/gtad.yaml index 89862da2..f606481e 100644 --- a/lib/jobs/gtad.yaml +++ b/lib/jobs/gtad.yaml @@ -93,6 +93,15 @@ analyzer: avoidCopy?: true imports: - //: { type: QJsonArray, "avoidCopy?": true, imports: } + map: + - /.+/: + type: QHash + avoidCopy?: true + imports: + - //: + type: QVariantHash + avoidCopy?: true + imports: variant: { type: QVariant, "avoidCopy?": true, imports: } schema: avoidCopy?: true -- cgit v1.2.3 From b71f291d1979355c5efd7f53988d1d1acf294b09 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 18:07:28 +0900 Subject: SendToDeviceJob: use a map-of-maps for messages instead of an opaque QJsonObject --- lib/jobs/generated/to_device.cpp | 2 +- lib/jobs/generated/to_device.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/jobs/generated/to_device.cpp b/lib/jobs/generated/to_device.cpp index cfb860c7..e893fa44 100644 --- a/lib/jobs/generated/to_device.cpp +++ b/lib/jobs/generated/to_device.cpp @@ -12,7 +12,7 @@ using namespace QMatrixClient; static const auto basePath = QStringLiteral("/_matrix/client/r0"); -SendToDeviceJob::SendToDeviceJob(const QString& eventType, const QString& txnId, const QJsonObject& messages) +SendToDeviceJob::SendToDeviceJob(const QString& eventType, const QString& txnId, const QHash>& messages) : BaseJob(HttpVerb::Put, "SendToDeviceJob", basePath % "/sendToDevice/" % eventType % "/" % txnId) { diff --git a/lib/jobs/generated/to_device.h b/lib/jobs/generated/to_device.h index 0de8fb0a..f5910e44 100644 --- a/lib/jobs/generated/to_device.h +++ b/lib/jobs/generated/to_device.h @@ -7,6 +7,7 @@ #include "../basejob.h" #include +#include namespace QMatrixClient @@ -16,6 +17,6 @@ namespace QMatrixClient class SendToDeviceJob : public BaseJob { public: - explicit SendToDeviceJob(const QString& eventType, const QString& txnId, const QJsonObject& messages = {}); + explicit SendToDeviceJob(const QString& eventType, const QString& txnId, const QHash>& messages = {}); }; } // namespace QMatrixClient -- cgit v1.2.3 From 54c45b52cec717baf0448b4928e606f518a5f8fe Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 18:54:52 +0900 Subject: converters.h: support std::unordered_map --- lib/converters.h | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/lib/converters.h b/lib/converters.h index baa14c7b..68005c0d 100644 --- a/lib/converters.h +++ b/lib/converters.h @@ -23,6 +23,20 @@ #include #include +#include + +// Enable std::unordered_map +namespace std +{ + template <> struct hash + { + size_t operator()(const QString& s) const Q_DECL_NOEXCEPT + { + return qHash(s, uint(qGlobalQHashSeed())); + } + }; +} + namespace QMatrixClient { // This catches anything implicitly convertible to QJsonValue/Object/Array @@ -82,6 +96,15 @@ namespace QMatrixClient return json; } + template + inline QJsonObject toJson(const std::unordered_map& hashMap) + { + QJsonObject json; + for (auto it = hashMap.begin(); it != hashMap.end(); ++it) + json.insert(it.key(), toJson(it.value())); + return json; + } + template struct FromJson { @@ -227,4 +250,16 @@ namespace QMatrixClient return h; } }; + + template struct FromJson> + { + auto operator()(const QJsonValue& jv) const + { + const auto json = jv.toObject(); + std::unordered_map h; h.reserve(size_t(json.size())); + for (auto it = json.begin(); it != json.end(); ++it) + h.insert(std::make_pair(it.key(), fromJson(it.value()))); + return h; + } + }; } // namespace QMatrixClient -- cgit v1.2.3 From 33b1c4f9748f0d33da1d18a3abe861014c116b5c Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 18:56:03 +0900 Subject: {{base}}.h.mustache: better code ordering, more comments --- lib/jobs/{{base}}.h.mustache | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/jobs/{{base}}.h.mustache b/lib/jobs/{{base}}.h.mustache index ff9a7e7a..e4f45d85 100644 --- a/lib/jobs/{{base}}.h.mustache +++ b/lib/jobs/{{base}}.h.mustache @@ -35,18 +35,20 @@ namespace QMatrixClient {{#vars}} {{dataType.name}} {{nameCamelCase}}; {{/vars}} }; {{/ model}} - // End of inner data structures -{{/ models}}{{^bodyParams}} + // Construction/destruction +{{/ models}} + explicit {{camelCaseOperationId}}Job({{#allParams}}{{>joinedParamDecl}}{{/allParams}});{{^bodyParams}} + /** Construct a URL out of baseUrl and usual parameters passed to * {{camelCaseOperationId}}Job. This function can be used when * a URL for {{camelCaseOperationId}}Job is necessary but the job * itself isn't. */ static QUrl makeRequestUrl(QUrl baseUrl{{#allParams?}}, {{#allParams}}{{>joinedParamDecl}}{{/allParams}}{{/allParams?}}); -{{/bodyParams}} - explicit {{camelCaseOperationId}}Job({{#allParams}}{{>joinedParamDecl}}{{/allParams}});{{!skip EOL -}}{{# responses}}{{#normalResponse?}}{{#allProperties?}} +{{/bodyParams}}{{# responses}}{{#normalResponse?}}{{#allProperties?}} ~{{camelCaseOperationId}}Job() override; + + // Result properties {{#allProperties}} {{>maybeCrefType}} {{paramName}}(){{^noCopy?}} const{{/noCopy?}};{{/allProperties}} -- cgit v1.2.3 From c5b3de1732ca49c78c8ed8cf77f9e9fa414d2f04 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 18:59:01 +0900 Subject: gtad.yaml: Support maps of events Use std::unordered_map<> (now supported by GTAD and converters.h) for that. --- lib/jobs/gtad.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/jobs/gtad.yaml b/lib/jobs/gtad.yaml index f606481e..788c0d91 100644 --- a/lib/jobs/gtad.yaml +++ b/lib/jobs/gtad.yaml @@ -94,8 +94,12 @@ analyzer: imports: - //: { type: QJsonArray, "avoidCopy?": true, imports: } map: + - /state_event.yaml$/: + type: "std::unordered_map" + noCopy?: true + imports: - /.+/: - type: QHash + type: "QHash" avoidCopy?: true imports: - //: -- cgit v1.2.3 From c71c4eb027cc7bb3b6b1a9bd41c048fcdfe4aa90 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 19:02:39 +0900 Subject: jobs/generated: code ordering, more comments --- lib/jobs/generated/administrative_contact.h | 12 ++++++++---- lib/jobs/generated/content-repo.h | 22 ++++++++++++++++++---- lib/jobs/generated/create_room.h | 4 +++- lib/jobs/generated/directory.h | 8 ++++++-- lib/jobs/generated/joining.h | 8 ++++++-- lib/jobs/generated/leaving.h | 6 ++++-- lib/jobs/generated/list_joined_rooms.h | 5 ++++- lib/jobs/generated/list_public_rooms.h | 16 ++++++++++++---- lib/jobs/generated/login.h | 2 ++ lib/jobs/generated/logout.h | 3 ++- lib/jobs/generated/message_pagination.h | 5 ++++- lib/jobs/generated/notifications.h | 7 +++++-- lib/jobs/generated/profile.h | 15 ++++++++++++--- lib/jobs/generated/pusher.h | 9 ++++++--- lib/jobs/generated/redaction.h | 2 ++ lib/jobs/generated/room_send.h | 2 ++ lib/jobs/generated/room_state.h | 4 ++++ lib/jobs/generated/tags.h | 8 ++++++-- lib/jobs/generated/users.h | 4 +++- lib/jobs/generated/versions.h | 5 ++++- lib/jobs/generated/whoami.h | 5 ++++- 21 files changed, 117 insertions(+), 35 deletions(-) diff --git a/lib/jobs/generated/administrative_contact.h b/lib/jobs/generated/administrative_contact.h index 9cb09a3c..4afd068f 100644 --- a/lib/jobs/generated/administrative_contact.h +++ b/lib/jobs/generated/administrative_contact.h @@ -25,7 +25,9 @@ namespace QMatrixClient QString address; }; - // End of inner data structures + // Construction/destruction + + explicit GetAccount3PIDsJob(); /** Construct a URL out of baseUrl and usual parameters passed to * GetAccount3PIDsJob. This function can be used when @@ -34,9 +36,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl); - explicit GetAccount3PIDsJob(); ~GetAccount3PIDsJob() override; + // Result properties + const QVector& threepids() const; protected: @@ -59,7 +62,7 @@ namespace QMatrixClient QString sid; }; - // End of inner data structures + // Construction/destruction explicit Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind = {}); }; @@ -67,6 +70,8 @@ namespace QMatrixClient class RequestTokenTo3PIDJob : public BaseJob { public: + explicit RequestTokenTo3PIDJob(); + /** Construct a URL out of baseUrl and usual parameters passed to * RequestTokenTo3PIDJob. This function can be used when * a URL for RequestTokenTo3PIDJob is necessary but the job @@ -74,6 +79,5 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl); - explicit RequestTokenTo3PIDJob(); }; } // namespace QMatrixClient diff --git a/lib/jobs/generated/content-repo.h b/lib/jobs/generated/content-repo.h index e1e58f88..cae8e588 100644 --- a/lib/jobs/generated/content-repo.h +++ b/lib/jobs/generated/content-repo.h @@ -19,6 +19,8 @@ namespace QMatrixClient explicit UploadContentJob(QIODevice* content, const QString& filename = {}, const QString& contentType = {}); ~UploadContentJob() override; + // Result properties + const QString& contentUri() const; protected: @@ -32,6 +34,8 @@ namespace QMatrixClient class GetContentJob : public BaseJob { public: + explicit GetContentJob(const QString& serverName, const QString& mediaId); + /** Construct a URL out of baseUrl and usual parameters passed to * GetContentJob. This function can be used when * a URL for GetContentJob is necessary but the job @@ -39,9 +43,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId); - explicit GetContentJob(const QString& serverName, const QString& mediaId); ~GetContentJob() override; + // Result properties + const QString& contentType() const; const QString& contentDisposition() const; QIODevice* content() const; @@ -57,6 +62,8 @@ namespace QMatrixClient class GetContentOverrideNameJob : public BaseJob { public: + explicit GetContentOverrideNameJob(const QString& serverName, const QString& mediaId, const QString& fileName); + /** Construct a URL out of baseUrl and usual parameters passed to * GetContentOverrideNameJob. This function can be used when * a URL for GetContentOverrideNameJob is necessary but the job @@ -64,9 +71,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, const QString& fileName); - explicit GetContentOverrideNameJob(const QString& serverName, const QString& mediaId, const QString& fileName); ~GetContentOverrideNameJob() override; + // Result properties + const QString& contentType() const; const QString& contentDisposition() const; QIODevice* content() const; @@ -82,6 +90,8 @@ namespace QMatrixClient class GetContentThumbnailJob : public BaseJob { public: + explicit GetContentThumbnailJob(const QString& serverName, const QString& mediaId, int width = {}, int height = {}, const QString& method = {}); + /** Construct a URL out of baseUrl and usual parameters passed to * GetContentThumbnailJob. This function can be used when * a URL for GetContentThumbnailJob is necessary but the job @@ -89,9 +99,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, int width = {}, int height = {}, const QString& method = {}); - explicit GetContentThumbnailJob(const QString& serverName, const QString& mediaId, int width = {}, int height = {}, const QString& method = {}); ~GetContentThumbnailJob() override; + // Result properties + const QString& contentType() const; QIODevice* content() const; @@ -106,6 +117,8 @@ namespace QMatrixClient class GetUrlPreviewJob : public BaseJob { public: + explicit GetUrlPreviewJob(const QString& url, qint64 ts = {}); + /** Construct a URL out of baseUrl and usual parameters passed to * GetUrlPreviewJob. This function can be used when * a URL for GetUrlPreviewJob is necessary but the job @@ -113,9 +126,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& url, qint64 ts = {}); - explicit GetUrlPreviewJob(const QString& url, qint64 ts = {}); ~GetUrlPreviewJob() override; + // Result properties + qint64 matrixImageSize() const; const QString& ogImage() const; diff --git a/lib/jobs/generated/create_room.h b/lib/jobs/generated/create_room.h index 526463b0..8e38774f 100644 --- a/lib/jobs/generated/create_room.h +++ b/lib/jobs/generated/create_room.h @@ -34,11 +34,13 @@ namespace QMatrixClient QJsonObject content; }; - // End of inner data structures + // Construction/destruction explicit CreateRoomJob(const QString& visibility = {}, const QString& roomAliasName = {}, const QString& name = {}, const QString& topic = {}, const QVector& invite = {}, const QVector& invite3pid = {}, const QJsonObject& creationContent = {}, const QVector& initialState = {}, const QString& preset = {}, bool isDirect = {}, bool guestCanJoin = {}); ~CreateRoomJob() override; + // Result properties + const QString& roomId() const; protected: diff --git a/lib/jobs/generated/directory.h b/lib/jobs/generated/directory.h index 87591240..e01ba024 100644 --- a/lib/jobs/generated/directory.h +++ b/lib/jobs/generated/directory.h @@ -22,6 +22,8 @@ namespace QMatrixClient class GetRoomIdByAliasJob : public BaseJob { public: + explicit GetRoomIdByAliasJob(const QString& roomAlias); + /** Construct a URL out of baseUrl and usual parameters passed to * GetRoomIdByAliasJob. This function can be used when * a URL for GetRoomIdByAliasJob is necessary but the job @@ -29,9 +31,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomAlias); - explicit GetRoomIdByAliasJob(const QString& roomAlias); ~GetRoomIdByAliasJob() override; + // Result properties + const QString& roomId() const; const QVector& servers() const; @@ -46,6 +49,8 @@ namespace QMatrixClient class DeleteRoomAliasJob : public BaseJob { public: + explicit DeleteRoomAliasJob(const QString& roomAlias); + /** Construct a URL out of baseUrl and usual parameters passed to * DeleteRoomAliasJob. This function can be used when * a URL for DeleteRoomAliasJob is necessary but the job @@ -53,6 +58,5 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomAlias); - explicit DeleteRoomAliasJob(const QString& roomAlias); }; } // namespace QMatrixClient diff --git a/lib/jobs/generated/joining.h b/lib/jobs/generated/joining.h index 76edb339..7aa3e3a2 100644 --- a/lib/jobs/generated/joining.h +++ b/lib/jobs/generated/joining.h @@ -27,11 +27,13 @@ namespace QMatrixClient QJsonObject signatures; }; - // End of inner data structures + // Construction/destruction explicit JoinRoomByIdJob(const QString& roomId, const ThirdPartySigned& thirdPartySigned = {}); ~JoinRoomByIdJob() override; + // Result properties + const QString& roomId() const; protected: @@ -60,11 +62,13 @@ namespace QMatrixClient Signed signedData; }; - // End of inner data structures + // Construction/destruction explicit JoinRoomJob(const QString& roomIdOrAlias, const ThirdPartySigned& thirdPartySigned = {}); ~JoinRoomJob() override; + // Result properties + const QString& roomId() const; protected: diff --git a/lib/jobs/generated/leaving.h b/lib/jobs/generated/leaving.h index 9bae2363..7e914dd1 100644 --- a/lib/jobs/generated/leaving.h +++ b/lib/jobs/generated/leaving.h @@ -15,6 +15,8 @@ namespace QMatrixClient class LeaveRoomJob : public BaseJob { public: + explicit LeaveRoomJob(const QString& roomId); + /** Construct a URL out of baseUrl and usual parameters passed to * LeaveRoomJob. This function can be used when * a URL for LeaveRoomJob is necessary but the job @@ -22,12 +24,13 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId); - explicit LeaveRoomJob(const QString& roomId); }; class ForgetRoomJob : public BaseJob { public: + explicit ForgetRoomJob(const QString& roomId); + /** Construct a URL out of baseUrl and usual parameters passed to * ForgetRoomJob. This function can be used when * a URL for ForgetRoomJob is necessary but the job @@ -35,6 +38,5 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId); - explicit ForgetRoomJob(const QString& roomId); }; } // namespace QMatrixClient diff --git a/lib/jobs/generated/list_joined_rooms.h b/lib/jobs/generated/list_joined_rooms.h index 768f5166..3df2d1ae 100644 --- a/lib/jobs/generated/list_joined_rooms.h +++ b/lib/jobs/generated/list_joined_rooms.h @@ -16,6 +16,8 @@ namespace QMatrixClient class GetJoinedRoomsJob : public BaseJob { public: + explicit GetJoinedRoomsJob(); + /** Construct a URL out of baseUrl and usual parameters passed to * GetJoinedRoomsJob. This function can be used when * a URL for GetJoinedRoomsJob is necessary but the job @@ -23,9 +25,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl); - explicit GetJoinedRoomsJob(); ~GetJoinedRoomsJob() override; + // Result properties + const QVector& joinedRooms() const; protected: diff --git a/lib/jobs/generated/list_public_rooms.h b/lib/jobs/generated/list_public_rooms.h index 8e8fddca..3e06f21a 100644 --- a/lib/jobs/generated/list_public_rooms.h +++ b/lib/jobs/generated/list_public_rooms.h @@ -17,6 +17,8 @@ namespace QMatrixClient class GetRoomVisibilityOnDirectoryJob : public BaseJob { public: + explicit GetRoomVisibilityOnDirectoryJob(const QString& roomId); + /** Construct a URL out of baseUrl and usual parameters passed to * GetRoomVisibilityOnDirectoryJob. This function can be used when * a URL for GetRoomVisibilityOnDirectoryJob is necessary but the job @@ -24,9 +26,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId); - explicit GetRoomVisibilityOnDirectoryJob(const QString& roomId); ~GetRoomVisibilityOnDirectoryJob() override; + // Result properties + const QString& visibility() const; protected: @@ -61,7 +64,9 @@ namespace QMatrixClient QString avatarUrl; }; - // End of inner data structures + // Construction/destruction + + explicit GetPublicRoomsJob(int limit = {}, const QString& since = {}, const QString& server = {}); /** Construct a URL out of baseUrl and usual parameters passed to * GetPublicRoomsJob. This function can be used when @@ -70,9 +75,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, int limit = {}, const QString& since = {}, const QString& server = {}); - explicit GetPublicRoomsJob(int limit = {}, const QString& since = {}, const QString& server = {}); ~GetPublicRoomsJob() override; + // Result properties + const QVector& chunk() const; const QString& nextBatch() const; const QString& prevBatch() const; @@ -109,11 +115,13 @@ namespace QMatrixClient QString avatarUrl; }; - // End of inner data structures + // Construction/destruction explicit QueryPublicRoomsJob(const QString& server = {}, int limit = {}, const QString& since = {}, const Filter& filter = {}); ~QueryPublicRoomsJob() override; + // Result properties + const QVector& chunk() const; const QString& nextBatch() const; const QString& prevBatch() const; diff --git a/lib/jobs/generated/login.h b/lib/jobs/generated/login.h index 3ac955d4..8bf52d6b 100644 --- a/lib/jobs/generated/login.h +++ b/lib/jobs/generated/login.h @@ -18,6 +18,8 @@ namespace QMatrixClient explicit LoginJob(const QString& type, const QString& user = {}, const QString& medium = {}, const QString& address = {}, const QString& password = {}, const QString& token = {}, const QString& deviceId = {}, const QString& initialDeviceDisplayName = {}); ~LoginJob() override; + // Result properties + const QString& userId() const; const QString& accessToken() const; const QString& homeServer() const; diff --git a/lib/jobs/generated/logout.h b/lib/jobs/generated/logout.h index 7640ba55..1f60bd75 100644 --- a/lib/jobs/generated/logout.h +++ b/lib/jobs/generated/logout.h @@ -15,6 +15,8 @@ namespace QMatrixClient class LogoutJob : public BaseJob { public: + explicit LogoutJob(); + /** Construct a URL out of baseUrl and usual parameters passed to * LogoutJob. This function can be used when * a URL for LogoutJob is necessary but the job @@ -22,6 +24,5 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl); - explicit LogoutJob(); }; } // namespace QMatrixClient diff --git a/lib/jobs/generated/message_pagination.h b/lib/jobs/generated/message_pagination.h index b8588ad1..284895fd 100644 --- a/lib/jobs/generated/message_pagination.h +++ b/lib/jobs/generated/message_pagination.h @@ -16,6 +16,8 @@ namespace QMatrixClient class GetRoomEventsJob : public BaseJob { public: + explicit GetRoomEventsJob(const QString& roomId, const QString& from, const QString& dir, const QString& to = {}, int limit = {}, const QString& filter = {}); + /** Construct a URL out of baseUrl and usual parameters passed to * GetRoomEventsJob. This function can be used when * a URL for GetRoomEventsJob is necessary but the job @@ -23,9 +25,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& from, const QString& dir, const QString& to = {}, int limit = {}, const QString& filter = {}); - explicit GetRoomEventsJob(const QString& roomId, const QString& from, const QString& dir, const QString& to = {}, int limit = {}, const QString& filter = {}); ~GetRoomEventsJob() override; + // Result properties + const QString& begin() const; const QString& end() const; RoomEvents&& chunk(); diff --git a/lib/jobs/generated/notifications.h b/lib/jobs/generated/notifications.h index d66e15be..428995ae 100644 --- a/lib/jobs/generated/notifications.h +++ b/lib/jobs/generated/notifications.h @@ -31,7 +31,9 @@ namespace QMatrixClient qint64 ts; }; - // End of inner data structures + // Construction/destruction + + explicit GetNotificationsJob(const QString& from = {}, int limit = {}, const QString& only = {}); /** Construct a URL out of baseUrl and usual parameters passed to * GetNotificationsJob. This function can be used when @@ -40,9 +42,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& from = {}, int limit = {}, const QString& only = {}); - explicit GetNotificationsJob(const QString& from = {}, int limit = {}, const QString& only = {}); ~GetNotificationsJob() override; + // Result properties + const QString& nextToken() const; std::vector&& notifications(); diff --git a/lib/jobs/generated/profile.h b/lib/jobs/generated/profile.h index 024130f5..9afc037b 100644 --- a/lib/jobs/generated/profile.h +++ b/lib/jobs/generated/profile.h @@ -21,6 +21,8 @@ namespace QMatrixClient class GetDisplayNameJob : public BaseJob { public: + explicit GetDisplayNameJob(const QString& userId); + /** Construct a URL out of baseUrl and usual parameters passed to * GetDisplayNameJob. This function can be used when * a URL for GetDisplayNameJob is necessary but the job @@ -28,9 +30,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId); - explicit GetDisplayNameJob(const QString& userId); ~GetDisplayNameJob() override; + // Result properties + const QString& displayname() const; protected: @@ -50,6 +53,8 @@ namespace QMatrixClient class GetAvatarUrlJob : public BaseJob { public: + explicit GetAvatarUrlJob(const QString& userId); + /** Construct a URL out of baseUrl and usual parameters passed to * GetAvatarUrlJob. This function can be used when * a URL for GetAvatarUrlJob is necessary but the job @@ -57,9 +62,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId); - explicit GetAvatarUrlJob(const QString& userId); ~GetAvatarUrlJob() override; + // Result properties + const QString& avatarUrl() const; protected: @@ -73,6 +79,8 @@ namespace QMatrixClient class GetUserProfileJob : public BaseJob { public: + explicit GetUserProfileJob(const QString& userId); + /** Construct a URL out of baseUrl and usual parameters passed to * GetUserProfileJob. This function can be used when * a URL for GetUserProfileJob is necessary but the job @@ -80,9 +88,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId); - explicit GetUserProfileJob(const QString& userId); ~GetUserProfileJob() override; + // Result properties + const QString& avatarUrl() const; const QString& displayname() const; diff --git a/lib/jobs/generated/pusher.h b/lib/jobs/generated/pusher.h index 06a2c832..4d99d4d0 100644 --- a/lib/jobs/generated/pusher.h +++ b/lib/jobs/generated/pusher.h @@ -36,7 +36,9 @@ namespace QMatrixClient PusherData data; }; - // End of inner data structures + // Construction/destruction + + explicit GetPushersJob(); /** Construct a URL out of baseUrl and usual parameters passed to * GetPushersJob. This function can be used when @@ -45,9 +47,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl); - explicit GetPushersJob(); ~GetPushersJob() override; + // Result properties + const QVector& pushers() const; protected: @@ -68,7 +71,7 @@ namespace QMatrixClient QString url; }; - // End of inner data structures + // Construction/destruction explicit PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag = {}, bool append = {}); }; diff --git a/lib/jobs/generated/redaction.h b/lib/jobs/generated/redaction.h index e3b3ff4f..974dfde5 100644 --- a/lib/jobs/generated/redaction.h +++ b/lib/jobs/generated/redaction.h @@ -18,6 +18,8 @@ namespace QMatrixClient explicit RedactEventJob(const QString& roomId, const QString& eventId, const QString& txnId, const QString& reason = {}); ~RedactEventJob() override; + // Result properties + const QString& eventId() const; protected: diff --git a/lib/jobs/generated/room_send.h b/lib/jobs/generated/room_send.h index d20ce523..370f2865 100644 --- a/lib/jobs/generated/room_send.h +++ b/lib/jobs/generated/room_send.h @@ -19,6 +19,8 @@ namespace QMatrixClient explicit SendMessageJob(const QString& roomId, const QString& eventType, const QString& txnId, const QJsonObject& body = {}); ~SendMessageJob() override; + // Result properties + const QString& eventId() const; protected: diff --git a/lib/jobs/generated/room_state.h b/lib/jobs/generated/room_state.h index 5d16b2a6..aea32263 100644 --- a/lib/jobs/generated/room_state.h +++ b/lib/jobs/generated/room_state.h @@ -19,6 +19,8 @@ namespace QMatrixClient explicit SetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey, const QJsonObject& body = {}); ~SetRoomStateWithKeyJob() override; + // Result properties + const QString& eventId() const; protected: @@ -35,6 +37,8 @@ namespace QMatrixClient explicit SetRoomStateJob(const QString& roomId, const QString& eventType, const QJsonObject& body = {}); ~SetRoomStateJob() override; + // Result properties + const QString& eventId() const; protected: diff --git a/lib/jobs/generated/tags.h b/lib/jobs/generated/tags.h index 7a375527..f62bd7ad 100644 --- a/lib/jobs/generated/tags.h +++ b/lib/jobs/generated/tags.h @@ -16,6 +16,8 @@ namespace QMatrixClient class GetRoomTagsJob : public BaseJob { public: + explicit GetRoomTagsJob(const QString& userId, const QString& roomId); + /** Construct a URL out of baseUrl and usual parameters passed to * GetRoomTagsJob. This function can be used when * a URL for GetRoomTagsJob is necessary but the job @@ -23,9 +25,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId); - explicit GetRoomTagsJob(const QString& userId, const QString& roomId); ~GetRoomTagsJob() override; + // Result properties + const QJsonObject& tags() const; protected: @@ -45,6 +48,8 @@ namespace QMatrixClient class DeleteRoomTagJob : public BaseJob { public: + explicit DeleteRoomTagJob(const QString& userId, const QString& roomId, const QString& tag); + /** Construct a URL out of baseUrl and usual parameters passed to * DeleteRoomTagJob. This function can be used when * a URL for DeleteRoomTagJob is necessary but the job @@ -52,6 +57,5 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& tag); - explicit DeleteRoomTagJob(const QString& userId, const QString& roomId, const QString& tag); }; } // namespace QMatrixClient diff --git a/lib/jobs/generated/users.h b/lib/jobs/generated/users.h index 50b8b648..fa0d4335 100644 --- a/lib/jobs/generated/users.h +++ b/lib/jobs/generated/users.h @@ -26,11 +26,13 @@ namespace QMatrixClient QString avatarUrl; }; - // End of inner data structures + // Construction/destruction explicit SearchUserDirectoryJob(const QString& searchTerm, int limit = {}); ~SearchUserDirectoryJob() override; + // Result properties + const QVector& results() const; bool limited() const; diff --git a/lib/jobs/generated/versions.h b/lib/jobs/generated/versions.h index 18f6bb44..249d3de4 100644 --- a/lib/jobs/generated/versions.h +++ b/lib/jobs/generated/versions.h @@ -16,6 +16,8 @@ namespace QMatrixClient class GetVersionsJob : public BaseJob { public: + explicit GetVersionsJob(); + /** Construct a URL out of baseUrl and usual parameters passed to * GetVersionsJob. This function can be used when * a URL for GetVersionsJob is necessary but the job @@ -23,9 +25,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl); - explicit GetVersionsJob(); ~GetVersionsJob() override; + // Result properties + const QVector& versions() const; protected: diff --git a/lib/jobs/generated/whoami.h b/lib/jobs/generated/whoami.h index 835232ee..2b0e7375 100644 --- a/lib/jobs/generated/whoami.h +++ b/lib/jobs/generated/whoami.h @@ -15,6 +15,8 @@ namespace QMatrixClient class GetTokenOwnerJob : public BaseJob { public: + explicit GetTokenOwnerJob(); + /** Construct a URL out of baseUrl and usual parameters passed to * GetTokenOwnerJob. This function can be used when * a URL for GetTokenOwnerJob is necessary but the job @@ -22,9 +24,10 @@ namespace QMatrixClient */ static QUrl makeRequestUrl(QUrl baseUrl); - explicit GetTokenOwnerJob(); ~GetTokenOwnerJob() override; + // Result properties + const QString& userId() const; protected: -- cgit v1.2.3 From a83eb9350def2b1537affe4390ea54d37ffbc777 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 18:59:33 +0900 Subject: gtad.yaml: Use QStringList instead of QVector QStringList's API is richer, after all. --- lib/jobs/gtad.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/jobs/gtad.yaml b/lib/jobs/gtad.yaml index 788c0d91..d1b9018d 100644 --- a/lib/jobs/gtad.yaml +++ b/lib/jobs/gtad.yaml @@ -71,6 +71,10 @@ analyzer: avoidCopy?: true imports: array: + - string: + type: QStringList + avoidCopy?: true + imports: - /^Notification|Result$/: type: "std::vector<{{1}}>" noCopy?: true -- cgit v1.2.3 From e49a842e877d17a1c6cbbb2349c2816639447721 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 19:09:57 +0900 Subject: Connection, jobs/generated: Use QStringList instead of QVector QStringList's API is richer, after all. --- lib/connection.cpp | 2 +- lib/connection.h | 4 ++-- lib/jobs/generated/create_room.cpp | 2 +- lib/jobs/generated/create_room.h | 5 +++-- lib/jobs/generated/directory.cpp | 6 +++--- lib/jobs/generated/directory.h | 4 ++-- lib/jobs/generated/list_joined_rooms.cpp | 6 +++--- lib/jobs/generated/list_joined_rooms.h | 4 ++-- lib/jobs/generated/list_public_rooms.cpp | 4 ++-- lib/jobs/generated/list_public_rooms.h | 5 +++-- lib/jobs/generated/versions.cpp | 6 +++--- lib/jobs/generated/versions.h | 4 ++-- 12 files changed, 27 insertions(+), 25 deletions(-) diff --git a/lib/connection.cpp b/lib/connection.cpp index 05640c66..78ce4777 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -441,7 +441,7 @@ DownloadFileJob* Connection::downloadFile(const QUrl& url, CreateRoomJob* Connection::createRoom(RoomVisibility visibility, const QString& alias, const QString& name, const QString& topic, - const QVector& invites, const QString& presetName, + const QStringList& invites, const QString& presetName, bool isDirect, bool guestsCanJoin, const QVector& initialState, const QVector& invite3pids, diff --git a/lib/connection.h b/lib/connection.h index 22f71eac..3364739b 100644 --- a/lib/connection.h +++ b/lib/connection.h @@ -272,8 +272,8 @@ namespace QMatrixClient */ CreateRoomJob* createRoom(RoomVisibility visibility, const QString& alias, const QString& name, const QString& topic, - const QVector& invites, const QString& presetName = {}, bool isDirect = false, - bool guestsCanJoin = false, + const QStringList& invites, const QString& presetName = {}, + bool isDirect = false, bool guestsCanJoin = false, const QVector& initialState = {}, const QVector& invite3pids = {}, const QJsonObject& creationContent = {}); diff --git a/lib/jobs/generated/create_room.cpp b/lib/jobs/generated/create_room.cpp index a417c2b1..0a7eb208 100644 --- a/lib/jobs/generated/create_room.cpp +++ b/lib/jobs/generated/create_room.cpp @@ -41,7 +41,7 @@ class CreateRoomJob::Private QString roomId; }; -CreateRoomJob::CreateRoomJob(const QString& visibility, const QString& roomAliasName, const QString& name, const QString& topic, const QVector& invite, const QVector& invite3pid, const QJsonObject& creationContent, const QVector& initialState, const QString& preset, bool isDirect, bool guestCanJoin) +CreateRoomJob::CreateRoomJob(const QString& visibility, const QString& roomAliasName, const QString& name, const QString& topic, const QStringList& invite, const QVector& invite3pid, const QJsonObject& creationContent, const QVector& initialState, const QString& preset, bool isDirect, bool guestCanJoin) : BaseJob(HttpVerb::Post, "CreateRoomJob", basePath % "/createRoom") , d(new Private) diff --git a/lib/jobs/generated/create_room.h b/lib/jobs/generated/create_room.h index 8e38774f..88ad7895 100644 --- a/lib/jobs/generated/create_room.h +++ b/lib/jobs/generated/create_room.h @@ -6,8 +6,9 @@ #include "../basejob.h" -#include #include +#include +#include #include "converters.h" @@ -36,7 +37,7 @@ namespace QMatrixClient // Construction/destruction - explicit CreateRoomJob(const QString& visibility = {}, const QString& roomAliasName = {}, const QString& name = {}, const QString& topic = {}, const QVector& invite = {}, const QVector& invite3pid = {}, const QJsonObject& creationContent = {}, const QVector& initialState = {}, const QString& preset = {}, bool isDirect = {}, bool guestCanJoin = {}); + explicit CreateRoomJob(const QString& visibility = {}, const QString& roomAliasName = {}, const QString& name = {}, const QString& topic = {}, const QStringList& invite = {}, const QVector& invite3pid = {}, const QJsonObject& creationContent = {}, const QVector& initialState = {}, const QString& preset = {}, bool isDirect = {}, bool guestCanJoin = {}); ~CreateRoomJob() override; // Result properties diff --git a/lib/jobs/generated/directory.cpp b/lib/jobs/generated/directory.cpp index 6324a1f5..3066ebe2 100644 --- a/lib/jobs/generated/directory.cpp +++ b/lib/jobs/generated/directory.cpp @@ -26,7 +26,7 @@ class GetRoomIdByAliasJob::Private { public: QString roomId; - QVector servers; + QStringList servers; }; QUrl GetRoomIdByAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias) @@ -49,7 +49,7 @@ const QString& GetRoomIdByAliasJob::roomId() const return d->roomId; } -const QVector& GetRoomIdByAliasJob::servers() const +const QStringList& GetRoomIdByAliasJob::servers() const { return d->servers; } @@ -58,7 +58,7 @@ BaseJob::Status GetRoomIdByAliasJob::parseJson(const QJsonDocument& data) { auto json = data.object(); d->roomId = fromJson(json.value("room_id")); - d->servers = fromJson>(json.value("servers")); + d->servers = fromJson(json.value("servers")); return Success; } diff --git a/lib/jobs/generated/directory.h b/lib/jobs/generated/directory.h index e01ba024..861040b6 100644 --- a/lib/jobs/generated/directory.h +++ b/lib/jobs/generated/directory.h @@ -6,7 +6,7 @@ #include "../basejob.h" -#include +#include namespace QMatrixClient @@ -36,7 +36,7 @@ namespace QMatrixClient // Result properties const QString& roomId() const; - const QVector& servers() const; + const QStringList& servers() const; protected: Status parseJson(const QJsonDocument& data) override; diff --git a/lib/jobs/generated/list_joined_rooms.cpp b/lib/jobs/generated/list_joined_rooms.cpp index 8ea44721..82ec8849 100644 --- a/lib/jobs/generated/list_joined_rooms.cpp +++ b/lib/jobs/generated/list_joined_rooms.cpp @@ -15,7 +15,7 @@ static const auto basePath = QStringLiteral("/_matrix/client/r0"); class GetJoinedRoomsJob::Private { public: - QVector joinedRooms; + QStringList joinedRooms; }; QUrl GetJoinedRoomsJob::makeRequestUrl(QUrl baseUrl) @@ -33,7 +33,7 @@ GetJoinedRoomsJob::GetJoinedRoomsJob() GetJoinedRoomsJob::~GetJoinedRoomsJob() = default; -const QVector& GetJoinedRoomsJob::joinedRooms() const +const QStringList& GetJoinedRoomsJob::joinedRooms() const { return d->joinedRooms; } @@ -44,7 +44,7 @@ BaseJob::Status GetJoinedRoomsJob::parseJson(const QJsonDocument& data) if (!json.contains("joined_rooms")) return { JsonParseError, "The key 'joined_rooms' not found in the response" }; - d->joinedRooms = fromJson>(json.value("joined_rooms")); + d->joinedRooms = fromJson(json.value("joined_rooms")); return Success; } diff --git a/lib/jobs/generated/list_joined_rooms.h b/lib/jobs/generated/list_joined_rooms.h index 3df2d1ae..442e2cf9 100644 --- a/lib/jobs/generated/list_joined_rooms.h +++ b/lib/jobs/generated/list_joined_rooms.h @@ -6,7 +6,7 @@ #include "../basejob.h" -#include +#include namespace QMatrixClient @@ -29,7 +29,7 @@ namespace QMatrixClient // Result properties - const QVector& joinedRooms() const; + const QStringList& joinedRooms() const; protected: Status parseJson(const QJsonDocument& data) override; diff --git a/lib/jobs/generated/list_public_rooms.cpp b/lib/jobs/generated/list_public_rooms.cpp index 03664def..b27bdd58 100644 --- a/lib/jobs/generated/list_public_rooms.cpp +++ b/lib/jobs/generated/list_public_rooms.cpp @@ -64,7 +64,7 @@ namespace QMatrixClient const auto& o = jv.toObject(); GetPublicRoomsJob::PublicRoomsChunk result; result.aliases = - fromJson>(o.value("aliases")); + fromJson(o.value("aliases")); result.canonicalAlias = fromJson(o.value("canonical_alias")); result.name = @@ -177,7 +177,7 @@ namespace QMatrixClient const auto& o = jv.toObject(); QueryPublicRoomsJob::PublicRoomsChunk result; result.aliases = - fromJson>(o.value("aliases")); + fromJson(o.value("aliases")); result.canonicalAlias = fromJson(o.value("canonical_alias")); result.name = diff --git a/lib/jobs/generated/list_public_rooms.h b/lib/jobs/generated/list_public_rooms.h index 3e06f21a..46c055b5 100644 --- a/lib/jobs/generated/list_public_rooms.h +++ b/lib/jobs/generated/list_public_rooms.h @@ -7,6 +7,7 @@ #include "../basejob.h" #include +#include #include "converters.h" @@ -53,7 +54,7 @@ namespace QMatrixClient struct PublicRoomsChunk { - QVector aliases; + QStringList aliases; QString canonicalAlias; QString name; qint64 numJoinedMembers; @@ -104,7 +105,7 @@ namespace QMatrixClient struct PublicRoomsChunk { - QVector aliases; + QStringList aliases; QString canonicalAlias; QString name; qint64 numJoinedMembers; diff --git a/lib/jobs/generated/versions.cpp b/lib/jobs/generated/versions.cpp index 3b03172c..7b55b94f 100644 --- a/lib/jobs/generated/versions.cpp +++ b/lib/jobs/generated/versions.cpp @@ -15,7 +15,7 @@ static const auto basePath = QStringLiteral("/_matrix/client"); class GetVersionsJob::Private { public: - QVector versions; + QStringList versions; }; QUrl GetVersionsJob::makeRequestUrl(QUrl baseUrl) @@ -33,7 +33,7 @@ GetVersionsJob::GetVersionsJob() GetVersionsJob::~GetVersionsJob() = default; -const QVector& GetVersionsJob::versions() const +const QStringList& GetVersionsJob::versions() const { return d->versions; } @@ -41,7 +41,7 @@ const QVector& GetVersionsJob::versions() const BaseJob::Status GetVersionsJob::parseJson(const QJsonDocument& data) { auto json = data.object(); - d->versions = fromJson>(json.value("versions")); + d->versions = fromJson(json.value("versions")); return Success; } diff --git a/lib/jobs/generated/versions.h b/lib/jobs/generated/versions.h index 249d3de4..4fe8d9d0 100644 --- a/lib/jobs/generated/versions.h +++ b/lib/jobs/generated/versions.h @@ -6,7 +6,7 @@ #include "../basejob.h" -#include +#include namespace QMatrixClient @@ -29,7 +29,7 @@ namespace QMatrixClient // Result properties - const QVector& versions() const; + const QStringList& versions() const; protected: Status parseJson(const QJsonDocument& data) override; -- cgit v1.2.3 From 7f202c6a09ff34b063f5de94e8afc385bbf8379b Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 19:53:55 +0900 Subject: gtad.yaml: Even more concise type stubbing With most recent GTAD. --- lib/jobs/gtad.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/jobs/gtad.yaml b/lib/jobs/gtad.yaml index d1b9018d..d6b0b51f 100644 --- a/lib/jobs/gtad.yaml +++ b/lib/jobs/gtad.yaml @@ -53,7 +53,6 @@ analyzer: file: *ByteStream object: - /m\.room\.member$/: # A stub for EventsBatch - type: none - /state_event.yaml$/: type: StateEventPtr noCopy?: true @@ -98,7 +97,7 @@ analyzer: imports: - //: { type: QJsonArray, "avoidCopy?": true, imports: } map: - - /state_event.yaml$/: + - RoomState: type: "std::unordered_map" noCopy?: true imports: -- cgit v1.2.3 From 7681802be815ca1a03f219b82e3bd1b02863d34e Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 20:05:52 +0900 Subject: gtad.yaml: Cleanup --- lib/jobs/gtad.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/jobs/gtad.yaml b/lib/jobs/gtad.yaml index d6b0b51f..7f6a97e0 100644 --- a/lib/jobs/gtad.yaml +++ b/lib/jobs/gtad.yaml @@ -110,7 +110,7 @@ analyzer: avoidCopy?: true imports: variant: { type: QVariant, "avoidCopy?": true, imports: } - schema: + schema: # Properties of inline structure definitions avoidCopy?: true #operations: @@ -130,7 +130,6 @@ mustache: # preamble: preamble.mustache copyrightName: Kitsune Ral copyrightEmail: - # imports: { set: } templates: - "{{base}}.h.mustache" -- cgit v1.2.3 From f70ec41accd6da9f223bc41b446ad1d2d77de3f4 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 1 May 2018 21:08:06 +0900 Subject: Fix building on OSX --- lib/events/event.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/events/event.cpp b/lib/events/event.cpp index c2b92a50..576e9426 100644 --- a/lib/events/event.cpp +++ b/lib/events/event.cpp @@ -87,7 +87,7 @@ EventPtr _impl::doMakeEvent(const QJsonObject& obj) { // Check more specific event types first if (auto e = doMakeEvent(obj)) - return e; + return ptrCast(move(e)); return makeIfMatches( @@ -162,7 +162,7 @@ RoomEventPtr _impl::doMakeEvent(const QJsonObject& obj) { // Check more specific event types first if (auto e = doMakeEvent(obj)) - return e; + return ptrCast(move(e)); return makeIfMatches(obj, obj["type"].toString()); -- cgit v1.2.3 From 49022915fde72b83d9f18944c268110b01fa3469 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 4 May 2018 23:04:04 +0900 Subject: New home for the generated code - lib/csapi --- CMakeLists.txt | 4 +- lib/connection.cpp | 12 +- lib/connection.h | 2 +- lib/csapi/account-data.cpp | 28 +++ lib/csapi/account-data.h | 27 +++ lib/csapi/admin.cpp | 100 ++++++++++ lib/csapi/admin.h | 65 +++++++ lib/csapi/administrative_contact.cpp | 102 ++++++++++ lib/csapi/administrative_contact.h | 83 ++++++++ lib/csapi/banning.cpp | 34 ++++ lib/csapi/banning.h | 26 +++ lib/csapi/content-repo.cpp | 254 ++++++++++++++++++++++++ lib/csapi/content-repo.h | 143 ++++++++++++++ lib/csapi/create_room.cpp | 82 ++++++++ lib/csapi/create_room.h | 54 ++++++ lib/csapi/directory.cpp | 76 ++++++++ lib/csapi/directory.h | 62 ++++++ lib/csapi/event_context.cpp | 91 +++++++++ lib/csapi/event_context.h | 46 +++++ lib/csapi/gtad.yaml | 139 +++++++++++++ lib/csapi/inviting.cpp | 23 +++ lib/csapi/inviting.h | 20 ++ lib/csapi/joining.cpp | 118 ++++++++++++ lib/csapi/joining.h | 81 ++++++++ lib/csapi/kicking.cpp | 25 +++ lib/csapi/kicking.h | 20 ++ lib/csapi/leaving.cpp | 38 ++++ lib/csapi/leaving.h | 42 ++++ lib/csapi/list_joined_rooms.cpp | 50 +++++ lib/csapi/list_joined_rooms.h | 41 ++++ lib/csapi/list_public_rooms.cpp | 268 ++++++++++++++++++++++++++ lib/csapi/list_public_rooms.h | 138 +++++++++++++ lib/csapi/login.cpp | 79 ++++++++ lib/csapi/login.h | 35 ++++ lib/csapi/logout.cpp | 26 +++ lib/csapi/logout.h | 28 +++ lib/csapi/message_pagination.cpp | 76 ++++++++ lib/csapi/message_pagination.h | 43 +++++ lib/csapi/notifications.cpp | 96 +++++++++ lib/csapi/notifications.h | 59 ++++++ lib/csapi/preamble.mustache | 3 + lib/csapi/profile.cpp | 140 ++++++++++++++ lib/csapi/profile.h | 105 ++++++++++ lib/csapi/pusher.cpp | 121 ++++++++++++ lib/csapi/pusher.h | 78 ++++++++ lib/csapi/receipts.cpp | 21 ++ lib/csapi/receipts.h | 21 ++ lib/csapi/redaction.cpp | 45 +++++ lib/csapi/redaction.h | 32 +++ lib/csapi/room_send.cpp | 42 ++++ lib/csapi/room_send.h | 33 ++++ lib/csapi/room_state.cpp | 70 +++++++ lib/csapi/room_state.h | 51 +++++ lib/csapi/tags.cpp | 66 +++++++ lib/csapi/tags.h | 61 ++++++ lib/csapi/third_party_membership.cpp | 25 +++ lib/csapi/third_party_membership.h | 20 ++ lib/csapi/to_device.cpp | 23 +++ lib/csapi/to_device.h | 22 +++ lib/csapi/typing.cpp | 24 +++ lib/csapi/typing.h | 20 ++ lib/csapi/users.cpp | 78 ++++++++ lib/csapi/users.h | 46 +++++ lib/csapi/versions.cpp | 47 +++++ lib/csapi/versions.h | 41 ++++ lib/csapi/whoami.cpp | 50 +++++ lib/csapi/whoami.h | 40 ++++ lib/csapi/{{base}}.cpp.mustache | 121 ++++++++++++ lib/csapi/{{base}}.h.mustache | 63 ++++++ lib/jobs/downloadfilejob.h | 2 +- lib/jobs/generated/account-data.cpp | 28 --- lib/jobs/generated/account-data.h | 27 --- lib/jobs/generated/administrative_contact.cpp | 102 ---------- lib/jobs/generated/administrative_contact.h | 83 -------- lib/jobs/generated/banning.cpp | 34 ---- lib/jobs/generated/banning.h | 26 --- lib/jobs/generated/content-repo.cpp | 254 ------------------------ lib/jobs/generated/content-repo.h | 143 -------------- lib/jobs/generated/create_room.cpp | 82 -------- lib/jobs/generated/create_room.h | 54 ------ lib/jobs/generated/directory.cpp | 76 -------- lib/jobs/generated/directory.h | 62 ------ lib/jobs/generated/inviting.cpp | 23 --- lib/jobs/generated/inviting.h | 20 -- lib/jobs/generated/joining.cpp | 118 ------------ lib/jobs/generated/joining.h | 81 -------- lib/jobs/generated/kicking.cpp | 25 --- lib/jobs/generated/kicking.h | 20 -- lib/jobs/generated/leaving.cpp | 38 ---- lib/jobs/generated/leaving.h | 42 ---- lib/jobs/generated/list_joined_rooms.cpp | 50 ----- lib/jobs/generated/list_joined_rooms.h | 41 ---- lib/jobs/generated/list_public_rooms.cpp | 268 -------------------------- lib/jobs/generated/list_public_rooms.h | 138 ------------- lib/jobs/generated/login.cpp | 79 -------- lib/jobs/generated/login.h | 35 ---- lib/jobs/generated/logout.cpp | 26 --- lib/jobs/generated/logout.h | 28 --- lib/jobs/generated/message_pagination.cpp | 76 -------- lib/jobs/generated/message_pagination.h | 43 ----- lib/jobs/generated/notifications.cpp | 96 --------- lib/jobs/generated/notifications.h | 59 ------ lib/jobs/generated/profile.cpp | 140 -------------- lib/jobs/generated/profile.h | 105 ---------- lib/jobs/generated/pusher.cpp | 121 ------------ lib/jobs/generated/pusher.h | 78 -------- lib/jobs/generated/receipts.cpp | 21 -- lib/jobs/generated/receipts.h | 21 -- lib/jobs/generated/redaction.cpp | 45 ----- lib/jobs/generated/redaction.h | 32 --- lib/jobs/generated/room_send.cpp | 42 ---- lib/jobs/generated/room_send.h | 33 ---- lib/jobs/generated/room_state.cpp | 70 ------- lib/jobs/generated/room_state.h | 51 ----- lib/jobs/generated/tags.cpp | 66 ------- lib/jobs/generated/tags.h | 61 ------ lib/jobs/generated/third_party_membership.cpp | 25 --- lib/jobs/generated/third_party_membership.h | 20 -- lib/jobs/generated/to_device.cpp | 23 --- lib/jobs/generated/to_device.h | 22 --- lib/jobs/generated/typing.cpp | 24 --- lib/jobs/generated/typing.h | 20 -- lib/jobs/generated/users.cpp | 78 -------- lib/jobs/generated/users.h | 46 ----- lib/jobs/generated/versions.cpp | 47 ----- lib/jobs/generated/versions.h | 41 ---- lib/jobs/generated/whoami.cpp | 50 ----- lib/jobs/generated/whoami.h | 40 ---- lib/jobs/gtad.yaml | 139 ------------- lib/jobs/mediathumbnailjob.h | 2 +- lib/jobs/preamble.mustache | 3 - lib/jobs/{{base}}.cpp.mustache | 121 ------------ lib/jobs/{{base}}.h.mustache | 63 ------ lib/room.cpp | 18 +- lib/user.cpp | 6 +- libqmatrixclient.pri | 8 +- 136 files changed, 4254 insertions(+), 3952 deletions(-) create mode 100644 lib/csapi/account-data.cpp create mode 100644 lib/csapi/account-data.h create mode 100644 lib/csapi/admin.cpp create mode 100644 lib/csapi/admin.h create mode 100644 lib/csapi/administrative_contact.cpp create mode 100644 lib/csapi/administrative_contact.h create mode 100644 lib/csapi/banning.cpp create mode 100644 lib/csapi/banning.h create mode 100644 lib/csapi/content-repo.cpp create mode 100644 lib/csapi/content-repo.h create mode 100644 lib/csapi/create_room.cpp create mode 100644 lib/csapi/create_room.h create mode 100644 lib/csapi/directory.cpp create mode 100644 lib/csapi/directory.h create mode 100644 lib/csapi/event_context.cpp create mode 100644 lib/csapi/event_context.h create mode 100644 lib/csapi/gtad.yaml create mode 100644 lib/csapi/inviting.cpp create mode 100644 lib/csapi/inviting.h create mode 100644 lib/csapi/joining.cpp create mode 100644 lib/csapi/joining.h create mode 100644 lib/csapi/kicking.cpp create mode 100644 lib/csapi/kicking.h create mode 100644 lib/csapi/leaving.cpp create mode 100644 lib/csapi/leaving.h create mode 100644 lib/csapi/list_joined_rooms.cpp create mode 100644 lib/csapi/list_joined_rooms.h create mode 100644 lib/csapi/list_public_rooms.cpp create mode 100644 lib/csapi/list_public_rooms.h create mode 100644 lib/csapi/login.cpp create mode 100644 lib/csapi/login.h create mode 100644 lib/csapi/logout.cpp create mode 100644 lib/csapi/logout.h create mode 100644 lib/csapi/message_pagination.cpp create mode 100644 lib/csapi/message_pagination.h create mode 100644 lib/csapi/notifications.cpp create mode 100644 lib/csapi/notifications.h create mode 100644 lib/csapi/preamble.mustache create mode 100644 lib/csapi/profile.cpp create mode 100644 lib/csapi/profile.h create mode 100644 lib/csapi/pusher.cpp create mode 100644 lib/csapi/pusher.h create mode 100644 lib/csapi/receipts.cpp create mode 100644 lib/csapi/receipts.h create mode 100644 lib/csapi/redaction.cpp create mode 100644 lib/csapi/redaction.h create mode 100644 lib/csapi/room_send.cpp create mode 100644 lib/csapi/room_send.h create mode 100644 lib/csapi/room_state.cpp create mode 100644 lib/csapi/room_state.h create mode 100644 lib/csapi/tags.cpp create mode 100644 lib/csapi/tags.h create mode 100644 lib/csapi/third_party_membership.cpp create mode 100644 lib/csapi/third_party_membership.h create mode 100644 lib/csapi/to_device.cpp create mode 100644 lib/csapi/to_device.h create mode 100644 lib/csapi/typing.cpp create mode 100644 lib/csapi/typing.h create mode 100644 lib/csapi/users.cpp create mode 100644 lib/csapi/users.h create mode 100644 lib/csapi/versions.cpp create mode 100644 lib/csapi/versions.h create mode 100644 lib/csapi/whoami.cpp create mode 100644 lib/csapi/whoami.h create mode 100644 lib/csapi/{{base}}.cpp.mustache create mode 100644 lib/csapi/{{base}}.h.mustache delete mode 100644 lib/jobs/generated/account-data.cpp delete mode 100644 lib/jobs/generated/account-data.h delete mode 100644 lib/jobs/generated/administrative_contact.cpp delete mode 100644 lib/jobs/generated/administrative_contact.h delete mode 100644 lib/jobs/generated/banning.cpp delete mode 100644 lib/jobs/generated/banning.h delete mode 100644 lib/jobs/generated/content-repo.cpp delete mode 100644 lib/jobs/generated/content-repo.h delete mode 100644 lib/jobs/generated/create_room.cpp delete mode 100644 lib/jobs/generated/create_room.h delete mode 100644 lib/jobs/generated/directory.cpp delete mode 100644 lib/jobs/generated/directory.h delete mode 100644 lib/jobs/generated/inviting.cpp delete mode 100644 lib/jobs/generated/inviting.h delete mode 100644 lib/jobs/generated/joining.cpp delete mode 100644 lib/jobs/generated/joining.h delete mode 100644 lib/jobs/generated/kicking.cpp delete mode 100644 lib/jobs/generated/kicking.h delete mode 100644 lib/jobs/generated/leaving.cpp delete mode 100644 lib/jobs/generated/leaving.h delete mode 100644 lib/jobs/generated/list_joined_rooms.cpp delete mode 100644 lib/jobs/generated/list_joined_rooms.h delete mode 100644 lib/jobs/generated/list_public_rooms.cpp delete mode 100644 lib/jobs/generated/list_public_rooms.h delete mode 100644 lib/jobs/generated/login.cpp delete mode 100644 lib/jobs/generated/login.h delete mode 100644 lib/jobs/generated/logout.cpp delete mode 100644 lib/jobs/generated/logout.h delete mode 100644 lib/jobs/generated/message_pagination.cpp delete mode 100644 lib/jobs/generated/message_pagination.h delete mode 100644 lib/jobs/generated/notifications.cpp delete mode 100644 lib/jobs/generated/notifications.h delete mode 100644 lib/jobs/generated/profile.cpp delete mode 100644 lib/jobs/generated/profile.h delete mode 100644 lib/jobs/generated/pusher.cpp delete mode 100644 lib/jobs/generated/pusher.h delete mode 100644 lib/jobs/generated/receipts.cpp delete mode 100644 lib/jobs/generated/receipts.h delete mode 100644 lib/jobs/generated/redaction.cpp delete mode 100644 lib/jobs/generated/redaction.h delete mode 100644 lib/jobs/generated/room_send.cpp delete mode 100644 lib/jobs/generated/room_send.h delete mode 100644 lib/jobs/generated/room_state.cpp delete mode 100644 lib/jobs/generated/room_state.h delete mode 100644 lib/jobs/generated/tags.cpp delete mode 100644 lib/jobs/generated/tags.h delete mode 100644 lib/jobs/generated/third_party_membership.cpp delete mode 100644 lib/jobs/generated/third_party_membership.h delete mode 100644 lib/jobs/generated/to_device.cpp delete mode 100644 lib/jobs/generated/to_device.h delete mode 100644 lib/jobs/generated/typing.cpp delete mode 100644 lib/jobs/generated/typing.h delete mode 100644 lib/jobs/generated/users.cpp delete mode 100644 lib/jobs/generated/users.h delete mode 100644 lib/jobs/generated/versions.cpp delete mode 100644 lib/jobs/generated/versions.h delete mode 100644 lib/jobs/generated/whoami.cpp delete mode 100644 lib/jobs/generated/whoami.h delete mode 100644 lib/jobs/gtad.yaml delete mode 100644 lib/jobs/preamble.mustache delete mode 100644 lib/jobs/{{base}}.cpp.mustache delete mode 100644 lib/jobs/{{base}}.h.mustache diff --git a/CMakeLists.txt b/CMakeLists.txt index 96bca983..935ba3dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,8 +94,8 @@ file(GLOB_RECURSE API_DEFS RELATIVE ${PROJECT_SOURCE_DIR} ${API_DEF_PATH}/definitions/*.yaml ${MATRIX_DOC_PATH}/event-schemas/schema/* ) -set(GTAD_CONFIG_DIR lib/jobs) -set(GEN_SRC_DIR lib/jobs/generated) +set(GTAD_CONFIG_DIR lib/csapi) +set(GEN_SRC_DIR lib/csapi) if (MATRIX_DOC_PATH AND GTAD_PATH) add_custom_target(update-api ${GTAD_PATH} --config ${GTAD_CONFIG_DIR}/gtad.yaml --out ${GEN_SRC_DIR} diff --git a/lib/connection.cpp b/lib/connection.cpp index 78ce4777..24bf1af9 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -23,12 +23,12 @@ #include "events/directchatevent.h" #include "room.h" #include "settings.h" -#include "jobs/generated/login.h" -#include "jobs/generated/logout.h" -#include "jobs/generated/receipts.h" -#include "jobs/generated/leaving.h" -#include "jobs/generated/account-data.h" -#include "jobs/generated/joining.h" +#include "csapi/login.h" +#include "csapi/logout.h" +#include "csapi/receipts.h" +#include "csapi/leaving.h" +#include "csapi/account-data.h" +#include "csapi/joining.h" #include "jobs/sendeventjob.h" #include "jobs/syncjob.h" #include "jobs/mediathumbnailjob.h" diff --git a/lib/connection.h b/lib/connection.h index 3364739b..6dd0db1d 100644 --- a/lib/connection.h +++ b/lib/connection.h @@ -18,7 +18,7 @@ #pragma once -#include "jobs/generated/create_room.h" +#include "csapi/create_room.h" #include "joinstate.h" #include diff --git a/lib/csapi/account-data.cpp b/lib/csapi/account-data.cpp new file mode 100644 index 00000000..ac45cb85 --- /dev/null +++ b/lib/csapi/account-data.cpp @@ -0,0 +1,28 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "account-data.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type, const QJsonObject& content) + : BaseJob(HttpVerb::Put, "SetAccountDataJob", + basePath % "/user/" % userId % "/account_data/" % type) +{ + setRequestData(Data(toJson(content))); +} + +SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type, const QJsonObject& content) + : BaseJob(HttpVerb::Put, "SetAccountDataPerRoomJob", + basePath % "/user/" % userId % "/rooms/" % roomId % "/account_data/" % type) +{ + setRequestData(Data(toJson(content))); +} + diff --git a/lib/csapi/account-data.h b/lib/csapi/account-data.h new file mode 100644 index 00000000..784b8b4b --- /dev/null +++ b/lib/csapi/account-data.h @@ -0,0 +1,27 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class SetAccountDataJob : public BaseJob + { + public: + explicit SetAccountDataJob(const QString& userId, const QString& type, const QJsonObject& content = {}); + }; + + class SetAccountDataPerRoomJob : public BaseJob + { + public: + explicit SetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type, const QJsonObject& content = {}); + }; +} // namespace QMatrixClient diff --git a/lib/csapi/admin.cpp b/lib/csapi/admin.cpp new file mode 100644 index 00000000..b325d746 --- /dev/null +++ b/lib/csapi/admin.cpp @@ -0,0 +1,100 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "admin.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +namespace QMatrixClient +{ + // Converters + + template <> struct FromJson + { + GetWhoIsJob::ConnectionInfo operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + GetWhoIsJob::ConnectionInfo result; + result.ip = + fromJson(o.value("ip")); + result.lastSeen = + fromJson(o.value("last_seen")); + result.userAgent = + fromJson(o.value("user_agent")); + + return result; + } + }; + + template <> struct FromJson + { + GetWhoIsJob::SessionInfo operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + GetWhoIsJob::SessionInfo result; + result.connections = + fromJson>(o.value("connections")); + + return result; + } + }; + + template <> struct FromJson + { + GetWhoIsJob::DeviceInfo operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + GetWhoIsJob::DeviceInfo result; + result.sessions = + fromJson>(o.value("sessions")); + + return result; + } + }; +} // namespace QMatrixClient + +class GetWhoIsJob::Private +{ + public: + QString userId; + QHash devices; +}; + +QUrl GetWhoIsJob::makeRequestUrl(QUrl baseUrl, const QString& userId) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/admin/whois/" % userId); +} + +GetWhoIsJob::GetWhoIsJob(const QString& userId) + : BaseJob(HttpVerb::Get, "GetWhoIsJob", + basePath % "/admin/whois/" % userId) + , d(new Private) +{ +} + +GetWhoIsJob::~GetWhoIsJob() = default; + +const QString& GetWhoIsJob::userId() const +{ + return d->userId; +} + +const QHash& GetWhoIsJob::devices() const +{ + return d->devices; +} + +BaseJob::Status GetWhoIsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->userId = fromJson(json.value("user_id")); + d->devices = fromJson>(json.value("devices")); + return Success; +} + diff --git a/lib/csapi/admin.h b/lib/csapi/admin.h new file mode 100644 index 00000000..ada5a8ca --- /dev/null +++ b/lib/csapi/admin.h @@ -0,0 +1,65 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class GetWhoIsJob : public BaseJob + { + public: + // Inner data structures + + struct ConnectionInfo + { + QString ip; + qint64 lastSeen; + QString userAgent; + }; + + struct SessionInfo + { + QVector connections; + }; + + struct DeviceInfo + { + QVector sessions; + }; + + // Construction/destruction + + explicit GetWhoIsJob(const QString& userId); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetWhoIsJob. This function can be used when + * a URL for GetWhoIsJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId); + + ~GetWhoIsJob() override; + + // Result properties + + const QString& userId() const; + const QHash& devices() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/administrative_contact.cpp b/lib/csapi/administrative_contact.cpp new file mode 100644 index 00000000..ec7c77c3 --- /dev/null +++ b/lib/csapi/administrative_contact.cpp @@ -0,0 +1,102 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "administrative_contact.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +namespace QMatrixClient +{ + // Converters + + template <> struct FromJson + { + GetAccount3PIDsJob::ThirdPartyIdentifier operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + GetAccount3PIDsJob::ThirdPartyIdentifier result; + result.medium = + fromJson(o.value("medium")); + result.address = + fromJson(o.value("address")); + + return result; + } + }; +} // namespace QMatrixClient + +class GetAccount3PIDsJob::Private +{ + public: + QVector threepids; +}; + +QUrl GetAccount3PIDsJob::makeRequestUrl(QUrl baseUrl) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/account/3pid"); +} + +GetAccount3PIDsJob::GetAccount3PIDsJob() + : BaseJob(HttpVerb::Get, "GetAccount3PIDsJob", + basePath % "/account/3pid") + , d(new Private) +{ +} + +GetAccount3PIDsJob::~GetAccount3PIDsJob() = default; + +const QVector& GetAccount3PIDsJob::threepids() const +{ + return d->threepids; +} + +BaseJob::Status GetAccount3PIDsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->threepids = fromJson>(json.value("threepids")); + return Success; +} + +namespace QMatrixClient +{ + // Converters + + QJsonObject toJson(const Post3PIDsJob::ThreePidCredentials& pod) + { + QJsonObject o; + o.insert("client_secret", toJson(pod.clientSecret)); + o.insert("id_server", toJson(pod.idServer)); + o.insert("sid", toJson(pod.sid)); + + return o; + } +} // namespace QMatrixClient + +Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind) + : BaseJob(HttpVerb::Post, "Post3PIDsJob", + basePath % "/account/3pid") +{ + QJsonObject _data; + _data.insert("three_pid_creds", toJson(threePidCreds)); + _data.insert("bind", toJson(bind)); + setRequestData(_data); +} + +QUrl RequestTokenTo3PIDJob::makeRequestUrl(QUrl baseUrl) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/account/3pid/email/requestToken"); +} + +RequestTokenTo3PIDJob::RequestTokenTo3PIDJob() + : BaseJob(HttpVerb::Post, "RequestTokenTo3PIDJob", + basePath % "/account/3pid/email/requestToken", false) +{ +} + diff --git a/lib/csapi/administrative_contact.h b/lib/csapi/administrative_contact.h new file mode 100644 index 00000000..0d1ace3d --- /dev/null +++ b/lib/csapi/administrative_contact.h @@ -0,0 +1,83 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class GetAccount3PIDsJob : public BaseJob + { + public: + // Inner data structures + + struct ThirdPartyIdentifier + { + QString medium; + QString address; + }; + + // Construction/destruction + + explicit GetAccount3PIDsJob(); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetAccount3PIDsJob. This function can be used when + * a URL for GetAccount3PIDsJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl); + + ~GetAccount3PIDsJob() override; + + // Result properties + + const QVector& threepids() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class Post3PIDsJob : public BaseJob + { + public: + // Inner data structures + + struct ThreePidCredentials + { + QString clientSecret; + QString idServer; + QString sid; + }; + + // Construction/destruction + + explicit Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind = {}); + }; + + class RequestTokenTo3PIDJob : public BaseJob + { + public: + explicit RequestTokenTo3PIDJob(); + + /** Construct a URL out of baseUrl and usual parameters passed to + * RequestTokenTo3PIDJob. This function can be used when + * a URL for RequestTokenTo3PIDJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl); + + }; +} // namespace QMatrixClient diff --git a/lib/csapi/banning.cpp b/lib/csapi/banning.cpp new file mode 100644 index 00000000..f66b27b6 --- /dev/null +++ b/lib/csapi/banning.cpp @@ -0,0 +1,34 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "banning.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +BanJob::BanJob(const QString& roomId, const QString& userId, const QString& reason) + : BaseJob(HttpVerb::Post, "BanJob", + basePath % "/rooms/" % roomId % "/ban") +{ + QJsonObject _data; + _data.insert("user_id", toJson(userId)); + if (!reason.isEmpty()) + _data.insert("reason", toJson(reason)); + setRequestData(_data); +} + +UnbanJob::UnbanJob(const QString& roomId, const QString& userId) + : BaseJob(HttpVerb::Post, "UnbanJob", + basePath % "/rooms/" % roomId % "/unban") +{ + QJsonObject _data; + _data.insert("user_id", toJson(userId)); + setRequestData(_data); +} + diff --git a/lib/csapi/banning.h b/lib/csapi/banning.h new file mode 100644 index 00000000..5d9bae2b --- /dev/null +++ b/lib/csapi/banning.h @@ -0,0 +1,26 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + + + +namespace QMatrixClient +{ + // Operations + + class BanJob : public BaseJob + { + public: + explicit BanJob(const QString& roomId, const QString& userId, const QString& reason = {}); + }; + + class UnbanJob : public BaseJob + { + public: + explicit UnbanJob(const QString& roomId, const QString& userId); + }; +} // namespace QMatrixClient diff --git a/lib/csapi/content-repo.cpp b/lib/csapi/content-repo.cpp new file mode 100644 index 00000000..95fc5aed --- /dev/null +++ b/lib/csapi/content-repo.cpp @@ -0,0 +1,254 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "content-repo.h" + +#include "converters.h" + +#include +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/media/r0"); + +class UploadContentJob::Private +{ + public: + QString contentUri; +}; + +BaseJob::Query queryToUploadContent(const QString& filename) +{ + BaseJob::Query _q; + if (!filename.isEmpty()) + _q.addQueryItem("filename", filename); + return _q; +} + +UploadContentJob::UploadContentJob(QIODevice* content, const QString& filename, const QString& contentType) + : BaseJob(HttpVerb::Post, "UploadContentJob", + basePath % "/upload", + queryToUploadContent(filename)) + , d(new Private) +{ + setRequestHeader("Content-Type", contentType.toLatin1()); + + setRequestData(Data(content)); +} + +UploadContentJob::~UploadContentJob() = default; + +const QString& UploadContentJob::contentUri() const +{ + return d->contentUri; +} + +BaseJob::Status UploadContentJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("content_uri")) + return { JsonParseError, + "The key 'content_uri' not found in the response" }; + d->contentUri = fromJson(json.value("content_uri")); + return Success; +} + +class GetContentJob::Private +{ + public: + QString contentType; + QString contentDisposition; + QIODevice* content; +}; + +QUrl GetContentJob::makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/download/" % serverName % "/" % mediaId); +} + +GetContentJob::GetContentJob(const QString& serverName, const QString& mediaId) + : BaseJob(HttpVerb::Get, "GetContentJob", + basePath % "/download/" % serverName % "/" % mediaId, false) + , d(new Private) +{ + setExpectedContentTypes({ "*/*" }); +} + +GetContentJob::~GetContentJob() = default; + +const QString& GetContentJob::contentType() const +{ + return d->contentType; +} + +const QString& GetContentJob::contentDisposition() const +{ + return d->contentDisposition; +} + +QIODevice* GetContentJob::content() const +{ + return d->content; +} + +BaseJob::Status GetContentJob::parseReply(QNetworkReply* reply) +{ + d->contentType = reply->rawHeader("Content-Type"); + d->contentDisposition = reply->rawHeader("Content-Disposition"); + d->content = reply; + return Success; +} + +class GetContentOverrideNameJob::Private +{ + public: + QString contentType; + QString contentDisposition; + QIODevice* content; +}; + +QUrl GetContentOverrideNameJob::makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, const QString& fileName) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/download/" % serverName % "/" % mediaId % "/" % fileName); +} + +GetContentOverrideNameJob::GetContentOverrideNameJob(const QString& serverName, const QString& mediaId, const QString& fileName) + : BaseJob(HttpVerb::Get, "GetContentOverrideNameJob", + basePath % "/download/" % serverName % "/" % mediaId % "/" % fileName, false) + , d(new Private) +{ + setExpectedContentTypes({ "*/*" }); +} + +GetContentOverrideNameJob::~GetContentOverrideNameJob() = default; + +const QString& GetContentOverrideNameJob::contentType() const +{ + return d->contentType; +} + +const QString& GetContentOverrideNameJob::contentDisposition() const +{ + return d->contentDisposition; +} + +QIODevice* GetContentOverrideNameJob::content() const +{ + return d->content; +} + +BaseJob::Status GetContentOverrideNameJob::parseReply(QNetworkReply* reply) +{ + d->contentType = reply->rawHeader("Content-Type"); + d->contentDisposition = reply->rawHeader("Content-Disposition"); + d->content = reply; + return Success; +} + +class GetContentThumbnailJob::Private +{ + public: + QString contentType; + QIODevice* content; +}; + +BaseJob::Query queryToGetContentThumbnail(int width, int height, const QString& method) +{ + BaseJob::Query _q; + _q.addQueryItem("width", QString("%1").arg(width)); + _q.addQueryItem("height", QString("%1").arg(height)); + if (!method.isEmpty()) + _q.addQueryItem("method", method); + return _q; +} + +QUrl GetContentThumbnailJob::makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, int width, int height, const QString& method) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/thumbnail/" % serverName % "/" % mediaId, + queryToGetContentThumbnail(width, height, method)); +} + +GetContentThumbnailJob::GetContentThumbnailJob(const QString& serverName, const QString& mediaId, int width, int height, const QString& method) + : BaseJob(HttpVerb::Get, "GetContentThumbnailJob", + basePath % "/thumbnail/" % serverName % "/" % mediaId, + queryToGetContentThumbnail(width, height, method), + {}, false) + , d(new Private) +{ + setExpectedContentTypes({ "image/jpeg", "image/png" }); +} + +GetContentThumbnailJob::~GetContentThumbnailJob() = default; + +const QString& GetContentThumbnailJob::contentType() const +{ + return d->contentType; +} + +QIODevice* GetContentThumbnailJob::content() const +{ + return d->content; +} + +BaseJob::Status GetContentThumbnailJob::parseReply(QNetworkReply* reply) +{ + d->contentType = reply->rawHeader("Content-Type"); + d->content = reply; + return Success; +} + +class GetUrlPreviewJob::Private +{ + public: + qint64 matrixImageSize; + QString ogImage; +}; + +BaseJob::Query queryToGetUrlPreview(const QString& url, qint64 ts) +{ + BaseJob::Query _q; + _q.addQueryItem("url", url); + _q.addQueryItem("ts", QString("%1").arg(ts)); + return _q; +} + +QUrl GetUrlPreviewJob::makeRequestUrl(QUrl baseUrl, const QString& url, qint64 ts) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/preview_url", + queryToGetUrlPreview(url, ts)); +} + +GetUrlPreviewJob::GetUrlPreviewJob(const QString& url, qint64 ts) + : BaseJob(HttpVerb::Get, "GetUrlPreviewJob", + basePath % "/preview_url", + queryToGetUrlPreview(url, ts)) + , d(new Private) +{ +} + +GetUrlPreviewJob::~GetUrlPreviewJob() = default; + +qint64 GetUrlPreviewJob::matrixImageSize() const +{ + return d->matrixImageSize; +} + +const QString& GetUrlPreviewJob::ogImage() const +{ + return d->ogImage; +} + +BaseJob::Status GetUrlPreviewJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->matrixImageSize = fromJson(json.value("matrix:image:size")); + d->ogImage = fromJson(json.value("og:image")); + return Success; +} + diff --git a/lib/csapi/content-repo.h b/lib/csapi/content-repo.h new file mode 100644 index 00000000..4c799b2d --- /dev/null +++ b/lib/csapi/content-repo.h @@ -0,0 +1,143 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class UploadContentJob : public BaseJob + { + public: + explicit UploadContentJob(QIODevice* content, const QString& filename = {}, const QString& contentType = {}); + ~UploadContentJob() override; + + // Result properties + + const QString& contentUri() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class GetContentJob : public BaseJob + { + public: + explicit GetContentJob(const QString& serverName, const QString& mediaId); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetContentJob. This function can be used when + * a URL for GetContentJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId); + + ~GetContentJob() override; + + // Result properties + + const QString& contentType() const; + const QString& contentDisposition() const; + QIODevice* content() const; + + protected: + Status parseReply(QNetworkReply* reply) override; + + private: + class Private; + QScopedPointer d; + }; + + class GetContentOverrideNameJob : public BaseJob + { + public: + explicit GetContentOverrideNameJob(const QString& serverName, const QString& mediaId, const QString& fileName); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetContentOverrideNameJob. This function can be used when + * a URL for GetContentOverrideNameJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, const QString& fileName); + + ~GetContentOverrideNameJob() override; + + // Result properties + + const QString& contentType() const; + const QString& contentDisposition() const; + QIODevice* content() const; + + protected: + Status parseReply(QNetworkReply* reply) override; + + private: + class Private; + QScopedPointer d; + }; + + class GetContentThumbnailJob : public BaseJob + { + public: + explicit GetContentThumbnailJob(const QString& serverName, const QString& mediaId, int width = {}, int height = {}, const QString& method = {}); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetContentThumbnailJob. This function can be used when + * a URL for GetContentThumbnailJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, int width = {}, int height = {}, const QString& method = {}); + + ~GetContentThumbnailJob() override; + + // Result properties + + const QString& contentType() const; + QIODevice* content() const; + + protected: + Status parseReply(QNetworkReply* reply) override; + + private: + class Private; + QScopedPointer d; + }; + + class GetUrlPreviewJob : public BaseJob + { + public: + explicit GetUrlPreviewJob(const QString& url, qint64 ts = {}); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetUrlPreviewJob. This function can be used when + * a URL for GetUrlPreviewJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& url, qint64 ts = {}); + + ~GetUrlPreviewJob() override; + + // Result properties + + qint64 matrixImageSize() const; + const QString& ogImage() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/create_room.cpp b/lib/csapi/create_room.cpp new file mode 100644 index 00000000..0a7eb208 --- /dev/null +++ b/lib/csapi/create_room.cpp @@ -0,0 +1,82 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "create_room.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +namespace QMatrixClient +{ + // Converters + + QJsonObject toJson(const CreateRoomJob::Invite3pid& pod) + { + QJsonObject o; + o.insert("id_server", toJson(pod.idServer)); + o.insert("medium", toJson(pod.medium)); + o.insert("address", toJson(pod.address)); + + return o; + } + + QJsonObject toJson(const CreateRoomJob::StateEvent& pod) + { + QJsonObject o; + o.insert("type", toJson(pod.type)); + o.insert("state_key", toJson(pod.stateKey)); + o.insert("content", toJson(pod.content)); + + return o; + } +} // namespace QMatrixClient + +class CreateRoomJob::Private +{ + public: + QString roomId; +}; + +CreateRoomJob::CreateRoomJob(const QString& visibility, const QString& roomAliasName, const QString& name, const QString& topic, const QStringList& invite, const QVector& invite3pid, const QJsonObject& creationContent, const QVector& initialState, const QString& preset, bool isDirect, bool guestCanJoin) + : BaseJob(HttpVerb::Post, "CreateRoomJob", + basePath % "/createRoom") + , d(new Private) +{ + QJsonObject _data; + if (!visibility.isEmpty()) + _data.insert("visibility", toJson(visibility)); + if (!roomAliasName.isEmpty()) + _data.insert("room_alias_name", toJson(roomAliasName)); + if (!name.isEmpty()) + _data.insert("name", toJson(name)); + if (!topic.isEmpty()) + _data.insert("topic", toJson(topic)); + _data.insert("invite", toJson(invite)); + _data.insert("invite_3pid", toJson(invite3pid)); + _data.insert("creation_content", toJson(creationContent)); + _data.insert("initial_state", toJson(initialState)); + if (!preset.isEmpty()) + _data.insert("preset", toJson(preset)); + _data.insert("is_direct", toJson(isDirect)); + _data.insert("guest_can_join", toJson(guestCanJoin)); + setRequestData(_data); +} + +CreateRoomJob::~CreateRoomJob() = default; + +const QString& CreateRoomJob::roomId() const +{ + return d->roomId; +} + +BaseJob::Status CreateRoomJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->roomId = fromJson(json.value("room_id")); + return Success; +} + diff --git a/lib/csapi/create_room.h b/lib/csapi/create_room.h new file mode 100644 index 00000000..8ade7a9c --- /dev/null +++ b/lib/csapi/create_room.h @@ -0,0 +1,54 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include +#include +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class CreateRoomJob : public BaseJob + { + public: + // Inner data structures + + struct Invite3pid + { + QString idServer; + QString medium; + QString address; + }; + + struct StateEvent + { + QString type; + QString stateKey; + QJsonObject content; + }; + + // Construction/destruction + + explicit CreateRoomJob(const QString& visibility = {}, const QString& roomAliasName = {}, const QString& name = {}, const QString& topic = {}, const QStringList& invite = {}, const QVector& invite3pid = {}, const QJsonObject& creationContent = {}, const QVector& initialState = {}, const QString& preset = {}, bool isDirect = {}, bool guestCanJoin = {}); + ~CreateRoomJob() override; + + // Result properties + + const QString& roomId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/directory.cpp b/lib/csapi/directory.cpp new file mode 100644 index 00000000..3066ebe2 --- /dev/null +++ b/lib/csapi/directory.cpp @@ -0,0 +1,76 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "directory.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0/directory"); + +SetRoomAliasJob::SetRoomAliasJob(const QString& roomAlias, const QString& roomId) + : BaseJob(HttpVerb::Put, "SetRoomAliasJob", + basePath % "/room/" % roomAlias) +{ + QJsonObject _data; + if (!roomId.isEmpty()) + _data.insert("room_id", toJson(roomId)); + setRequestData(_data); +} + +class GetRoomIdByAliasJob::Private +{ + public: + QString roomId; + QStringList servers; +}; + +QUrl GetRoomIdByAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/room/" % roomAlias); +} + +GetRoomIdByAliasJob::GetRoomIdByAliasJob(const QString& roomAlias) + : BaseJob(HttpVerb::Get, "GetRoomIdByAliasJob", + basePath % "/room/" % roomAlias, false) + , d(new Private) +{ +} + +GetRoomIdByAliasJob::~GetRoomIdByAliasJob() = default; + +const QString& GetRoomIdByAliasJob::roomId() const +{ + return d->roomId; +} + +const QStringList& GetRoomIdByAliasJob::servers() const +{ + return d->servers; +} + +BaseJob::Status GetRoomIdByAliasJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->roomId = fromJson(json.value("room_id")); + d->servers = fromJson(json.value("servers")); + return Success; +} + +QUrl DeleteRoomAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/room/" % roomAlias); +} + +DeleteRoomAliasJob::DeleteRoomAliasJob(const QString& roomAlias) + : BaseJob(HttpVerb::Delete, "DeleteRoomAliasJob", + basePath % "/room/" % roomAlias) +{ +} + diff --git a/lib/csapi/directory.h b/lib/csapi/directory.h new file mode 100644 index 00000000..b6e62b6a --- /dev/null +++ b/lib/csapi/directory.h @@ -0,0 +1,62 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class SetRoomAliasJob : public BaseJob + { + public: + explicit SetRoomAliasJob(const QString& roomAlias, const QString& roomId = {}); + }; + + class GetRoomIdByAliasJob : public BaseJob + { + public: + explicit GetRoomIdByAliasJob(const QString& roomAlias); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetRoomIdByAliasJob. This function can be used when + * a URL for GetRoomIdByAliasJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomAlias); + + ~GetRoomIdByAliasJob() override; + + // Result properties + + const QString& roomId() const; + const QStringList& servers() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class DeleteRoomAliasJob : public BaseJob + { + public: + explicit DeleteRoomAliasJob(const QString& roomAlias); + + /** Construct a URL out of baseUrl and usual parameters passed to + * DeleteRoomAliasJob. This function can be used when + * a URL for DeleteRoomAliasJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomAlias); + + }; +} // namespace QMatrixClient diff --git a/lib/csapi/event_context.cpp b/lib/csapi/event_context.cpp new file mode 100644 index 00000000..d9ab45ca --- /dev/null +++ b/lib/csapi/event_context.cpp @@ -0,0 +1,91 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "event_context.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class GetEventContextJob::Private +{ + public: + QString begin; + QString end; + RoomEvents eventsBefore; + RoomEventPtr event; + RoomEvents eventsAfter; + StateEvents state; +}; + +BaseJob::Query queryToGetEventContext(int limit) +{ + BaseJob::Query _q; + _q.addQueryItem("limit", QString("%1").arg(limit)); + return _q; +} + +QUrl GetEventContextJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventId, int limit) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/rooms/" % roomId % "/context/" % eventId, + queryToGetEventContext(limit)); +} + +GetEventContextJob::GetEventContextJob(const QString& roomId, const QString& eventId, int limit) + : BaseJob(HttpVerb::Get, "GetEventContextJob", + basePath % "/rooms/" % roomId % "/context/" % eventId, + queryToGetEventContext(limit)) + , d(new Private) +{ +} + +GetEventContextJob::~GetEventContextJob() = default; + +const QString& GetEventContextJob::begin() const +{ + return d->begin; +} + +const QString& GetEventContextJob::end() const +{ + return d->end; +} + +RoomEvents&& GetEventContextJob::eventsBefore() +{ + return std::move(d->eventsBefore); +} + +RoomEventPtr&& GetEventContextJob::event() +{ + return std::move(d->event); +} + +RoomEvents&& GetEventContextJob::eventsAfter() +{ + return std::move(d->eventsAfter); +} + +StateEvents&& GetEventContextJob::state() +{ + return std::move(d->state); +} + +BaseJob::Status GetEventContextJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->begin = fromJson(json.value("start")); + d->end = fromJson(json.value("end")); + d->eventsBefore = fromJson(json.value("events_before")); + d->event = fromJson(json.value("event")); + d->eventsAfter = fromJson(json.value("events_after")); + d->state = fromJson(json.value("state")); + return Success; +} + diff --git a/lib/csapi/event_context.h b/lib/csapi/event_context.h new file mode 100644 index 00000000..caf1dfd4 --- /dev/null +++ b/lib/csapi/event_context.h @@ -0,0 +1,46 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include "events/event.h" + + +namespace QMatrixClient +{ + // Operations + + class GetEventContextJob : public BaseJob + { + public: + explicit GetEventContextJob(const QString& roomId, const QString& eventId, int limit = {}); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetEventContextJob. This function can be used when + * a URL for GetEventContextJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& eventId, int limit = {}); + + ~GetEventContextJob() override; + + // Result properties + + const QString& begin() const; + const QString& end() const; + RoomEvents&& eventsBefore(); + RoomEventPtr&& event(); + RoomEvents&& eventsAfter(); + StateEvents&& state(); + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/gtad.yaml b/lib/csapi/gtad.yaml new file mode 100644 index 00000000..7f6a97e0 --- /dev/null +++ b/lib/csapi/gtad.yaml @@ -0,0 +1,139 @@ +analyzer: + subst: + "%CLIENT_RELEASE_LABEL%": r0 + "%CLIENT_MAJOR_VERSION%": r0 + identifiers: + signed: signedData + unsigned: unsignedData + default: isDefault + origin_server_ts: originServerTimestamp # Instead of originServerTs + start: begin # Because start() is a method in BaseJob + + types: + # Structure: + # swaggerType: + # OR + # swaggerType: + # - swaggerFormat: + # - /swaggerFormatRegEx/: + # - //: # default, if the format doesn't mach anything above + # WHERE + # targetTypeSpec = targetType OR + # { type: targetType, imports: , } + integer: + - int64: qint64 + - int32: qint32 + - //: int + number: + - float: float + - //: double + boolean: { type: bool, initializer: false } + string: + - byte: &ByteStream + type: QIODevice* + #initializer: '"{{defaultValue}}"' + #string?: true + imports: + - binary: *ByteStream + - date: + type: QDate + initializer: QDate::fromString("{{defaultValue}}") + avoidCopy?: true + imports: + - dateTime: + type: QDateTime + initializer: QDateTime::fromString("{{defaultValue}}") + avoidCopy?: true + imports: + - //: + type: QString + initializer: QStringLiteral("{{defaultValue}}") + string?: true + avoidCopy?: true + file: *ByteStream + object: + - /m\.room\.member$/: # A stub for EventsBatch + - /state_event.yaml$/: + type: StateEventPtr + noCopy?: true + imports: '"events/event.h"' + - /room_event.yaml$/: + type: RoomEventPtr + noCopy?: true + imports: '"events/event.h"' + - /event.yaml$/: + type: EventPtr + noCopy?: true + imports: '"events/event.h"' + - //: + type: QJsonObject + avoidCopy?: true + imports: + array: + - string: + type: QStringList + avoidCopy?: true + imports: + - /^Notification|Result$/: + type: "std::vector<{{1}}>" + noCopy?: true + imports: '"events/event.h"' + - /m\.room\.member$/: + type: "EventsArray" + noCopy?: true + imports: '"events/roommemberevent.h"' + - /state_event.yaml$/: + type: StateEvents + noCopy?: true + - /room_event.yaml$/: + type: RoomEvents + noCopy?: true + - /event.yaml$/: + type: Events + noCopy?: true + - /.+/: + type: "QVector<{{1}}>" + avoidCopy?: true + imports: + - //: { type: QJsonArray, "avoidCopy?": true, imports: } + map: + - RoomState: + type: "std::unordered_map" + noCopy?: true + imports: + - /.+/: + type: "QHash" + avoidCopy?: true + imports: + - //: + type: QVariantHash + avoidCopy?: true + imports: + variant: { type: QVariant, "avoidCopy?": true, imports: } + schema: # Properties of inline structure definitions + avoidCopy?: true + + #operations: + +mustache: + definitions: + _scopeRenderer: "{{scopeCamelCase}}Job::" + _literalQuote: '"' + maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}{{#noCopy?}}&&{{/noCopy?}}" + qualifiedMaybeCrefType: + "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}{{#noCopy?}}&&{{/noCopy?}}" + initializeDefaultValue: "{{#defaultValue}}{{>initializer}}{{/defaultValue}}{{^defaultValue}}{}{{/defaultValue}}" + joinedParamDecl: '{{>maybeCrefType}} {{paramName}}{{^required?}} = {{>initializeDefaultValue}}{{/required?}}{{#@join}}, {{/@join}}' + joinedParamDef: '{{>maybeCrefType}} {{paramName}}{{#@join}}, {{/@join}}' + passQueryParams: '{{#queryParams}}{{paramName}}{{#@join}}, {{/@join}}{{/queryParams}}' + paramToString: '{{#string?}}{{nameCamelCase}}{{/string?}}{{^string?}}QString("%1").arg({{nameCamelCase}}){{/string?}}' + # preamble: preamble.mustache + copyrightName: Kitsune Ral + copyrightEmail: + + templates: + - "{{base}}.h.mustache" + - "{{base}}.cpp.mustache" + + #outFilesList: apifiles.txt + diff --git a/lib/csapi/inviting.cpp b/lib/csapi/inviting.cpp new file mode 100644 index 00000000..d2ee2107 --- /dev/null +++ b/lib/csapi/inviting.cpp @@ -0,0 +1,23 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "inviting.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +InviteUserJob::InviteUserJob(const QString& roomId, const QString& userId) + : BaseJob(HttpVerb::Post, "InviteUserJob", + basePath % "/rooms/" % roomId % "/invite") +{ + QJsonObject _data; + _data.insert("user_id", toJson(userId)); + setRequestData(_data); +} + diff --git a/lib/csapi/inviting.h b/lib/csapi/inviting.h new file mode 100644 index 00000000..3119de6a --- /dev/null +++ b/lib/csapi/inviting.h @@ -0,0 +1,20 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + + + +namespace QMatrixClient +{ + // Operations + + class InviteUserJob : public BaseJob + { + public: + explicit InviteUserJob(const QString& roomId, const QString& userId); + }; +} // namespace QMatrixClient diff --git a/lib/csapi/joining.cpp b/lib/csapi/joining.cpp new file mode 100644 index 00000000..705e8f83 --- /dev/null +++ b/lib/csapi/joining.cpp @@ -0,0 +1,118 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "joining.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +namespace QMatrixClient +{ + // Converters + + QJsonObject toJson(const JoinRoomByIdJob::ThirdPartySigned& pod) + { + QJsonObject o; + o.insert("sender", toJson(pod.sender)); + o.insert("mxid", toJson(pod.mxid)); + o.insert("token", toJson(pod.token)); + o.insert("signatures", toJson(pod.signatures)); + + return o; + } +} // namespace QMatrixClient + +class JoinRoomByIdJob::Private +{ + public: + QString roomId; +}; + +JoinRoomByIdJob::JoinRoomByIdJob(const QString& roomId, const ThirdPartySigned& thirdPartySigned) + : BaseJob(HttpVerb::Post, "JoinRoomByIdJob", + basePath % "/rooms/" % roomId % "/join") + , d(new Private) +{ + QJsonObject _data; + _data.insert("third_party_signed", toJson(thirdPartySigned)); + setRequestData(_data); +} + +JoinRoomByIdJob::~JoinRoomByIdJob() = default; + +const QString& JoinRoomByIdJob::roomId() const +{ + return d->roomId; +} + +BaseJob::Status JoinRoomByIdJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("room_id")) + return { JsonParseError, + "The key 'room_id' not found in the response" }; + d->roomId = fromJson(json.value("room_id")); + return Success; +} + +namespace QMatrixClient +{ + // Converters + + QJsonObject toJson(const JoinRoomJob::Signed& pod) + { + QJsonObject o; + o.insert("sender", toJson(pod.sender)); + o.insert("mxid", toJson(pod.mxid)); + o.insert("token", toJson(pod.token)); + o.insert("signatures", toJson(pod.signatures)); + + return o; + } + + QJsonObject toJson(const JoinRoomJob::ThirdPartySigned& pod) + { + QJsonObject o; + o.insert("signed", toJson(pod.signedData)); + + return o; + } +} // namespace QMatrixClient + +class JoinRoomJob::Private +{ + public: + QString roomId; +}; + +JoinRoomJob::JoinRoomJob(const QString& roomIdOrAlias, const ThirdPartySigned& thirdPartySigned) + : BaseJob(HttpVerb::Post, "JoinRoomJob", + basePath % "/join/" % roomIdOrAlias) + , d(new Private) +{ + QJsonObject _data; + _data.insert("third_party_signed", toJson(thirdPartySigned)); + setRequestData(_data); +} + +JoinRoomJob::~JoinRoomJob() = default; + +const QString& JoinRoomJob::roomId() const +{ + return d->roomId; +} + +BaseJob::Status JoinRoomJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("room_id")) + return { JsonParseError, + "The key 'room_id' not found in the response" }; + d->roomId = fromJson(json.value("room_id")); + return Success; +} + diff --git a/lib/csapi/joining.h b/lib/csapi/joining.h new file mode 100644 index 00000000..ccaed04e --- /dev/null +++ b/lib/csapi/joining.h @@ -0,0 +1,81 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class JoinRoomByIdJob : public BaseJob + { + public: + // Inner data structures + + struct ThirdPartySigned + { + QString sender; + QString mxid; + QString token; + QJsonObject signatures; + }; + + // Construction/destruction + + explicit JoinRoomByIdJob(const QString& roomId, const ThirdPartySigned& thirdPartySigned = {}); + ~JoinRoomByIdJob() override; + + // Result properties + + const QString& roomId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class JoinRoomJob : public BaseJob + { + public: + // Inner data structures + + struct Signed + { + QString sender; + QString mxid; + QString token; + QJsonObject signatures; + }; + + struct ThirdPartySigned + { + Signed signedData; + }; + + // Construction/destruction + + explicit JoinRoomJob(const QString& roomIdOrAlias, const ThirdPartySigned& thirdPartySigned = {}); + ~JoinRoomJob() override; + + // Result properties + + const QString& roomId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/kicking.cpp b/lib/csapi/kicking.cpp new file mode 100644 index 00000000..bf2490b7 --- /dev/null +++ b/lib/csapi/kicking.cpp @@ -0,0 +1,25 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "kicking.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +KickJob::KickJob(const QString& roomId, const QString& userId, const QString& reason) + : BaseJob(HttpVerb::Post, "KickJob", + basePath % "/rooms/" % roomId % "/kick") +{ + QJsonObject _data; + _data.insert("user_id", toJson(userId)); + if (!reason.isEmpty()) + _data.insert("reason", toJson(reason)); + setRequestData(_data); +} + diff --git a/lib/csapi/kicking.h b/lib/csapi/kicking.h new file mode 100644 index 00000000..030dff88 --- /dev/null +++ b/lib/csapi/kicking.h @@ -0,0 +1,20 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + + + +namespace QMatrixClient +{ + // Operations + + class KickJob : public BaseJob + { + public: + explicit KickJob(const QString& roomId, const QString& userId, const QString& reason = {}); + }; +} // namespace QMatrixClient diff --git a/lib/csapi/leaving.cpp b/lib/csapi/leaving.cpp new file mode 100644 index 00000000..afc4adbd --- /dev/null +++ b/lib/csapi/leaving.cpp @@ -0,0 +1,38 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "leaving.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +QUrl LeaveRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/rooms/" % roomId % "/leave"); +} + +LeaveRoomJob::LeaveRoomJob(const QString& roomId) + : BaseJob(HttpVerb::Post, "LeaveRoomJob", + basePath % "/rooms/" % roomId % "/leave") +{ +} + +QUrl ForgetRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/rooms/" % roomId % "/forget"); +} + +ForgetRoomJob::ForgetRoomJob(const QString& roomId) + : BaseJob(HttpVerb::Post, "ForgetRoomJob", + basePath % "/rooms/" % roomId % "/forget") +{ +} + diff --git a/lib/csapi/leaving.h b/lib/csapi/leaving.h new file mode 100644 index 00000000..f6711c32 --- /dev/null +++ b/lib/csapi/leaving.h @@ -0,0 +1,42 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + + + +namespace QMatrixClient +{ + // Operations + + class LeaveRoomJob : public BaseJob + { + public: + explicit LeaveRoomJob(const QString& roomId); + + /** Construct a URL out of baseUrl and usual parameters passed to + * LeaveRoomJob. This function can be used when + * a URL for LeaveRoomJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId); + + }; + + class ForgetRoomJob : public BaseJob + { + public: + explicit ForgetRoomJob(const QString& roomId); + + /** Construct a URL out of baseUrl and usual parameters passed to + * ForgetRoomJob. This function can be used when + * a URL for ForgetRoomJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId); + + }; +} // namespace QMatrixClient diff --git a/lib/csapi/list_joined_rooms.cpp b/lib/csapi/list_joined_rooms.cpp new file mode 100644 index 00000000..82ec8849 --- /dev/null +++ b/lib/csapi/list_joined_rooms.cpp @@ -0,0 +1,50 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "list_joined_rooms.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class GetJoinedRoomsJob::Private +{ + public: + QStringList joinedRooms; +}; + +QUrl GetJoinedRoomsJob::makeRequestUrl(QUrl baseUrl) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/joined_rooms"); +} + +GetJoinedRoomsJob::GetJoinedRoomsJob() + : BaseJob(HttpVerb::Get, "GetJoinedRoomsJob", + basePath % "/joined_rooms") + , d(new Private) +{ +} + +GetJoinedRoomsJob::~GetJoinedRoomsJob() = default; + +const QStringList& GetJoinedRoomsJob::joinedRooms() const +{ + return d->joinedRooms; +} + +BaseJob::Status GetJoinedRoomsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("joined_rooms")) + return { JsonParseError, + "The key 'joined_rooms' not found in the response" }; + d->joinedRooms = fromJson(json.value("joined_rooms")); + return Success; +} + diff --git a/lib/csapi/list_joined_rooms.h b/lib/csapi/list_joined_rooms.h new file mode 100644 index 00000000..e590fa18 --- /dev/null +++ b/lib/csapi/list_joined_rooms.h @@ -0,0 +1,41 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class GetJoinedRoomsJob : public BaseJob + { + public: + explicit GetJoinedRoomsJob(); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetJoinedRoomsJob. This function can be used when + * a URL for GetJoinedRoomsJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl); + + ~GetJoinedRoomsJob() override; + + // Result properties + + const QStringList& joinedRooms() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/list_public_rooms.cpp b/lib/csapi/list_public_rooms.cpp new file mode 100644 index 00000000..b27bdd58 --- /dev/null +++ b/lib/csapi/list_public_rooms.cpp @@ -0,0 +1,268 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "list_public_rooms.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class GetRoomVisibilityOnDirectoryJob::Private +{ + public: + QString visibility; +}; + +QUrl GetRoomVisibilityOnDirectoryJob::makeRequestUrl(QUrl baseUrl, const QString& roomId) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/directory/list/room/" % roomId); +} + +GetRoomVisibilityOnDirectoryJob::GetRoomVisibilityOnDirectoryJob(const QString& roomId) + : BaseJob(HttpVerb::Get, "GetRoomVisibilityOnDirectoryJob", + basePath % "/directory/list/room/" % roomId, false) + , d(new Private) +{ +} + +GetRoomVisibilityOnDirectoryJob::~GetRoomVisibilityOnDirectoryJob() = default; + +const QString& GetRoomVisibilityOnDirectoryJob::visibility() const +{ + return d->visibility; +} + +BaseJob::Status GetRoomVisibilityOnDirectoryJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->visibility = fromJson(json.value("visibility")); + return Success; +} + +SetRoomVisibilityOnDirectoryJob::SetRoomVisibilityOnDirectoryJob(const QString& roomId, const QString& visibility) + : BaseJob(HttpVerb::Put, "SetRoomVisibilityOnDirectoryJob", + basePath % "/directory/list/room/" % roomId) +{ + QJsonObject _data; + if (!visibility.isEmpty()) + _data.insert("visibility", toJson(visibility)); + setRequestData(_data); +} + +namespace QMatrixClient +{ + // Converters + + template <> struct FromJson + { + GetPublicRoomsJob::PublicRoomsChunk operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + GetPublicRoomsJob::PublicRoomsChunk result; + result.aliases = + fromJson(o.value("aliases")); + result.canonicalAlias = + fromJson(o.value("canonical_alias")); + result.name = + fromJson(o.value("name")); + result.numJoinedMembers = + fromJson(o.value("num_joined_members")); + result.roomId = + fromJson(o.value("room_id")); + result.topic = + fromJson(o.value("topic")); + result.worldReadable = + fromJson(o.value("world_readable")); + result.guestCanJoin = + fromJson(o.value("guest_can_join")); + result.avatarUrl = + fromJson(o.value("avatar_url")); + + return result; + } + }; +} // namespace QMatrixClient + +class GetPublicRoomsJob::Private +{ + public: + QVector chunk; + QString nextBatch; + QString prevBatch; + qint64 totalRoomCountEstimate; +}; + +BaseJob::Query queryToGetPublicRooms(int limit, const QString& since, const QString& server) +{ + BaseJob::Query _q; + _q.addQueryItem("limit", QString("%1").arg(limit)); + if (!since.isEmpty()) + _q.addQueryItem("since", since); + if (!server.isEmpty()) + _q.addQueryItem("server", server); + return _q; +} + +QUrl GetPublicRoomsJob::makeRequestUrl(QUrl baseUrl, int limit, const QString& since, const QString& server) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/publicRooms", + queryToGetPublicRooms(limit, since, server)); +} + +GetPublicRoomsJob::GetPublicRoomsJob(int limit, const QString& since, const QString& server) + : BaseJob(HttpVerb::Get, "GetPublicRoomsJob", + basePath % "/publicRooms", + queryToGetPublicRooms(limit, since, server), + {}, false) + , d(new Private) +{ +} + +GetPublicRoomsJob::~GetPublicRoomsJob() = default; + +const QVector& GetPublicRoomsJob::chunk() const +{ + return d->chunk; +} + +const QString& GetPublicRoomsJob::nextBatch() const +{ + return d->nextBatch; +} + +const QString& GetPublicRoomsJob::prevBatch() const +{ + return d->prevBatch; +} + +qint64 GetPublicRoomsJob::totalRoomCountEstimate() const +{ + return d->totalRoomCountEstimate; +} + +BaseJob::Status GetPublicRoomsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("chunk")) + return { JsonParseError, + "The key 'chunk' not found in the response" }; + d->chunk = fromJson>(json.value("chunk")); + d->nextBatch = fromJson(json.value("next_batch")); + d->prevBatch = fromJson(json.value("prev_batch")); + d->totalRoomCountEstimate = fromJson(json.value("total_room_count_estimate")); + return Success; +} + +namespace QMatrixClient +{ + // Converters + + QJsonObject toJson(const QueryPublicRoomsJob::Filter& pod) + { + QJsonObject o; + o.insert("generic_search_term", toJson(pod.genericSearchTerm)); + + return o; + } + + template <> struct FromJson + { + QueryPublicRoomsJob::PublicRoomsChunk operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + QueryPublicRoomsJob::PublicRoomsChunk result; + result.aliases = + fromJson(o.value("aliases")); + result.canonicalAlias = + fromJson(o.value("canonical_alias")); + result.name = + fromJson(o.value("name")); + result.numJoinedMembers = + fromJson(o.value("num_joined_members")); + result.roomId = + fromJson(o.value("room_id")); + result.topic = + fromJson(o.value("topic")); + result.worldReadable = + fromJson(o.value("world_readable")); + result.guestCanJoin = + fromJson(o.value("guest_can_join")); + result.avatarUrl = + fromJson(o.value("avatar_url")); + + return result; + } + }; +} // namespace QMatrixClient + +class QueryPublicRoomsJob::Private +{ + public: + QVector chunk; + QString nextBatch; + QString prevBatch; + qint64 totalRoomCountEstimate; +}; + +BaseJob::Query queryToQueryPublicRooms(const QString& server) +{ + BaseJob::Query _q; + if (!server.isEmpty()) + _q.addQueryItem("server", server); + return _q; +} + +QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server, int limit, const QString& since, const Filter& filter) + : BaseJob(HttpVerb::Post, "QueryPublicRoomsJob", + basePath % "/publicRooms", + queryToQueryPublicRooms(server)) + , d(new Private) +{ + QJsonObject _data; + _data.insert("limit", toJson(limit)); + if (!since.isEmpty()) + _data.insert("since", toJson(since)); + _data.insert("filter", toJson(filter)); + setRequestData(_data); +} + +QueryPublicRoomsJob::~QueryPublicRoomsJob() = default; + +const QVector& QueryPublicRoomsJob::chunk() const +{ + return d->chunk; +} + +const QString& QueryPublicRoomsJob::nextBatch() const +{ + return d->nextBatch; +} + +const QString& QueryPublicRoomsJob::prevBatch() const +{ + return d->prevBatch; +} + +qint64 QueryPublicRoomsJob::totalRoomCountEstimate() const +{ + return d->totalRoomCountEstimate; +} + +BaseJob::Status QueryPublicRoomsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("chunk")) + return { JsonParseError, + "The key 'chunk' not found in the response" }; + d->chunk = fromJson>(json.value("chunk")); + d->nextBatch = fromJson(json.value("next_batch")); + d->prevBatch = fromJson(json.value("prev_batch")); + d->totalRoomCountEstimate = fromJson(json.value("total_room_count_estimate")); + return Success; +} + diff --git a/lib/csapi/list_public_rooms.h b/lib/csapi/list_public_rooms.h new file mode 100644 index 00000000..76d78577 --- /dev/null +++ b/lib/csapi/list_public_rooms.h @@ -0,0 +1,138 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class GetRoomVisibilityOnDirectoryJob : public BaseJob + { + public: + explicit GetRoomVisibilityOnDirectoryJob(const QString& roomId); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetRoomVisibilityOnDirectoryJob. This function can be used when + * a URL for GetRoomVisibilityOnDirectoryJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId); + + ~GetRoomVisibilityOnDirectoryJob() override; + + // Result properties + + const QString& visibility() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class SetRoomVisibilityOnDirectoryJob : public BaseJob + { + public: + explicit SetRoomVisibilityOnDirectoryJob(const QString& roomId, const QString& visibility = {}); + }; + + class GetPublicRoomsJob : public BaseJob + { + public: + // Inner data structures + + struct PublicRoomsChunk + { + QStringList aliases; + QString canonicalAlias; + QString name; + qint64 numJoinedMembers; + QString roomId; + QString topic; + bool worldReadable; + bool guestCanJoin; + QString avatarUrl; + }; + + // Construction/destruction + + explicit GetPublicRoomsJob(int limit = {}, const QString& since = {}, const QString& server = {}); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetPublicRoomsJob. This function can be used when + * a URL for GetPublicRoomsJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, int limit = {}, const QString& since = {}, const QString& server = {}); + + ~GetPublicRoomsJob() override; + + // Result properties + + const QVector& chunk() const; + const QString& nextBatch() const; + const QString& prevBatch() const; + qint64 totalRoomCountEstimate() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class QueryPublicRoomsJob : public BaseJob + { + public: + // Inner data structures + + struct Filter + { + QString genericSearchTerm; + }; + + struct PublicRoomsChunk + { + QStringList aliases; + QString canonicalAlias; + QString name; + qint64 numJoinedMembers; + QString roomId; + QString topic; + bool worldReadable; + bool guestCanJoin; + QString avatarUrl; + }; + + // Construction/destruction + + explicit QueryPublicRoomsJob(const QString& server = {}, int limit = {}, const QString& since = {}, const Filter& filter = {}); + ~QueryPublicRoomsJob() override; + + // Result properties + + const QVector& chunk() const; + const QString& nextBatch() const; + const QString& prevBatch() const; + qint64 totalRoomCountEstimate() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/login.cpp b/lib/csapi/login.cpp new file mode 100644 index 00000000..a4dab428 --- /dev/null +++ b/lib/csapi/login.cpp @@ -0,0 +1,79 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "login.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class LoginJob::Private +{ + public: + QString userId; + QString accessToken; + QString homeServer; + QString deviceId; +}; + +LoginJob::LoginJob(const QString& type, const QString& user, const QString& medium, const QString& address, const QString& password, const QString& token, const QString& deviceId, const QString& initialDeviceDisplayName) + : BaseJob(HttpVerb::Post, "LoginJob", + basePath % "/login", false) + , d(new Private) +{ + QJsonObject _data; + _data.insert("type", toJson(type)); + if (!user.isEmpty()) + _data.insert("user", toJson(user)); + if (!medium.isEmpty()) + _data.insert("medium", toJson(medium)); + if (!address.isEmpty()) + _data.insert("address", toJson(address)); + if (!password.isEmpty()) + _data.insert("password", toJson(password)); + if (!token.isEmpty()) + _data.insert("token", toJson(token)); + if (!deviceId.isEmpty()) + _data.insert("device_id", toJson(deviceId)); + if (!initialDeviceDisplayName.isEmpty()) + _data.insert("initial_device_display_name", toJson(initialDeviceDisplayName)); + setRequestData(_data); +} + +LoginJob::~LoginJob() = default; + +const QString& LoginJob::userId() const +{ + return d->userId; +} + +const QString& LoginJob::accessToken() const +{ + return d->accessToken; +} + +const QString& LoginJob::homeServer() const +{ + return d->homeServer; +} + +const QString& LoginJob::deviceId() const +{ + return d->deviceId; +} + +BaseJob::Status LoginJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->userId = fromJson(json.value("user_id")); + d->accessToken = fromJson(json.value("access_token")); + d->homeServer = fromJson(json.value("home_server")); + d->deviceId = fromJson(json.value("device_id")); + return Success; +} + diff --git a/lib/csapi/login.h b/lib/csapi/login.h new file mode 100644 index 00000000..2adbdb4d --- /dev/null +++ b/lib/csapi/login.h @@ -0,0 +1,35 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + + + +namespace QMatrixClient +{ + // Operations + + class LoginJob : public BaseJob + { + public: + explicit LoginJob(const QString& type, const QString& user = {}, const QString& medium = {}, const QString& address = {}, const QString& password = {}, const QString& token = {}, const QString& deviceId = {}, const QString& initialDeviceDisplayName = {}); + ~LoginJob() override; + + // Result properties + + const QString& userId() const; + const QString& accessToken() const; + const QString& homeServer() const; + const QString& deviceId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/logout.cpp b/lib/csapi/logout.cpp new file mode 100644 index 00000000..b943dcd3 --- /dev/null +++ b/lib/csapi/logout.cpp @@ -0,0 +1,26 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "logout.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +QUrl LogoutJob::makeRequestUrl(QUrl baseUrl) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/logout"); +} + +LogoutJob::LogoutJob() + : BaseJob(HttpVerb::Post, "LogoutJob", + basePath % "/logout") +{ +} + diff --git a/lib/csapi/logout.h b/lib/csapi/logout.h new file mode 100644 index 00000000..7993335f --- /dev/null +++ b/lib/csapi/logout.h @@ -0,0 +1,28 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + + + +namespace QMatrixClient +{ + // Operations + + class LogoutJob : public BaseJob + { + public: + explicit LogoutJob(); + + /** Construct a URL out of baseUrl and usual parameters passed to + * LogoutJob. This function can be used when + * a URL for LogoutJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl); + + }; +} // namespace QMatrixClient diff --git a/lib/csapi/message_pagination.cpp b/lib/csapi/message_pagination.cpp new file mode 100644 index 00000000..f89ccd03 --- /dev/null +++ b/lib/csapi/message_pagination.cpp @@ -0,0 +1,76 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "message_pagination.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class GetRoomEventsJob::Private +{ + public: + QString begin; + QString end; + RoomEvents chunk; +}; + +BaseJob::Query queryToGetRoomEvents(const QString& from, const QString& to, const QString& dir, int limit, const QString& filter) +{ + BaseJob::Query _q; + _q.addQueryItem("from", from); + if (!to.isEmpty()) + _q.addQueryItem("to", to); + _q.addQueryItem("dir", dir); + _q.addQueryItem("limit", QString("%1").arg(limit)); + if (!filter.isEmpty()) + _q.addQueryItem("filter", filter); + return _q; +} + +QUrl GetRoomEventsJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& from, const QString& dir, const QString& to, int limit, const QString& filter) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/rooms/" % roomId % "/messages", + queryToGetRoomEvents(from, to, dir, limit, filter)); +} + +GetRoomEventsJob::GetRoomEventsJob(const QString& roomId, const QString& from, const QString& dir, const QString& to, int limit, const QString& filter) + : BaseJob(HttpVerb::Get, "GetRoomEventsJob", + basePath % "/rooms/" % roomId % "/messages", + queryToGetRoomEvents(from, to, dir, limit, filter)) + , d(new Private) +{ +} + +GetRoomEventsJob::~GetRoomEventsJob() = default; + +const QString& GetRoomEventsJob::begin() const +{ + return d->begin; +} + +const QString& GetRoomEventsJob::end() const +{ + return d->end; +} + +RoomEvents&& GetRoomEventsJob::chunk() +{ + return std::move(d->chunk); +} + +BaseJob::Status GetRoomEventsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->begin = fromJson(json.value("start")); + d->end = fromJson(json.value("end")); + d->chunk = fromJson(json.value("chunk")); + return Success; +} + diff --git a/lib/csapi/message_pagination.h b/lib/csapi/message_pagination.h new file mode 100644 index 00000000..61e7323f --- /dev/null +++ b/lib/csapi/message_pagination.h @@ -0,0 +1,43 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include "events/event.h" + + +namespace QMatrixClient +{ + // Operations + + class GetRoomEventsJob : public BaseJob + { + public: + explicit GetRoomEventsJob(const QString& roomId, const QString& from, const QString& dir, const QString& to = {}, int limit = {}, const QString& filter = {}); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetRoomEventsJob. This function can be used when + * a URL for GetRoomEventsJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& from, const QString& dir, const QString& to = {}, int limit = {}, const QString& filter = {}); + + ~GetRoomEventsJob() override; + + // Result properties + + const QString& begin() const; + const QString& end() const; + RoomEvents&& chunk(); + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/notifications.cpp b/lib/csapi/notifications.cpp new file mode 100644 index 00000000..04ad0175 --- /dev/null +++ b/lib/csapi/notifications.cpp @@ -0,0 +1,96 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "notifications.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +namespace QMatrixClient +{ + // Converters + + template <> struct FromJson + { + GetNotificationsJob::Notification operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + GetNotificationsJob::Notification result; + result.actions = + fromJson>(o.value("actions")); + result.event = + fromJson(o.value("event")); + result.profileTag = + fromJson(o.value("profile_tag")); + result.read = + fromJson(o.value("read")); + result.roomId = + fromJson(o.value("room_id")); + result.ts = + fromJson(o.value("ts")); + + return result; + } + }; +} // namespace QMatrixClient + +class GetNotificationsJob::Private +{ + public: + QString nextToken; + std::vector notifications; +}; + +BaseJob::Query queryToGetNotifications(const QString& from, int limit, const QString& only) +{ + BaseJob::Query _q; + if (!from.isEmpty()) + _q.addQueryItem("from", from); + _q.addQueryItem("limit", QString("%1").arg(limit)); + if (!only.isEmpty()) + _q.addQueryItem("only", only); + return _q; +} + +QUrl GetNotificationsJob::makeRequestUrl(QUrl baseUrl, const QString& from, int limit, const QString& only) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/notifications", + queryToGetNotifications(from, limit, only)); +} + +GetNotificationsJob::GetNotificationsJob(const QString& from, int limit, const QString& only) + : BaseJob(HttpVerb::Get, "GetNotificationsJob", + basePath % "/notifications", + queryToGetNotifications(from, limit, only)) + , d(new Private) +{ +} + +GetNotificationsJob::~GetNotificationsJob() = default; + +const QString& GetNotificationsJob::nextToken() const +{ + return d->nextToken; +} + +std::vector&& GetNotificationsJob::notifications() +{ + return std::move(d->notifications); +} + +BaseJob::Status GetNotificationsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->nextToken = fromJson(json.value("next_token")); + if (!json.contains("notifications")) + return { JsonParseError, + "The key 'notifications' not found in the response" }; + d->notifications = fromJson>(json.value("notifications")); + return Success; +} + diff --git a/lib/csapi/notifications.h b/lib/csapi/notifications.h new file mode 100644 index 00000000..61da518b --- /dev/null +++ b/lib/csapi/notifications.h @@ -0,0 +1,59 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include "events/event.h" +#include +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class GetNotificationsJob : public BaseJob + { + public: + // Inner data structures + + struct Notification + { + QVector actions; + EventPtr event; + QString profileTag; + bool read; + QString roomId; + qint64 ts; + }; + + // Construction/destruction + + explicit GetNotificationsJob(const QString& from = {}, int limit = {}, const QString& only = {}); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetNotificationsJob. This function can be used when + * a URL for GetNotificationsJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& from = {}, int limit = {}, const QString& only = {}); + + ~GetNotificationsJob() override; + + // Result properties + + const QString& nextToken() const; + std::vector&& notifications(); + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/preamble.mustache b/lib/csapi/preamble.mustache new file mode 100644 index 00000000..3ba87d61 --- /dev/null +++ b/lib/csapi/preamble.mustache @@ -0,0 +1,3 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ diff --git a/lib/csapi/profile.cpp b/lib/csapi/profile.cpp new file mode 100644 index 00000000..d8ddbc14 --- /dev/null +++ b/lib/csapi/profile.cpp @@ -0,0 +1,140 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "profile.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +SetDisplayNameJob::SetDisplayNameJob(const QString& userId, const QString& displayname) + : BaseJob(HttpVerb::Put, "SetDisplayNameJob", + basePath % "/profile/" % userId % "/displayname") +{ + QJsonObject _data; + if (!displayname.isEmpty()) + _data.insert("displayname", toJson(displayname)); + setRequestData(_data); +} + +class GetDisplayNameJob::Private +{ + public: + QString displayname; +}; + +QUrl GetDisplayNameJob::makeRequestUrl(QUrl baseUrl, const QString& userId) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/profile/" % userId % "/displayname"); +} + +GetDisplayNameJob::GetDisplayNameJob(const QString& userId) + : BaseJob(HttpVerb::Get, "GetDisplayNameJob", + basePath % "/profile/" % userId % "/displayname", false) + , d(new Private) +{ +} + +GetDisplayNameJob::~GetDisplayNameJob() = default; + +const QString& GetDisplayNameJob::displayname() const +{ + return d->displayname; +} + +BaseJob::Status GetDisplayNameJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->displayname = fromJson(json.value("displayname")); + return Success; +} + +SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QString& avatarUrl) + : BaseJob(HttpVerb::Put, "SetAvatarUrlJob", + basePath % "/profile/" % userId % "/avatar_url") +{ + QJsonObject _data; + if (!avatarUrl.isEmpty()) + _data.insert("avatar_url", toJson(avatarUrl)); + setRequestData(_data); +} + +class GetAvatarUrlJob::Private +{ + public: + QString avatarUrl; +}; + +QUrl GetAvatarUrlJob::makeRequestUrl(QUrl baseUrl, const QString& userId) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/profile/" % userId % "/avatar_url"); +} + +GetAvatarUrlJob::GetAvatarUrlJob(const QString& userId) + : BaseJob(HttpVerb::Get, "GetAvatarUrlJob", + basePath % "/profile/" % userId % "/avatar_url", false) + , d(new Private) +{ +} + +GetAvatarUrlJob::~GetAvatarUrlJob() = default; + +const QString& GetAvatarUrlJob::avatarUrl() const +{ + return d->avatarUrl; +} + +BaseJob::Status GetAvatarUrlJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->avatarUrl = fromJson(json.value("avatar_url")); + return Success; +} + +class GetUserProfileJob::Private +{ + public: + QString avatarUrl; + QString displayname; +}; + +QUrl GetUserProfileJob::makeRequestUrl(QUrl baseUrl, const QString& userId) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/profile/" % userId); +} + +GetUserProfileJob::GetUserProfileJob(const QString& userId) + : BaseJob(HttpVerb::Get, "GetUserProfileJob", + basePath % "/profile/" % userId, false) + , d(new Private) +{ +} + +GetUserProfileJob::~GetUserProfileJob() = default; + +const QString& GetUserProfileJob::avatarUrl() const +{ + return d->avatarUrl; +} + +const QString& GetUserProfileJob::displayname() const +{ + return d->displayname; +} + +BaseJob::Status GetUserProfileJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->avatarUrl = fromJson(json.value("avatar_url")); + d->displayname = fromJson(json.value("displayname")); + return Success; +} + diff --git a/lib/csapi/profile.h b/lib/csapi/profile.h new file mode 100644 index 00000000..604291b4 --- /dev/null +++ b/lib/csapi/profile.h @@ -0,0 +1,105 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + + + +namespace QMatrixClient +{ + // Operations + + class SetDisplayNameJob : public BaseJob + { + public: + explicit SetDisplayNameJob(const QString& userId, const QString& displayname = {}); + }; + + class GetDisplayNameJob : public BaseJob + { + public: + explicit GetDisplayNameJob(const QString& userId); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetDisplayNameJob. This function can be used when + * a URL for GetDisplayNameJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId); + + ~GetDisplayNameJob() override; + + // Result properties + + const QString& displayname() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class SetAvatarUrlJob : public BaseJob + { + public: + explicit SetAvatarUrlJob(const QString& userId, const QString& avatarUrl = {}); + }; + + class GetAvatarUrlJob : public BaseJob + { + public: + explicit GetAvatarUrlJob(const QString& userId); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetAvatarUrlJob. This function can be used when + * a URL for GetAvatarUrlJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId); + + ~GetAvatarUrlJob() override; + + // Result properties + + const QString& avatarUrl() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class GetUserProfileJob : public BaseJob + { + public: + explicit GetUserProfileJob(const QString& userId); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetUserProfileJob. This function can be used when + * a URL for GetUserProfileJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId); + + ~GetUserProfileJob() override; + + // Result properties + + const QString& avatarUrl() const; + const QString& displayname() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/pusher.cpp b/lib/csapi/pusher.cpp new file mode 100644 index 00000000..dea7cf8b --- /dev/null +++ b/lib/csapi/pusher.cpp @@ -0,0 +1,121 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "pusher.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +namespace QMatrixClient +{ + // Converters + + template <> struct FromJson + { + GetPushersJob::PusherData operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + GetPushersJob::PusherData result; + result.url = + fromJson(o.value("url")); + + return result; + } + }; + + template <> struct FromJson + { + GetPushersJob::Pusher operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + GetPushersJob::Pusher result; + result.pushkey = + fromJson(o.value("pushkey")); + result.kind = + fromJson(o.value("kind")); + result.appId = + fromJson(o.value("app_id")); + result.appDisplayName = + fromJson(o.value("app_display_name")); + result.deviceDisplayName = + fromJson(o.value("device_display_name")); + result.profileTag = + fromJson(o.value("profile_tag")); + result.lang = + fromJson(o.value("lang")); + result.data = + fromJson(o.value("data")); + + return result; + } + }; +} // namespace QMatrixClient + +class GetPushersJob::Private +{ + public: + QVector pushers; +}; + +QUrl GetPushersJob::makeRequestUrl(QUrl baseUrl) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/pushers"); +} + +GetPushersJob::GetPushersJob() + : BaseJob(HttpVerb::Get, "GetPushersJob", + basePath % "/pushers") + , d(new Private) +{ +} + +GetPushersJob::~GetPushersJob() = default; + +const QVector& GetPushersJob::pushers() const +{ + return d->pushers; +} + +BaseJob::Status GetPushersJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->pushers = fromJson>(json.value("pushers")); + return Success; +} + +namespace QMatrixClient +{ + // Converters + + QJsonObject toJson(const PostPusherJob::PusherData& pod) + { + QJsonObject o; + o.insert("url", toJson(pod.url)); + + return o; + } +} // namespace QMatrixClient + +PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag, bool append) + : BaseJob(HttpVerb::Post, "PostPusherJob", + basePath % "/pushers/set") +{ + QJsonObject _data; + _data.insert("pushkey", toJson(pushkey)); + _data.insert("kind", toJson(kind)); + _data.insert("app_id", toJson(appId)); + _data.insert("app_display_name", toJson(appDisplayName)); + _data.insert("device_display_name", toJson(deviceDisplayName)); + if (!profileTag.isEmpty()) + _data.insert("profile_tag", toJson(profileTag)); + _data.insert("lang", toJson(lang)); + _data.insert("data", toJson(data)); + _data.insert("append", toJson(append)); + setRequestData(_data); +} + diff --git a/lib/csapi/pusher.h b/lib/csapi/pusher.h new file mode 100644 index 00000000..97e3ba38 --- /dev/null +++ b/lib/csapi/pusher.h @@ -0,0 +1,78 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class GetPushersJob : public BaseJob + { + public: + // Inner data structures + + struct PusherData + { + QString url; + }; + + struct Pusher + { + QString pushkey; + QString kind; + QString appId; + QString appDisplayName; + QString deviceDisplayName; + QString profileTag; + QString lang; + PusherData data; + }; + + // Construction/destruction + + explicit GetPushersJob(); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetPushersJob. This function can be used when + * a URL for GetPushersJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl); + + ~GetPushersJob() override; + + // Result properties + + const QVector& pushers() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class PostPusherJob : public BaseJob + { + public: + // Inner data structures + + struct PusherData + { + QString url; + }; + + // Construction/destruction + + explicit PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag = {}, bool append = {}); + }; +} // namespace QMatrixClient diff --git a/lib/csapi/receipts.cpp b/lib/csapi/receipts.cpp new file mode 100644 index 00000000..945e8673 --- /dev/null +++ b/lib/csapi/receipts.cpp @@ -0,0 +1,21 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "receipts.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +PostReceiptJob::PostReceiptJob(const QString& roomId, const QString& receiptType, const QString& eventId, const QJsonObject& receipt) + : BaseJob(HttpVerb::Post, "PostReceiptJob", + basePath % "/rooms/" % roomId % "/receipt/" % receiptType % "/" % eventId) +{ + setRequestData(Data(toJson(receipt))); +} + diff --git a/lib/csapi/receipts.h b/lib/csapi/receipts.h new file mode 100644 index 00000000..b109282e --- /dev/null +++ b/lib/csapi/receipts.h @@ -0,0 +1,21 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class PostReceiptJob : public BaseJob + { + public: + explicit PostReceiptJob(const QString& roomId, const QString& receiptType, const QString& eventId, const QJsonObject& receipt = {}); + }; +} // namespace QMatrixClient diff --git a/lib/csapi/redaction.cpp b/lib/csapi/redaction.cpp new file mode 100644 index 00000000..0da35dfc --- /dev/null +++ b/lib/csapi/redaction.cpp @@ -0,0 +1,45 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "redaction.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class RedactEventJob::Private +{ + public: + QString eventId; +}; + +RedactEventJob::RedactEventJob(const QString& roomId, const QString& eventId, const QString& txnId, const QString& reason) + : BaseJob(HttpVerb::Put, "RedactEventJob", + basePath % "/rooms/" % roomId % "/redact/" % eventId % "/" % txnId) + , d(new Private) +{ + QJsonObject _data; + if (!reason.isEmpty()) + _data.insert("reason", toJson(reason)); + setRequestData(_data); +} + +RedactEventJob::~RedactEventJob() = default; + +const QString& RedactEventJob::eventId() const +{ + return d->eventId; +} + +BaseJob::Status RedactEventJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->eventId = fromJson(json.value("event_id")); + return Success; +} + diff --git a/lib/csapi/redaction.h b/lib/csapi/redaction.h new file mode 100644 index 00000000..56645ee5 --- /dev/null +++ b/lib/csapi/redaction.h @@ -0,0 +1,32 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + + + +namespace QMatrixClient +{ + // Operations + + class RedactEventJob : public BaseJob + { + public: + explicit RedactEventJob(const QString& roomId, const QString& eventId, const QString& txnId, const QString& reason = {}); + ~RedactEventJob() override; + + // Result properties + + const QString& eventId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/room_send.cpp b/lib/csapi/room_send.cpp new file mode 100644 index 00000000..9637a205 --- /dev/null +++ b/lib/csapi/room_send.cpp @@ -0,0 +1,42 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "room_send.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class SendMessageJob::Private +{ + public: + QString eventId; +}; + +SendMessageJob::SendMessageJob(const QString& roomId, const QString& eventType, const QString& txnId, const QJsonObject& body) + : BaseJob(HttpVerb::Put, "SendMessageJob", + basePath % "/rooms/" % roomId % "/send/" % eventType % "/" % txnId) + , d(new Private) +{ + setRequestData(Data(toJson(body))); +} + +SendMessageJob::~SendMessageJob() = default; + +const QString& SendMessageJob::eventId() const +{ + return d->eventId; +} + +BaseJob::Status SendMessageJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->eventId = fromJson(json.value("event_id")); + return Success; +} + diff --git a/lib/csapi/room_send.h b/lib/csapi/room_send.h new file mode 100644 index 00000000..3bfb48c4 --- /dev/null +++ b/lib/csapi/room_send.h @@ -0,0 +1,33 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class SendMessageJob : public BaseJob + { + public: + explicit SendMessageJob(const QString& roomId, const QString& eventType, const QString& txnId, const QJsonObject& body = {}); + ~SendMessageJob() override; + + // Result properties + + const QString& eventId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/room_state.cpp b/lib/csapi/room_state.cpp new file mode 100644 index 00000000..39f36afb --- /dev/null +++ b/lib/csapi/room_state.cpp @@ -0,0 +1,70 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "room_state.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class SetRoomStateWithKeyJob::Private +{ + public: + QString eventId; +}; + +SetRoomStateWithKeyJob::SetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey, const QJsonObject& body) + : BaseJob(HttpVerb::Put, "SetRoomStateWithKeyJob", + basePath % "/rooms/" % roomId % "/state/" % eventType % "/" % stateKey) + , d(new Private) +{ + setRequestData(Data(toJson(body))); +} + +SetRoomStateWithKeyJob::~SetRoomStateWithKeyJob() = default; + +const QString& SetRoomStateWithKeyJob::eventId() const +{ + return d->eventId; +} + +BaseJob::Status SetRoomStateWithKeyJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->eventId = fromJson(json.value("event_id")); + return Success; +} + +class SetRoomStateJob::Private +{ + public: + QString eventId; +}; + +SetRoomStateJob::SetRoomStateJob(const QString& roomId, const QString& eventType, const QJsonObject& body) + : BaseJob(HttpVerb::Put, "SetRoomStateJob", + basePath % "/rooms/" % roomId % "/state/" % eventType) + , d(new Private) +{ + setRequestData(Data(toJson(body))); +} + +SetRoomStateJob::~SetRoomStateJob() = default; + +const QString& SetRoomStateJob::eventId() const +{ + return d->eventId; +} + +BaseJob::Status SetRoomStateJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->eventId = fromJson(json.value("event_id")); + return Success; +} + diff --git a/lib/csapi/room_state.h b/lib/csapi/room_state.h new file mode 100644 index 00000000..5c42b868 --- /dev/null +++ b/lib/csapi/room_state.h @@ -0,0 +1,51 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class SetRoomStateWithKeyJob : public BaseJob + { + public: + explicit SetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey, const QJsonObject& body = {}); + ~SetRoomStateWithKeyJob() override; + + // Result properties + + const QString& eventId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class SetRoomStateJob : public BaseJob + { + public: + explicit SetRoomStateJob(const QString& roomId, const QString& eventType, const QJsonObject& body = {}); + ~SetRoomStateJob() override; + + // Result properties + + const QString& eventId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/tags.cpp b/lib/csapi/tags.cpp new file mode 100644 index 00000000..9cd78aec --- /dev/null +++ b/lib/csapi/tags.cpp @@ -0,0 +1,66 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "tags.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class GetRoomTagsJob::Private +{ + public: + QJsonObject tags; +}; + +QUrl GetRoomTagsJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/user/" % userId % "/rooms/" % roomId % "/tags"); +} + +GetRoomTagsJob::GetRoomTagsJob(const QString& userId, const QString& roomId) + : BaseJob(HttpVerb::Get, "GetRoomTagsJob", + basePath % "/user/" % userId % "/rooms/" % roomId % "/tags") + , d(new Private) +{ +} + +GetRoomTagsJob::~GetRoomTagsJob() = default; + +const QJsonObject& GetRoomTagsJob::tags() const +{ + return d->tags; +} + +BaseJob::Status GetRoomTagsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->tags = fromJson(json.value("tags")); + return Success; +} + +SetRoomTagJob::SetRoomTagJob(const QString& userId, const QString& roomId, const QString& tag, const QJsonObject& body) + : BaseJob(HttpVerb::Put, "SetRoomTagJob", + basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag) +{ + setRequestData(Data(toJson(body))); +} + +QUrl DeleteRoomTagJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& tag) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag); +} + +DeleteRoomTagJob::DeleteRoomTagJob(const QString& userId, const QString& roomId, const QString& tag) + : BaseJob(HttpVerb::Delete, "DeleteRoomTagJob", + basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag) +{ +} + diff --git a/lib/csapi/tags.h b/lib/csapi/tags.h new file mode 100644 index 00000000..e437cee8 --- /dev/null +++ b/lib/csapi/tags.h @@ -0,0 +1,61 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class GetRoomTagsJob : public BaseJob + { + public: + explicit GetRoomTagsJob(const QString& userId, const QString& roomId); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetRoomTagsJob. This function can be used when + * a URL for GetRoomTagsJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId); + + ~GetRoomTagsJob() override; + + // Result properties + + const QJsonObject& tags() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; + + class SetRoomTagJob : public BaseJob + { + public: + explicit SetRoomTagJob(const QString& userId, const QString& roomId, const QString& tag, const QJsonObject& body = {}); + }; + + class DeleteRoomTagJob : public BaseJob + { + public: + explicit DeleteRoomTagJob(const QString& userId, const QString& roomId, const QString& tag); + + /** Construct a URL out of baseUrl and usual parameters passed to + * DeleteRoomTagJob. This function can be used when + * a URL for DeleteRoomTagJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& tag); + + }; +} // namespace QMatrixClient diff --git a/lib/csapi/third_party_membership.cpp b/lib/csapi/third_party_membership.cpp new file mode 100644 index 00000000..b637d481 --- /dev/null +++ b/lib/csapi/third_party_membership.cpp @@ -0,0 +1,25 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "third_party_membership.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +InviteBy3PIDJob::InviteBy3PIDJob(const QString& roomId, const QString& idServer, const QString& medium, const QString& address) + : BaseJob(HttpVerb::Post, "InviteBy3PIDJob", + basePath % "/rooms/" % roomId % "/invite") +{ + QJsonObject _data; + _data.insert("id_server", toJson(idServer)); + _data.insert("medium", toJson(medium)); + _data.insert("address", toJson(address)); + setRequestData(_data); +} + diff --git a/lib/csapi/third_party_membership.h b/lib/csapi/third_party_membership.h new file mode 100644 index 00000000..9cf6e6f6 --- /dev/null +++ b/lib/csapi/third_party_membership.h @@ -0,0 +1,20 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + + + +namespace QMatrixClient +{ + // Operations + + class InviteBy3PIDJob : public BaseJob + { + public: + explicit InviteBy3PIDJob(const QString& roomId, const QString& idServer, const QString& medium, const QString& address); + }; +} // namespace QMatrixClient diff --git a/lib/csapi/to_device.cpp b/lib/csapi/to_device.cpp new file mode 100644 index 00000000..e893fa44 --- /dev/null +++ b/lib/csapi/to_device.cpp @@ -0,0 +1,23 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "to_device.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +SendToDeviceJob::SendToDeviceJob(const QString& eventType, const QString& txnId, const QHash>& messages) + : BaseJob(HttpVerb::Put, "SendToDeviceJob", + basePath % "/sendToDevice/" % eventType % "/" % txnId) +{ + QJsonObject _data; + _data.insert("messages", toJson(messages)); + setRequestData(_data); +} + diff --git a/lib/csapi/to_device.h b/lib/csapi/to_device.h new file mode 100644 index 00000000..7743b883 --- /dev/null +++ b/lib/csapi/to_device.h @@ -0,0 +1,22 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include +#include + + +namespace QMatrixClient +{ + // Operations + + class SendToDeviceJob : public BaseJob + { + public: + explicit SendToDeviceJob(const QString& eventType, const QString& txnId, const QHash>& messages = {}); + }; +} // namespace QMatrixClient diff --git a/lib/csapi/typing.cpp b/lib/csapi/typing.cpp new file mode 100644 index 00000000..fa700290 --- /dev/null +++ b/lib/csapi/typing.cpp @@ -0,0 +1,24 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "typing.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +SetTypingJob::SetTypingJob(const QString& userId, const QString& roomId, bool typing, int timeout) + : BaseJob(HttpVerb::Put, "SetTypingJob", + basePath % "/rooms/" % roomId % "/typing/" % userId) +{ + QJsonObject _data; + _data.insert("typing", toJson(typing)); + _data.insert("timeout", toJson(timeout)); + setRequestData(_data); +} + diff --git a/lib/csapi/typing.h b/lib/csapi/typing.h new file mode 100644 index 00000000..0506c77b --- /dev/null +++ b/lib/csapi/typing.h @@ -0,0 +1,20 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + + + +namespace QMatrixClient +{ + // Operations + + class SetTypingJob : public BaseJob + { + public: + explicit SetTypingJob(const QString& userId, const QString& roomId, bool typing, int timeout = {}); + }; +} // namespace QMatrixClient diff --git a/lib/csapi/users.cpp b/lib/csapi/users.cpp new file mode 100644 index 00000000..fd2944e4 --- /dev/null +++ b/lib/csapi/users.cpp @@ -0,0 +1,78 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "users.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +namespace QMatrixClient +{ + // Converters + + template <> struct FromJson + { + SearchUserDirectoryJob::User operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + SearchUserDirectoryJob::User result; + result.userId = + fromJson(o.value("user_id")); + result.displayName = + fromJson(o.value("display_name")); + result.avatarUrl = + fromJson(o.value("avatar_url")); + + return result; + } + }; +} // namespace QMatrixClient + +class SearchUserDirectoryJob::Private +{ + public: + QVector results; + bool limited; +}; + +SearchUserDirectoryJob::SearchUserDirectoryJob(const QString& searchTerm, int limit) + : BaseJob(HttpVerb::Post, "SearchUserDirectoryJob", + basePath % "/user_directory/search") + , d(new Private) +{ + QJsonObject _data; + _data.insert("search_term", toJson(searchTerm)); + _data.insert("limit", toJson(limit)); + setRequestData(_data); +} + +SearchUserDirectoryJob::~SearchUserDirectoryJob() = default; + +const QVector& SearchUserDirectoryJob::results() const +{ + return d->results; +} + +bool SearchUserDirectoryJob::limited() const +{ + return d->limited; +} + +BaseJob::Status SearchUserDirectoryJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("results")) + return { JsonParseError, + "The key 'results' not found in the response" }; + d->results = fromJson>(json.value("results")); + if (!json.contains("limited")) + return { JsonParseError, + "The key 'limited' not found in the response" }; + d->limited = fromJson(json.value("limited")); + return Success; +} + diff --git a/lib/csapi/users.h b/lib/csapi/users.h new file mode 100644 index 00000000..85ebd47c --- /dev/null +++ b/lib/csapi/users.h @@ -0,0 +1,46 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + +#include "converters.h" + +namespace QMatrixClient +{ + // Operations + + class SearchUserDirectoryJob : public BaseJob + { + public: + // Inner data structures + + struct User + { + QString userId; + QString displayName; + QString avatarUrl; + }; + + // Construction/destruction + + explicit SearchUserDirectoryJob(const QString& searchTerm, int limit = {}); + ~SearchUserDirectoryJob() override; + + // Result properties + + const QVector& results() const; + bool limited() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/versions.cpp b/lib/csapi/versions.cpp new file mode 100644 index 00000000..7b55b94f --- /dev/null +++ b/lib/csapi/versions.cpp @@ -0,0 +1,47 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "versions.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client"); + +class GetVersionsJob::Private +{ + public: + QStringList versions; +}; + +QUrl GetVersionsJob::makeRequestUrl(QUrl baseUrl) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/versions"); +} + +GetVersionsJob::GetVersionsJob() + : BaseJob(HttpVerb::Get, "GetVersionsJob", + basePath % "/versions", false) + , d(new Private) +{ +} + +GetVersionsJob::~GetVersionsJob() = default; + +const QStringList& GetVersionsJob::versions() const +{ + return d->versions; +} + +BaseJob::Status GetVersionsJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + d->versions = fromJson(json.value("versions")); + return Success; +} + diff --git a/lib/csapi/versions.h b/lib/csapi/versions.h new file mode 100644 index 00000000..c386f0af --- /dev/null +++ b/lib/csapi/versions.h @@ -0,0 +1,41 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + +#include + + +namespace QMatrixClient +{ + // Operations + + class GetVersionsJob : public BaseJob + { + public: + explicit GetVersionsJob(); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetVersionsJob. This function can be used when + * a URL for GetVersionsJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl); + + ~GetVersionsJob() override; + + // Result properties + + const QStringList& versions() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/whoami.cpp b/lib/csapi/whoami.cpp new file mode 100644 index 00000000..4c231b5f --- /dev/null +++ b/lib/csapi/whoami.cpp @@ -0,0 +1,50 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#include "whoami.h" + +#include "converters.h" + +#include + +using namespace QMatrixClient; + +static const auto basePath = QStringLiteral("/_matrix/client/r0"); + +class GetTokenOwnerJob::Private +{ + public: + QString userId; +}; + +QUrl GetTokenOwnerJob::makeRequestUrl(QUrl baseUrl) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath % "/account/whoami"); +} + +GetTokenOwnerJob::GetTokenOwnerJob() + : BaseJob(HttpVerb::Get, "GetTokenOwnerJob", + basePath % "/account/whoami") + , d(new Private) +{ +} + +GetTokenOwnerJob::~GetTokenOwnerJob() = default; + +const QString& GetTokenOwnerJob::userId() const +{ + return d->userId; +} + +BaseJob::Status GetTokenOwnerJob::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + if (!json.contains("user_id")) + return { JsonParseError, + "The key 'user_id' not found in the response" }; + d->userId = fromJson(json.value("user_id")); + return Success; +} + diff --git a/lib/csapi/whoami.h b/lib/csapi/whoami.h new file mode 100644 index 00000000..08fcb5a3 --- /dev/null +++ b/lib/csapi/whoami.h @@ -0,0 +1,40 @@ +/****************************************************************************** + * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN + */ + +#pragma once + +#include "jobs/basejob.h" + + + +namespace QMatrixClient +{ + // Operations + + class GetTokenOwnerJob : public BaseJob + { + public: + explicit GetTokenOwnerJob(); + + /** Construct a URL out of baseUrl and usual parameters passed to + * GetTokenOwnerJob. This function can be used when + * a URL for GetTokenOwnerJob is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl); + + ~GetTokenOwnerJob() override; + + // Result properties + + const QString& userId() const; + + protected: + Status parseJson(const QJsonDocument& data) override; + + private: + class Private; + QScopedPointer d; + }; +} // namespace QMatrixClient diff --git a/lib/csapi/{{base}}.cpp.mustache b/lib/csapi/{{base}}.cpp.mustache new file mode 100644 index 00000000..d3726f1e --- /dev/null +++ b/lib/csapi/{{base}}.cpp.mustache @@ -0,0 +1,121 @@ +{{#@filePartial}}preamble{{/@filePartial}} +#include "{{filenameBase}}.h" +{{^allModels}} +#include "converters.h" +{{/allModels}}{{#operations}} +{{#producesNonJson?}}#include +{{/producesNonJson?}}#include +{{/operations}} +using namespace QMatrixClient; +{{#models.model}}{{#in?}} +QJsonObject QMatrixClient::toJson(const {{qualifiedName}}& pod) +{ + QJsonObject o; +{{#vars}} o.insert("{{baseName}}", toJson(pod.{{nameCamelCase}})); +{{/vars}} + return o; +} +{{/in?}}{{#out?}} +{{qualifiedName}} FromJson<{{qualifiedName}}>::operator()(const QJsonValue& jv) +{ + const auto& o = jv.toObject(); + {{qualifiedName}} result; + {{#vars}}result.{{nameCamelCase}} = + fromJson<{{dataType.name}}>(o.value("{{baseName}}")); + {{/vars}} + return result; +} +{{/out?}}{{/models.model}}{{#operations}} +static const auto basePath = QStringLiteral("{{basePathWithoutHost}}"); +{{# operation}}{{#models}} +namespace QMatrixClient +{ + // Converters +{{#model}}{{#in?}} + QJsonObject toJson(const {{qualifiedName}}& pod) + { + QJsonObject o; +{{#vars}} o.insert("{{baseName}}", toJson(pod.{{nameCamelCase}})); +{{/vars}} + return o; + } +{{/in?}}{{#out?}} + template <> struct FromJson<{{qualifiedName}}> + { + {{qualifiedName}} operator()(const QJsonValue& jv) + { + const auto& o = jv.toObject(); + {{qualifiedName}} result; +{{#vars}} result.{{nameCamelCase}} = + fromJson<{{dataType.qualifiedName}}>(o.value("{{baseName}}")); +{{/vars}} + return result; + } + }; +{{/out?}}{{/model}}} // namespace QMatrixClient +{{/ models}}{{#responses}}{{#normalResponse?}}{{#allProperties?}} +class {{camelCaseOperationId}}Job::Private +{ + public:{{#allProperties}} + {{dataType.name}} {{paramName}};{{/allProperties}} +}; +{{/ allProperties?}}{{/normalResponse?}}{{/responses}}{{#queryParams?}} +BaseJob::Query queryTo{{camelCaseOperationId}}({{#queryParams}}{{>joinedParamDef}}{{/queryParams}}) +{ + BaseJob::Query _q;{{#queryParams}} +{{^required?}}{{#string?}} if (!{{nameCamelCase}}.isEmpty()) + {{/string?}}{{/required?}} _q.addQueryItem("{{baseName}}", {{>paramToString}});{{/queryParams}} + return _q; +} +{{/queryParams?}}{{^bodyParams}} +QUrl {{camelCaseOperationId}}Job::makeRequestUrl(QUrl baseUrl{{#allParams?}}, {{#allParams}}{{>joinedParamDef}}{{/allParams}}{{/allParams?}}) +{ + return BaseJob::makeRequestUrl(std::move(baseUrl), + basePath{{#pathParts}} % {{_}}{{/pathParts}}{{#queryParams?}}, + queryTo{{camelCaseOperationId}}({{>passQueryParams}}){{/queryParams?}}); +} +{{/ bodyParams}} +{{camelCaseOperationId}}Job::{{camelCaseOperationId}}Job({{#allParams}}{{>joinedParamDef}}{{/allParams}}) + : BaseJob(HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{camelCaseOperationId}}Job", + basePath{{#pathParts}} % {{_}}{{/pathParts}}{{#queryParams?}}, + queryTo{{camelCaseOperationId}}({{>passQueryParams}}){{/queryParams?}}{{#skipAuth}}{{#queryParams?}}, + {}{{/queryParams?}}, false{{/skipAuth}}){{#responses}}{{#normalResponse?}}{{#allProperties?}} + , d(new Private){{/allProperties?}}{{/normalResponse?}}{{/responses}} +{ +{{#headerParams?}}{{#headerParams}} setRequestHeader("{{baseName}}", {{paramName}}.toLatin1()); +{{/headerParams}} +{{/headerParams? +}}{{#bodyParams? +}}{{#inlineBody}} setRequestData(Data({{! + }}{{#consumesNonJson?}}{{nameCamelCase}}{{/consumesNonJson? + }}{{^consumesNonJson?}}toJson({{nameCamelCase}}){{/consumesNonJson?}}));{{/inlineBody +}}{{^inlineBody}} QJsonObject _data;{{#bodyParams}} +{{^required?}}{{#string?}} if (!{{paramName}}.isEmpty()) + {{/string?}}{{/required?}} _data.insert("{{baseName}}", toJson({{paramName}}));{{/bodyParams}} + setRequestData(_data);{{/inlineBody}} +{{/bodyParams?}}{{#producesNonJson?}} setExpectedContentTypes({ {{#produces}}"{{_}}"{{#@join}}, {{/@join}}{{/produces}} }); +{{/producesNonJson?}}}{{!<- mind the actual brace}} +{{# responses}}{{#normalResponse?}}{{#allProperties?}} +{{camelCaseOperationId}}Job::~{{camelCaseOperationId}}Job() = default; +{{# allProperties}} +{{>qualifiedMaybeCrefType}} {{camelCaseOperationId}}Job::{{paramName}}(){{^noCopy?}} const{{/noCopy?}} +{ + return {{#noCopy?}}std::move({{/noCopy?}}d->{{paramName}}{{#noCopy?}}){{/noCopy?}}; +} +{{/ allProperties}}{{#producesNonJson?}} +BaseJob::Status {{camelCaseOperationId}}Job::parseReply(QNetworkReply* reply) +{ + {{#headers}}d->{{paramName}} = reply->rawHeader("{{baseName}}"); {{! We don't check for required headers yet }} + {{/headers}}{{#properties}}d->{{paramName}} = reply;{{/properties}} + return Success; +}{{/ producesNonJson?}}{{^producesNonJson?}} +BaseJob::Status {{camelCaseOperationId}}Job::parseJson(const QJsonDocument& data) +{ + auto json = data.object(); + {{# properties}}{{#required?}}if (!json.contains("{{baseName}}")) + return { JsonParseError, + "The key '{{baseName}}' not found in the response" }; + {{/required?}}d->{{paramName}} = fromJson<{{dataType.name}}>(json.value("{{baseName}}")); + {{/ properties}}return Success; +}{{/ producesNonJson?}} +{{/allProperties?}}{{/normalResponse?}}{{/responses}}{{/operation}}{{/operations}} diff --git a/lib/csapi/{{base}}.h.mustache b/lib/csapi/{{base}}.h.mustache new file mode 100644 index 00000000..a9bed527 --- /dev/null +++ b/lib/csapi/{{base}}.h.mustache @@ -0,0 +1,63 @@ +{{#@filePartial}}preamble{{/@filePartial}} +#pragma once + +{{#operations}}#include "jobs/basejob.h" +{{/operations}} +{{#imports}}#include {{_}} +{{/imports}} +{{#allModels}}#include "converters.h" +{{/allModels}} +namespace QMatrixClient +{ +{{#models}} // Data structures +{{# model}} + struct {{name}}{{#parents?}} : {{#parents}}{{name}}{{#@join}}, {{/@join}}{{/parents}}{{/parents?}} + { +{{#vars}} {{dataType.name}} {{nameCamelCase}}; +{{/vars}} }; +{{#in?}} + QJsonObject toJson(const {{name}}& pod); +{{/in?}}{{#out?}} + template <> struct FromJson<{{name}}> + { + {{name}} operator()(const QJsonValue& jv); + }; +{{/ out?}}{{/model}} +{{/models}}{{#operations}} // Operations +{{# operation}} + class {{camelCaseOperationId}}Job : public BaseJob + { + public:{{#models}} + // Inner data structures +{{# model}} + struct {{name}}{{#parents?}} : {{#parents}}{{name}}{{#@join}}, {{/@join}}{{/parents}}{{/parents?}} + { +{{#vars}} {{dataType.name}} {{nameCamelCase}}; +{{/vars}} }; +{{/ model}} + // Construction/destruction +{{/ models}} + explicit {{camelCaseOperationId}}Job({{#allParams}}{{>joinedParamDecl}}{{/allParams}});{{^bodyParams}} + + /** Construct a URL out of baseUrl and usual parameters passed to + * {{camelCaseOperationId}}Job. This function can be used when + * a URL for {{camelCaseOperationId}}Job is necessary but the job + * itself isn't. + */ + static QUrl makeRequestUrl(QUrl baseUrl{{#allParams?}}, {{#allParams}}{{>joinedParamDecl}}{{/allParams}}{{/allParams?}}); +{{/bodyParams}}{{# responses}}{{#normalResponse?}}{{#allProperties?}} + ~{{camelCaseOperationId}}Job() override; + + // Result properties +{{#allProperties}} + {{>maybeCrefType}} {{paramName}}(){{^noCopy?}} const{{/noCopy?}};{{/allProperties}} + + protected: + Status {{#producesNonJson?}}parseReply(QNetworkReply* reply){{/producesNonJson?}}{{^producesNonJson?}}parseJson(const QJsonDocument& data){{/producesNonJson?}} override; + + private: + class Private; + QScopedPointer d;{{/allProperties?}}{{/normalResponse?}}{{/responses}} + }; +{{/operation}}{{/operations}}{{!skip EOL +}}} // namespace QMatrixClient diff --git a/lib/jobs/downloadfilejob.h b/lib/jobs/downloadfilejob.h index 1815a7c8..ce47ab1c 100644 --- a/lib/jobs/downloadfilejob.h +++ b/lib/jobs/downloadfilejob.h @@ -1,6 +1,6 @@ #pragma once -#include "generated/content-repo.h" +#include "csapi/content-repo.h" namespace QMatrixClient { diff --git a/lib/jobs/generated/account-data.cpp b/lib/jobs/generated/account-data.cpp deleted file mode 100644 index ac45cb85..00000000 --- a/lib/jobs/generated/account-data.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "account-data.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -SetAccountDataJob::SetAccountDataJob(const QString& userId, const QString& type, const QJsonObject& content) - : BaseJob(HttpVerb::Put, "SetAccountDataJob", - basePath % "/user/" % userId % "/account_data/" % type) -{ - setRequestData(Data(toJson(content))); -} - -SetAccountDataPerRoomJob::SetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type, const QJsonObject& content) - : BaseJob(HttpVerb::Put, "SetAccountDataPerRoomJob", - basePath % "/user/" % userId % "/rooms/" % roomId % "/account_data/" % type) -{ - setRequestData(Data(toJson(content))); -} - diff --git a/lib/jobs/generated/account-data.h b/lib/jobs/generated/account-data.h deleted file mode 100644 index 69ad9fb4..00000000 --- a/lib/jobs/generated/account-data.h +++ /dev/null @@ -1,27 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - - -namespace QMatrixClient -{ - // Operations - - class SetAccountDataJob : public BaseJob - { - public: - explicit SetAccountDataJob(const QString& userId, const QString& type, const QJsonObject& content = {}); - }; - - class SetAccountDataPerRoomJob : public BaseJob - { - public: - explicit SetAccountDataPerRoomJob(const QString& userId, const QString& roomId, const QString& type, const QJsonObject& content = {}); - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/administrative_contact.cpp b/lib/jobs/generated/administrative_contact.cpp deleted file mode 100644 index ec7c77c3..00000000 --- a/lib/jobs/generated/administrative_contact.cpp +++ /dev/null @@ -1,102 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "administrative_contact.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -namespace QMatrixClient -{ - // Converters - - template <> struct FromJson - { - GetAccount3PIDsJob::ThirdPartyIdentifier operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - GetAccount3PIDsJob::ThirdPartyIdentifier result; - result.medium = - fromJson(o.value("medium")); - result.address = - fromJson(o.value("address")); - - return result; - } - }; -} // namespace QMatrixClient - -class GetAccount3PIDsJob::Private -{ - public: - QVector threepids; -}; - -QUrl GetAccount3PIDsJob::makeRequestUrl(QUrl baseUrl) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/account/3pid"); -} - -GetAccount3PIDsJob::GetAccount3PIDsJob() - : BaseJob(HttpVerb::Get, "GetAccount3PIDsJob", - basePath % "/account/3pid") - , d(new Private) -{ -} - -GetAccount3PIDsJob::~GetAccount3PIDsJob() = default; - -const QVector& GetAccount3PIDsJob::threepids() const -{ - return d->threepids; -} - -BaseJob::Status GetAccount3PIDsJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->threepids = fromJson>(json.value("threepids")); - return Success; -} - -namespace QMatrixClient -{ - // Converters - - QJsonObject toJson(const Post3PIDsJob::ThreePidCredentials& pod) - { - QJsonObject o; - o.insert("client_secret", toJson(pod.clientSecret)); - o.insert("id_server", toJson(pod.idServer)); - o.insert("sid", toJson(pod.sid)); - - return o; - } -} // namespace QMatrixClient - -Post3PIDsJob::Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind) - : BaseJob(HttpVerb::Post, "Post3PIDsJob", - basePath % "/account/3pid") -{ - QJsonObject _data; - _data.insert("three_pid_creds", toJson(threePidCreds)); - _data.insert("bind", toJson(bind)); - setRequestData(_data); -} - -QUrl RequestTokenTo3PIDJob::makeRequestUrl(QUrl baseUrl) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/account/3pid/email/requestToken"); -} - -RequestTokenTo3PIDJob::RequestTokenTo3PIDJob() - : BaseJob(HttpVerb::Post, "RequestTokenTo3PIDJob", - basePath % "/account/3pid/email/requestToken", false) -{ -} - diff --git a/lib/jobs/generated/administrative_contact.h b/lib/jobs/generated/administrative_contact.h deleted file mode 100644 index 4afd068f..00000000 --- a/lib/jobs/generated/administrative_contact.h +++ /dev/null @@ -1,83 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - -#include "converters.h" - -namespace QMatrixClient -{ - // Operations - - class GetAccount3PIDsJob : public BaseJob - { - public: - // Inner data structures - - struct ThirdPartyIdentifier - { - QString medium; - QString address; - }; - - // Construction/destruction - - explicit GetAccount3PIDsJob(); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetAccount3PIDsJob. This function can be used when - * a URL for GetAccount3PIDsJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl); - - ~GetAccount3PIDsJob() override; - - // Result properties - - const QVector& threepids() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; - - class Post3PIDsJob : public BaseJob - { - public: - // Inner data structures - - struct ThreePidCredentials - { - QString clientSecret; - QString idServer; - QString sid; - }; - - // Construction/destruction - - explicit Post3PIDsJob(const ThreePidCredentials& threePidCreds, bool bind = {}); - }; - - class RequestTokenTo3PIDJob : public BaseJob - { - public: - explicit RequestTokenTo3PIDJob(); - - /** Construct a URL out of baseUrl and usual parameters passed to - * RequestTokenTo3PIDJob. This function can be used when - * a URL for RequestTokenTo3PIDJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl); - - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/banning.cpp b/lib/jobs/generated/banning.cpp deleted file mode 100644 index f66b27b6..00000000 --- a/lib/jobs/generated/banning.cpp +++ /dev/null @@ -1,34 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "banning.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -BanJob::BanJob(const QString& roomId, const QString& userId, const QString& reason) - : BaseJob(HttpVerb::Post, "BanJob", - basePath % "/rooms/" % roomId % "/ban") -{ - QJsonObject _data; - _data.insert("user_id", toJson(userId)); - if (!reason.isEmpty()) - _data.insert("reason", toJson(reason)); - setRequestData(_data); -} - -UnbanJob::UnbanJob(const QString& roomId, const QString& userId) - : BaseJob(HttpVerb::Post, "UnbanJob", - basePath % "/rooms/" % roomId % "/unban") -{ - QJsonObject _data; - _data.insert("user_id", toJson(userId)); - setRequestData(_data); -} - diff --git a/lib/jobs/generated/banning.h b/lib/jobs/generated/banning.h deleted file mode 100644 index 2d6fbd9b..00000000 --- a/lib/jobs/generated/banning.h +++ /dev/null @@ -1,26 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - - - -namespace QMatrixClient -{ - // Operations - - class BanJob : public BaseJob - { - public: - explicit BanJob(const QString& roomId, const QString& userId, const QString& reason = {}); - }; - - class UnbanJob : public BaseJob - { - public: - explicit UnbanJob(const QString& roomId, const QString& userId); - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/content-repo.cpp b/lib/jobs/generated/content-repo.cpp deleted file mode 100644 index 95fc5aed..00000000 --- a/lib/jobs/generated/content-repo.cpp +++ /dev/null @@ -1,254 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "content-repo.h" - -#include "converters.h" - -#include -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/media/r0"); - -class UploadContentJob::Private -{ - public: - QString contentUri; -}; - -BaseJob::Query queryToUploadContent(const QString& filename) -{ - BaseJob::Query _q; - if (!filename.isEmpty()) - _q.addQueryItem("filename", filename); - return _q; -} - -UploadContentJob::UploadContentJob(QIODevice* content, const QString& filename, const QString& contentType) - : BaseJob(HttpVerb::Post, "UploadContentJob", - basePath % "/upload", - queryToUploadContent(filename)) - , d(new Private) -{ - setRequestHeader("Content-Type", contentType.toLatin1()); - - setRequestData(Data(content)); -} - -UploadContentJob::~UploadContentJob() = default; - -const QString& UploadContentJob::contentUri() const -{ - return d->contentUri; -} - -BaseJob::Status UploadContentJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - if (!json.contains("content_uri")) - return { JsonParseError, - "The key 'content_uri' not found in the response" }; - d->contentUri = fromJson(json.value("content_uri")); - return Success; -} - -class GetContentJob::Private -{ - public: - QString contentType; - QString contentDisposition; - QIODevice* content; -}; - -QUrl GetContentJob::makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/download/" % serverName % "/" % mediaId); -} - -GetContentJob::GetContentJob(const QString& serverName, const QString& mediaId) - : BaseJob(HttpVerb::Get, "GetContentJob", - basePath % "/download/" % serverName % "/" % mediaId, false) - , d(new Private) -{ - setExpectedContentTypes({ "*/*" }); -} - -GetContentJob::~GetContentJob() = default; - -const QString& GetContentJob::contentType() const -{ - return d->contentType; -} - -const QString& GetContentJob::contentDisposition() const -{ - return d->contentDisposition; -} - -QIODevice* GetContentJob::content() const -{ - return d->content; -} - -BaseJob::Status GetContentJob::parseReply(QNetworkReply* reply) -{ - d->contentType = reply->rawHeader("Content-Type"); - d->contentDisposition = reply->rawHeader("Content-Disposition"); - d->content = reply; - return Success; -} - -class GetContentOverrideNameJob::Private -{ - public: - QString contentType; - QString contentDisposition; - QIODevice* content; -}; - -QUrl GetContentOverrideNameJob::makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, const QString& fileName) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/download/" % serverName % "/" % mediaId % "/" % fileName); -} - -GetContentOverrideNameJob::GetContentOverrideNameJob(const QString& serverName, const QString& mediaId, const QString& fileName) - : BaseJob(HttpVerb::Get, "GetContentOverrideNameJob", - basePath % "/download/" % serverName % "/" % mediaId % "/" % fileName, false) - , d(new Private) -{ - setExpectedContentTypes({ "*/*" }); -} - -GetContentOverrideNameJob::~GetContentOverrideNameJob() = default; - -const QString& GetContentOverrideNameJob::contentType() const -{ - return d->contentType; -} - -const QString& GetContentOverrideNameJob::contentDisposition() const -{ - return d->contentDisposition; -} - -QIODevice* GetContentOverrideNameJob::content() const -{ - return d->content; -} - -BaseJob::Status GetContentOverrideNameJob::parseReply(QNetworkReply* reply) -{ - d->contentType = reply->rawHeader("Content-Type"); - d->contentDisposition = reply->rawHeader("Content-Disposition"); - d->content = reply; - return Success; -} - -class GetContentThumbnailJob::Private -{ - public: - QString contentType; - QIODevice* content; -}; - -BaseJob::Query queryToGetContentThumbnail(int width, int height, const QString& method) -{ - BaseJob::Query _q; - _q.addQueryItem("width", QString("%1").arg(width)); - _q.addQueryItem("height", QString("%1").arg(height)); - if (!method.isEmpty()) - _q.addQueryItem("method", method); - return _q; -} - -QUrl GetContentThumbnailJob::makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, int width, int height, const QString& method) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/thumbnail/" % serverName % "/" % mediaId, - queryToGetContentThumbnail(width, height, method)); -} - -GetContentThumbnailJob::GetContentThumbnailJob(const QString& serverName, const QString& mediaId, int width, int height, const QString& method) - : BaseJob(HttpVerb::Get, "GetContentThumbnailJob", - basePath % "/thumbnail/" % serverName % "/" % mediaId, - queryToGetContentThumbnail(width, height, method), - {}, false) - , d(new Private) -{ - setExpectedContentTypes({ "image/jpeg", "image/png" }); -} - -GetContentThumbnailJob::~GetContentThumbnailJob() = default; - -const QString& GetContentThumbnailJob::contentType() const -{ - return d->contentType; -} - -QIODevice* GetContentThumbnailJob::content() const -{ - return d->content; -} - -BaseJob::Status GetContentThumbnailJob::parseReply(QNetworkReply* reply) -{ - d->contentType = reply->rawHeader("Content-Type"); - d->content = reply; - return Success; -} - -class GetUrlPreviewJob::Private -{ - public: - qint64 matrixImageSize; - QString ogImage; -}; - -BaseJob::Query queryToGetUrlPreview(const QString& url, qint64 ts) -{ - BaseJob::Query _q; - _q.addQueryItem("url", url); - _q.addQueryItem("ts", QString("%1").arg(ts)); - return _q; -} - -QUrl GetUrlPreviewJob::makeRequestUrl(QUrl baseUrl, const QString& url, qint64 ts) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/preview_url", - queryToGetUrlPreview(url, ts)); -} - -GetUrlPreviewJob::GetUrlPreviewJob(const QString& url, qint64 ts) - : BaseJob(HttpVerb::Get, "GetUrlPreviewJob", - basePath % "/preview_url", - queryToGetUrlPreview(url, ts)) - , d(new Private) -{ -} - -GetUrlPreviewJob::~GetUrlPreviewJob() = default; - -qint64 GetUrlPreviewJob::matrixImageSize() const -{ - return d->matrixImageSize; -} - -const QString& GetUrlPreviewJob::ogImage() const -{ - return d->ogImage; -} - -BaseJob::Status GetUrlPreviewJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->matrixImageSize = fromJson(json.value("matrix:image:size")); - d->ogImage = fromJson(json.value("og:image")); - return Success; -} - diff --git a/lib/jobs/generated/content-repo.h b/lib/jobs/generated/content-repo.h deleted file mode 100644 index cae8e588..00000000 --- a/lib/jobs/generated/content-repo.h +++ /dev/null @@ -1,143 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - - -namespace QMatrixClient -{ - // Operations - - class UploadContentJob : public BaseJob - { - public: - explicit UploadContentJob(QIODevice* content, const QString& filename = {}, const QString& contentType = {}); - ~UploadContentJob() override; - - // Result properties - - const QString& contentUri() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; - - class GetContentJob : public BaseJob - { - public: - explicit GetContentJob(const QString& serverName, const QString& mediaId); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetContentJob. This function can be used when - * a URL for GetContentJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId); - - ~GetContentJob() override; - - // Result properties - - const QString& contentType() const; - const QString& contentDisposition() const; - QIODevice* content() const; - - protected: - Status parseReply(QNetworkReply* reply) override; - - private: - class Private; - QScopedPointer d; - }; - - class GetContentOverrideNameJob : public BaseJob - { - public: - explicit GetContentOverrideNameJob(const QString& serverName, const QString& mediaId, const QString& fileName); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetContentOverrideNameJob. This function can be used when - * a URL for GetContentOverrideNameJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, const QString& fileName); - - ~GetContentOverrideNameJob() override; - - // Result properties - - const QString& contentType() const; - const QString& contentDisposition() const; - QIODevice* content() const; - - protected: - Status parseReply(QNetworkReply* reply) override; - - private: - class Private; - QScopedPointer d; - }; - - class GetContentThumbnailJob : public BaseJob - { - public: - explicit GetContentThumbnailJob(const QString& serverName, const QString& mediaId, int width = {}, int height = {}, const QString& method = {}); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetContentThumbnailJob. This function can be used when - * a URL for GetContentThumbnailJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& serverName, const QString& mediaId, int width = {}, int height = {}, const QString& method = {}); - - ~GetContentThumbnailJob() override; - - // Result properties - - const QString& contentType() const; - QIODevice* content() const; - - protected: - Status parseReply(QNetworkReply* reply) override; - - private: - class Private; - QScopedPointer d; - }; - - class GetUrlPreviewJob : public BaseJob - { - public: - explicit GetUrlPreviewJob(const QString& url, qint64 ts = {}); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetUrlPreviewJob. This function can be used when - * a URL for GetUrlPreviewJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& url, qint64 ts = {}); - - ~GetUrlPreviewJob() override; - - // Result properties - - qint64 matrixImageSize() const; - const QString& ogImage() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/create_room.cpp b/lib/jobs/generated/create_room.cpp deleted file mode 100644 index 0a7eb208..00000000 --- a/lib/jobs/generated/create_room.cpp +++ /dev/null @@ -1,82 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "create_room.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -namespace QMatrixClient -{ - // Converters - - QJsonObject toJson(const CreateRoomJob::Invite3pid& pod) - { - QJsonObject o; - o.insert("id_server", toJson(pod.idServer)); - o.insert("medium", toJson(pod.medium)); - o.insert("address", toJson(pod.address)); - - return o; - } - - QJsonObject toJson(const CreateRoomJob::StateEvent& pod) - { - QJsonObject o; - o.insert("type", toJson(pod.type)); - o.insert("state_key", toJson(pod.stateKey)); - o.insert("content", toJson(pod.content)); - - return o; - } -} // namespace QMatrixClient - -class CreateRoomJob::Private -{ - public: - QString roomId; -}; - -CreateRoomJob::CreateRoomJob(const QString& visibility, const QString& roomAliasName, const QString& name, const QString& topic, const QStringList& invite, const QVector& invite3pid, const QJsonObject& creationContent, const QVector& initialState, const QString& preset, bool isDirect, bool guestCanJoin) - : BaseJob(HttpVerb::Post, "CreateRoomJob", - basePath % "/createRoom") - , d(new Private) -{ - QJsonObject _data; - if (!visibility.isEmpty()) - _data.insert("visibility", toJson(visibility)); - if (!roomAliasName.isEmpty()) - _data.insert("room_alias_name", toJson(roomAliasName)); - if (!name.isEmpty()) - _data.insert("name", toJson(name)); - if (!topic.isEmpty()) - _data.insert("topic", toJson(topic)); - _data.insert("invite", toJson(invite)); - _data.insert("invite_3pid", toJson(invite3pid)); - _data.insert("creation_content", toJson(creationContent)); - _data.insert("initial_state", toJson(initialState)); - if (!preset.isEmpty()) - _data.insert("preset", toJson(preset)); - _data.insert("is_direct", toJson(isDirect)); - _data.insert("guest_can_join", toJson(guestCanJoin)); - setRequestData(_data); -} - -CreateRoomJob::~CreateRoomJob() = default; - -const QString& CreateRoomJob::roomId() const -{ - return d->roomId; -} - -BaseJob::Status CreateRoomJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->roomId = fromJson(json.value("room_id")); - return Success; -} - diff --git a/lib/jobs/generated/create_room.h b/lib/jobs/generated/create_room.h deleted file mode 100644 index 88ad7895..00000000 --- a/lib/jobs/generated/create_room.h +++ /dev/null @@ -1,54 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include -#include -#include - -#include "converters.h" - -namespace QMatrixClient -{ - // Operations - - class CreateRoomJob : public BaseJob - { - public: - // Inner data structures - - struct Invite3pid - { - QString idServer; - QString medium; - QString address; - }; - - struct StateEvent - { - QString type; - QString stateKey; - QJsonObject content; - }; - - // Construction/destruction - - explicit CreateRoomJob(const QString& visibility = {}, const QString& roomAliasName = {}, const QString& name = {}, const QString& topic = {}, const QStringList& invite = {}, const QVector& invite3pid = {}, const QJsonObject& creationContent = {}, const QVector& initialState = {}, const QString& preset = {}, bool isDirect = {}, bool guestCanJoin = {}); - ~CreateRoomJob() override; - - // Result properties - - const QString& roomId() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/directory.cpp b/lib/jobs/generated/directory.cpp deleted file mode 100644 index 3066ebe2..00000000 --- a/lib/jobs/generated/directory.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "directory.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0/directory"); - -SetRoomAliasJob::SetRoomAliasJob(const QString& roomAlias, const QString& roomId) - : BaseJob(HttpVerb::Put, "SetRoomAliasJob", - basePath % "/room/" % roomAlias) -{ - QJsonObject _data; - if (!roomId.isEmpty()) - _data.insert("room_id", toJson(roomId)); - setRequestData(_data); -} - -class GetRoomIdByAliasJob::Private -{ - public: - QString roomId; - QStringList servers; -}; - -QUrl GetRoomIdByAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/room/" % roomAlias); -} - -GetRoomIdByAliasJob::GetRoomIdByAliasJob(const QString& roomAlias) - : BaseJob(HttpVerb::Get, "GetRoomIdByAliasJob", - basePath % "/room/" % roomAlias, false) - , d(new Private) -{ -} - -GetRoomIdByAliasJob::~GetRoomIdByAliasJob() = default; - -const QString& GetRoomIdByAliasJob::roomId() const -{ - return d->roomId; -} - -const QStringList& GetRoomIdByAliasJob::servers() const -{ - return d->servers; -} - -BaseJob::Status GetRoomIdByAliasJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->roomId = fromJson(json.value("room_id")); - d->servers = fromJson(json.value("servers")); - return Success; -} - -QUrl DeleteRoomAliasJob::makeRequestUrl(QUrl baseUrl, const QString& roomAlias) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/room/" % roomAlias); -} - -DeleteRoomAliasJob::DeleteRoomAliasJob(const QString& roomAlias) - : BaseJob(HttpVerb::Delete, "DeleteRoomAliasJob", - basePath % "/room/" % roomAlias) -{ -} - diff --git a/lib/jobs/generated/directory.h b/lib/jobs/generated/directory.h deleted file mode 100644 index 861040b6..00000000 --- a/lib/jobs/generated/directory.h +++ /dev/null @@ -1,62 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - - -namespace QMatrixClient -{ - // Operations - - class SetRoomAliasJob : public BaseJob - { - public: - explicit SetRoomAliasJob(const QString& roomAlias, const QString& roomId = {}); - }; - - class GetRoomIdByAliasJob : public BaseJob - { - public: - explicit GetRoomIdByAliasJob(const QString& roomAlias); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetRoomIdByAliasJob. This function can be used when - * a URL for GetRoomIdByAliasJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomAlias); - - ~GetRoomIdByAliasJob() override; - - // Result properties - - const QString& roomId() const; - const QStringList& servers() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; - - class DeleteRoomAliasJob : public BaseJob - { - public: - explicit DeleteRoomAliasJob(const QString& roomAlias); - - /** Construct a URL out of baseUrl and usual parameters passed to - * DeleteRoomAliasJob. This function can be used when - * a URL for DeleteRoomAliasJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomAlias); - - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/inviting.cpp b/lib/jobs/generated/inviting.cpp deleted file mode 100644 index d2ee2107..00000000 --- a/lib/jobs/generated/inviting.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "inviting.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -InviteUserJob::InviteUserJob(const QString& roomId, const QString& userId) - : BaseJob(HttpVerb::Post, "InviteUserJob", - basePath % "/rooms/" % roomId % "/invite") -{ - QJsonObject _data; - _data.insert("user_id", toJson(userId)); - setRequestData(_data); -} - diff --git a/lib/jobs/generated/inviting.h b/lib/jobs/generated/inviting.h deleted file mode 100644 index eaa884df..00000000 --- a/lib/jobs/generated/inviting.h +++ /dev/null @@ -1,20 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - - - -namespace QMatrixClient -{ - // Operations - - class InviteUserJob : public BaseJob - { - public: - explicit InviteUserJob(const QString& roomId, const QString& userId); - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/joining.cpp b/lib/jobs/generated/joining.cpp deleted file mode 100644 index 705e8f83..00000000 --- a/lib/jobs/generated/joining.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "joining.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -namespace QMatrixClient -{ - // Converters - - QJsonObject toJson(const JoinRoomByIdJob::ThirdPartySigned& pod) - { - QJsonObject o; - o.insert("sender", toJson(pod.sender)); - o.insert("mxid", toJson(pod.mxid)); - o.insert("token", toJson(pod.token)); - o.insert("signatures", toJson(pod.signatures)); - - return o; - } -} // namespace QMatrixClient - -class JoinRoomByIdJob::Private -{ - public: - QString roomId; -}; - -JoinRoomByIdJob::JoinRoomByIdJob(const QString& roomId, const ThirdPartySigned& thirdPartySigned) - : BaseJob(HttpVerb::Post, "JoinRoomByIdJob", - basePath % "/rooms/" % roomId % "/join") - , d(new Private) -{ - QJsonObject _data; - _data.insert("third_party_signed", toJson(thirdPartySigned)); - setRequestData(_data); -} - -JoinRoomByIdJob::~JoinRoomByIdJob() = default; - -const QString& JoinRoomByIdJob::roomId() const -{ - return d->roomId; -} - -BaseJob::Status JoinRoomByIdJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - if (!json.contains("room_id")) - return { JsonParseError, - "The key 'room_id' not found in the response" }; - d->roomId = fromJson(json.value("room_id")); - return Success; -} - -namespace QMatrixClient -{ - // Converters - - QJsonObject toJson(const JoinRoomJob::Signed& pod) - { - QJsonObject o; - o.insert("sender", toJson(pod.sender)); - o.insert("mxid", toJson(pod.mxid)); - o.insert("token", toJson(pod.token)); - o.insert("signatures", toJson(pod.signatures)); - - return o; - } - - QJsonObject toJson(const JoinRoomJob::ThirdPartySigned& pod) - { - QJsonObject o; - o.insert("signed", toJson(pod.signedData)); - - return o; - } -} // namespace QMatrixClient - -class JoinRoomJob::Private -{ - public: - QString roomId; -}; - -JoinRoomJob::JoinRoomJob(const QString& roomIdOrAlias, const ThirdPartySigned& thirdPartySigned) - : BaseJob(HttpVerb::Post, "JoinRoomJob", - basePath % "/join/" % roomIdOrAlias) - , d(new Private) -{ - QJsonObject _data; - _data.insert("third_party_signed", toJson(thirdPartySigned)); - setRequestData(_data); -} - -JoinRoomJob::~JoinRoomJob() = default; - -const QString& JoinRoomJob::roomId() const -{ - return d->roomId; -} - -BaseJob::Status JoinRoomJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - if (!json.contains("room_id")) - return { JsonParseError, - "The key 'room_id' not found in the response" }; - d->roomId = fromJson(json.value("room_id")); - return Success; -} - diff --git a/lib/jobs/generated/joining.h b/lib/jobs/generated/joining.h deleted file mode 100644 index 7aa3e3a2..00000000 --- a/lib/jobs/generated/joining.h +++ /dev/null @@ -1,81 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - -#include "converters.h" - -namespace QMatrixClient -{ - // Operations - - class JoinRoomByIdJob : public BaseJob - { - public: - // Inner data structures - - struct ThirdPartySigned - { - QString sender; - QString mxid; - QString token; - QJsonObject signatures; - }; - - // Construction/destruction - - explicit JoinRoomByIdJob(const QString& roomId, const ThirdPartySigned& thirdPartySigned = {}); - ~JoinRoomByIdJob() override; - - // Result properties - - const QString& roomId() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; - - class JoinRoomJob : public BaseJob - { - public: - // Inner data structures - - struct Signed - { - QString sender; - QString mxid; - QString token; - QJsonObject signatures; - }; - - struct ThirdPartySigned - { - Signed signedData; - }; - - // Construction/destruction - - explicit JoinRoomJob(const QString& roomIdOrAlias, const ThirdPartySigned& thirdPartySigned = {}); - ~JoinRoomJob() override; - - // Result properties - - const QString& roomId() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/kicking.cpp b/lib/jobs/generated/kicking.cpp deleted file mode 100644 index bf2490b7..00000000 --- a/lib/jobs/generated/kicking.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "kicking.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -KickJob::KickJob(const QString& roomId, const QString& userId, const QString& reason) - : BaseJob(HttpVerb::Post, "KickJob", - basePath % "/rooms/" % roomId % "/kick") -{ - QJsonObject _data; - _data.insert("user_id", toJson(userId)); - if (!reason.isEmpty()) - _data.insert("reason", toJson(reason)); - setRequestData(_data); -} - diff --git a/lib/jobs/generated/kicking.h b/lib/jobs/generated/kicking.h deleted file mode 100644 index 3814bef7..00000000 --- a/lib/jobs/generated/kicking.h +++ /dev/null @@ -1,20 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - - - -namespace QMatrixClient -{ - // Operations - - class KickJob : public BaseJob - { - public: - explicit KickJob(const QString& roomId, const QString& userId, const QString& reason = {}); - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/leaving.cpp b/lib/jobs/generated/leaving.cpp deleted file mode 100644 index afc4adbd..00000000 --- a/lib/jobs/generated/leaving.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "leaving.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -QUrl LeaveRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/rooms/" % roomId % "/leave"); -} - -LeaveRoomJob::LeaveRoomJob(const QString& roomId) - : BaseJob(HttpVerb::Post, "LeaveRoomJob", - basePath % "/rooms/" % roomId % "/leave") -{ -} - -QUrl ForgetRoomJob::makeRequestUrl(QUrl baseUrl, const QString& roomId) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/rooms/" % roomId % "/forget"); -} - -ForgetRoomJob::ForgetRoomJob(const QString& roomId) - : BaseJob(HttpVerb::Post, "ForgetRoomJob", - basePath % "/rooms/" % roomId % "/forget") -{ -} - diff --git a/lib/jobs/generated/leaving.h b/lib/jobs/generated/leaving.h deleted file mode 100644 index 7e914dd1..00000000 --- a/lib/jobs/generated/leaving.h +++ /dev/null @@ -1,42 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - - - -namespace QMatrixClient -{ - // Operations - - class LeaveRoomJob : public BaseJob - { - public: - explicit LeaveRoomJob(const QString& roomId); - - /** Construct a URL out of baseUrl and usual parameters passed to - * LeaveRoomJob. This function can be used when - * a URL for LeaveRoomJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId); - - }; - - class ForgetRoomJob : public BaseJob - { - public: - explicit ForgetRoomJob(const QString& roomId); - - /** Construct a URL out of baseUrl and usual parameters passed to - * ForgetRoomJob. This function can be used when - * a URL for ForgetRoomJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId); - - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/list_joined_rooms.cpp b/lib/jobs/generated/list_joined_rooms.cpp deleted file mode 100644 index 82ec8849..00000000 --- a/lib/jobs/generated/list_joined_rooms.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "list_joined_rooms.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -class GetJoinedRoomsJob::Private -{ - public: - QStringList joinedRooms; -}; - -QUrl GetJoinedRoomsJob::makeRequestUrl(QUrl baseUrl) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/joined_rooms"); -} - -GetJoinedRoomsJob::GetJoinedRoomsJob() - : BaseJob(HttpVerb::Get, "GetJoinedRoomsJob", - basePath % "/joined_rooms") - , d(new Private) -{ -} - -GetJoinedRoomsJob::~GetJoinedRoomsJob() = default; - -const QStringList& GetJoinedRoomsJob::joinedRooms() const -{ - return d->joinedRooms; -} - -BaseJob::Status GetJoinedRoomsJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - if (!json.contains("joined_rooms")) - return { JsonParseError, - "The key 'joined_rooms' not found in the response" }; - d->joinedRooms = fromJson(json.value("joined_rooms")); - return Success; -} - diff --git a/lib/jobs/generated/list_joined_rooms.h b/lib/jobs/generated/list_joined_rooms.h deleted file mode 100644 index 442e2cf9..00000000 --- a/lib/jobs/generated/list_joined_rooms.h +++ /dev/null @@ -1,41 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - - -namespace QMatrixClient -{ - // Operations - - class GetJoinedRoomsJob : public BaseJob - { - public: - explicit GetJoinedRoomsJob(); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetJoinedRoomsJob. This function can be used when - * a URL for GetJoinedRoomsJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl); - - ~GetJoinedRoomsJob() override; - - // Result properties - - const QStringList& joinedRooms() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/list_public_rooms.cpp b/lib/jobs/generated/list_public_rooms.cpp deleted file mode 100644 index b27bdd58..00000000 --- a/lib/jobs/generated/list_public_rooms.cpp +++ /dev/null @@ -1,268 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "list_public_rooms.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -class GetRoomVisibilityOnDirectoryJob::Private -{ - public: - QString visibility; -}; - -QUrl GetRoomVisibilityOnDirectoryJob::makeRequestUrl(QUrl baseUrl, const QString& roomId) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/directory/list/room/" % roomId); -} - -GetRoomVisibilityOnDirectoryJob::GetRoomVisibilityOnDirectoryJob(const QString& roomId) - : BaseJob(HttpVerb::Get, "GetRoomVisibilityOnDirectoryJob", - basePath % "/directory/list/room/" % roomId, false) - , d(new Private) -{ -} - -GetRoomVisibilityOnDirectoryJob::~GetRoomVisibilityOnDirectoryJob() = default; - -const QString& GetRoomVisibilityOnDirectoryJob::visibility() const -{ - return d->visibility; -} - -BaseJob::Status GetRoomVisibilityOnDirectoryJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->visibility = fromJson(json.value("visibility")); - return Success; -} - -SetRoomVisibilityOnDirectoryJob::SetRoomVisibilityOnDirectoryJob(const QString& roomId, const QString& visibility) - : BaseJob(HttpVerb::Put, "SetRoomVisibilityOnDirectoryJob", - basePath % "/directory/list/room/" % roomId) -{ - QJsonObject _data; - if (!visibility.isEmpty()) - _data.insert("visibility", toJson(visibility)); - setRequestData(_data); -} - -namespace QMatrixClient -{ - // Converters - - template <> struct FromJson - { - GetPublicRoomsJob::PublicRoomsChunk operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - GetPublicRoomsJob::PublicRoomsChunk result; - result.aliases = - fromJson(o.value("aliases")); - result.canonicalAlias = - fromJson(o.value("canonical_alias")); - result.name = - fromJson(o.value("name")); - result.numJoinedMembers = - fromJson(o.value("num_joined_members")); - result.roomId = - fromJson(o.value("room_id")); - result.topic = - fromJson(o.value("topic")); - result.worldReadable = - fromJson(o.value("world_readable")); - result.guestCanJoin = - fromJson(o.value("guest_can_join")); - result.avatarUrl = - fromJson(o.value("avatar_url")); - - return result; - } - }; -} // namespace QMatrixClient - -class GetPublicRoomsJob::Private -{ - public: - QVector chunk; - QString nextBatch; - QString prevBatch; - qint64 totalRoomCountEstimate; -}; - -BaseJob::Query queryToGetPublicRooms(int limit, const QString& since, const QString& server) -{ - BaseJob::Query _q; - _q.addQueryItem("limit", QString("%1").arg(limit)); - if (!since.isEmpty()) - _q.addQueryItem("since", since); - if (!server.isEmpty()) - _q.addQueryItem("server", server); - return _q; -} - -QUrl GetPublicRoomsJob::makeRequestUrl(QUrl baseUrl, int limit, const QString& since, const QString& server) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/publicRooms", - queryToGetPublicRooms(limit, since, server)); -} - -GetPublicRoomsJob::GetPublicRoomsJob(int limit, const QString& since, const QString& server) - : BaseJob(HttpVerb::Get, "GetPublicRoomsJob", - basePath % "/publicRooms", - queryToGetPublicRooms(limit, since, server), - {}, false) - , d(new Private) -{ -} - -GetPublicRoomsJob::~GetPublicRoomsJob() = default; - -const QVector& GetPublicRoomsJob::chunk() const -{ - return d->chunk; -} - -const QString& GetPublicRoomsJob::nextBatch() const -{ - return d->nextBatch; -} - -const QString& GetPublicRoomsJob::prevBatch() const -{ - return d->prevBatch; -} - -qint64 GetPublicRoomsJob::totalRoomCountEstimate() const -{ - return d->totalRoomCountEstimate; -} - -BaseJob::Status GetPublicRoomsJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - if (!json.contains("chunk")) - return { JsonParseError, - "The key 'chunk' not found in the response" }; - d->chunk = fromJson>(json.value("chunk")); - d->nextBatch = fromJson(json.value("next_batch")); - d->prevBatch = fromJson(json.value("prev_batch")); - d->totalRoomCountEstimate = fromJson(json.value("total_room_count_estimate")); - return Success; -} - -namespace QMatrixClient -{ - // Converters - - QJsonObject toJson(const QueryPublicRoomsJob::Filter& pod) - { - QJsonObject o; - o.insert("generic_search_term", toJson(pod.genericSearchTerm)); - - return o; - } - - template <> struct FromJson - { - QueryPublicRoomsJob::PublicRoomsChunk operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - QueryPublicRoomsJob::PublicRoomsChunk result; - result.aliases = - fromJson(o.value("aliases")); - result.canonicalAlias = - fromJson(o.value("canonical_alias")); - result.name = - fromJson(o.value("name")); - result.numJoinedMembers = - fromJson(o.value("num_joined_members")); - result.roomId = - fromJson(o.value("room_id")); - result.topic = - fromJson(o.value("topic")); - result.worldReadable = - fromJson(o.value("world_readable")); - result.guestCanJoin = - fromJson(o.value("guest_can_join")); - result.avatarUrl = - fromJson(o.value("avatar_url")); - - return result; - } - }; -} // namespace QMatrixClient - -class QueryPublicRoomsJob::Private -{ - public: - QVector chunk; - QString nextBatch; - QString prevBatch; - qint64 totalRoomCountEstimate; -}; - -BaseJob::Query queryToQueryPublicRooms(const QString& server) -{ - BaseJob::Query _q; - if (!server.isEmpty()) - _q.addQueryItem("server", server); - return _q; -} - -QueryPublicRoomsJob::QueryPublicRoomsJob(const QString& server, int limit, const QString& since, const Filter& filter) - : BaseJob(HttpVerb::Post, "QueryPublicRoomsJob", - basePath % "/publicRooms", - queryToQueryPublicRooms(server)) - , d(new Private) -{ - QJsonObject _data; - _data.insert("limit", toJson(limit)); - if (!since.isEmpty()) - _data.insert("since", toJson(since)); - _data.insert("filter", toJson(filter)); - setRequestData(_data); -} - -QueryPublicRoomsJob::~QueryPublicRoomsJob() = default; - -const QVector& QueryPublicRoomsJob::chunk() const -{ - return d->chunk; -} - -const QString& QueryPublicRoomsJob::nextBatch() const -{ - return d->nextBatch; -} - -const QString& QueryPublicRoomsJob::prevBatch() const -{ - return d->prevBatch; -} - -qint64 QueryPublicRoomsJob::totalRoomCountEstimate() const -{ - return d->totalRoomCountEstimate; -} - -BaseJob::Status QueryPublicRoomsJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - if (!json.contains("chunk")) - return { JsonParseError, - "The key 'chunk' not found in the response" }; - d->chunk = fromJson>(json.value("chunk")); - d->nextBatch = fromJson(json.value("next_batch")); - d->prevBatch = fromJson(json.value("prev_batch")); - d->totalRoomCountEstimate = fromJson(json.value("total_room_count_estimate")); - return Success; -} - diff --git a/lib/jobs/generated/list_public_rooms.h b/lib/jobs/generated/list_public_rooms.h deleted file mode 100644 index 46c055b5..00000000 --- a/lib/jobs/generated/list_public_rooms.h +++ /dev/null @@ -1,138 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include -#include - -#include "converters.h" - -namespace QMatrixClient -{ - // Operations - - class GetRoomVisibilityOnDirectoryJob : public BaseJob - { - public: - explicit GetRoomVisibilityOnDirectoryJob(const QString& roomId); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetRoomVisibilityOnDirectoryJob. This function can be used when - * a URL for GetRoomVisibilityOnDirectoryJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId); - - ~GetRoomVisibilityOnDirectoryJob() override; - - // Result properties - - const QString& visibility() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; - - class SetRoomVisibilityOnDirectoryJob : public BaseJob - { - public: - explicit SetRoomVisibilityOnDirectoryJob(const QString& roomId, const QString& visibility = {}); - }; - - class GetPublicRoomsJob : public BaseJob - { - public: - // Inner data structures - - struct PublicRoomsChunk - { - QStringList aliases; - QString canonicalAlias; - QString name; - qint64 numJoinedMembers; - QString roomId; - QString topic; - bool worldReadable; - bool guestCanJoin; - QString avatarUrl; - }; - - // Construction/destruction - - explicit GetPublicRoomsJob(int limit = {}, const QString& since = {}, const QString& server = {}); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetPublicRoomsJob. This function can be used when - * a URL for GetPublicRoomsJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, int limit = {}, const QString& since = {}, const QString& server = {}); - - ~GetPublicRoomsJob() override; - - // Result properties - - const QVector& chunk() const; - const QString& nextBatch() const; - const QString& prevBatch() const; - qint64 totalRoomCountEstimate() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; - - class QueryPublicRoomsJob : public BaseJob - { - public: - // Inner data structures - - struct Filter - { - QString genericSearchTerm; - }; - - struct PublicRoomsChunk - { - QStringList aliases; - QString canonicalAlias; - QString name; - qint64 numJoinedMembers; - QString roomId; - QString topic; - bool worldReadable; - bool guestCanJoin; - QString avatarUrl; - }; - - // Construction/destruction - - explicit QueryPublicRoomsJob(const QString& server = {}, int limit = {}, const QString& since = {}, const Filter& filter = {}); - ~QueryPublicRoomsJob() override; - - // Result properties - - const QVector& chunk() const; - const QString& nextBatch() const; - const QString& prevBatch() const; - qint64 totalRoomCountEstimate() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/login.cpp b/lib/jobs/generated/login.cpp deleted file mode 100644 index a4dab428..00000000 --- a/lib/jobs/generated/login.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "login.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -class LoginJob::Private -{ - public: - QString userId; - QString accessToken; - QString homeServer; - QString deviceId; -}; - -LoginJob::LoginJob(const QString& type, const QString& user, const QString& medium, const QString& address, const QString& password, const QString& token, const QString& deviceId, const QString& initialDeviceDisplayName) - : BaseJob(HttpVerb::Post, "LoginJob", - basePath % "/login", false) - , d(new Private) -{ - QJsonObject _data; - _data.insert("type", toJson(type)); - if (!user.isEmpty()) - _data.insert("user", toJson(user)); - if (!medium.isEmpty()) - _data.insert("medium", toJson(medium)); - if (!address.isEmpty()) - _data.insert("address", toJson(address)); - if (!password.isEmpty()) - _data.insert("password", toJson(password)); - if (!token.isEmpty()) - _data.insert("token", toJson(token)); - if (!deviceId.isEmpty()) - _data.insert("device_id", toJson(deviceId)); - if (!initialDeviceDisplayName.isEmpty()) - _data.insert("initial_device_display_name", toJson(initialDeviceDisplayName)); - setRequestData(_data); -} - -LoginJob::~LoginJob() = default; - -const QString& LoginJob::userId() const -{ - return d->userId; -} - -const QString& LoginJob::accessToken() const -{ - return d->accessToken; -} - -const QString& LoginJob::homeServer() const -{ - return d->homeServer; -} - -const QString& LoginJob::deviceId() const -{ - return d->deviceId; -} - -BaseJob::Status LoginJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->userId = fromJson(json.value("user_id")); - d->accessToken = fromJson(json.value("access_token")); - d->homeServer = fromJson(json.value("home_server")); - d->deviceId = fromJson(json.value("device_id")); - return Success; -} - diff --git a/lib/jobs/generated/login.h b/lib/jobs/generated/login.h deleted file mode 100644 index 8bf52d6b..00000000 --- a/lib/jobs/generated/login.h +++ /dev/null @@ -1,35 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - - - -namespace QMatrixClient -{ - // Operations - - class LoginJob : public BaseJob - { - public: - explicit LoginJob(const QString& type, const QString& user = {}, const QString& medium = {}, const QString& address = {}, const QString& password = {}, const QString& token = {}, const QString& deviceId = {}, const QString& initialDeviceDisplayName = {}); - ~LoginJob() override; - - // Result properties - - const QString& userId() const; - const QString& accessToken() const; - const QString& homeServer() const; - const QString& deviceId() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/logout.cpp b/lib/jobs/generated/logout.cpp deleted file mode 100644 index b943dcd3..00000000 --- a/lib/jobs/generated/logout.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "logout.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -QUrl LogoutJob::makeRequestUrl(QUrl baseUrl) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/logout"); -} - -LogoutJob::LogoutJob() - : BaseJob(HttpVerb::Post, "LogoutJob", - basePath % "/logout") -{ -} - diff --git a/lib/jobs/generated/logout.h b/lib/jobs/generated/logout.h deleted file mode 100644 index 1f60bd75..00000000 --- a/lib/jobs/generated/logout.h +++ /dev/null @@ -1,28 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - - - -namespace QMatrixClient -{ - // Operations - - class LogoutJob : public BaseJob - { - public: - explicit LogoutJob(); - - /** Construct a URL out of baseUrl and usual parameters passed to - * LogoutJob. This function can be used when - * a URL for LogoutJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl); - - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/message_pagination.cpp b/lib/jobs/generated/message_pagination.cpp deleted file mode 100644 index f89ccd03..00000000 --- a/lib/jobs/generated/message_pagination.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "message_pagination.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -class GetRoomEventsJob::Private -{ - public: - QString begin; - QString end; - RoomEvents chunk; -}; - -BaseJob::Query queryToGetRoomEvents(const QString& from, const QString& to, const QString& dir, int limit, const QString& filter) -{ - BaseJob::Query _q; - _q.addQueryItem("from", from); - if (!to.isEmpty()) - _q.addQueryItem("to", to); - _q.addQueryItem("dir", dir); - _q.addQueryItem("limit", QString("%1").arg(limit)); - if (!filter.isEmpty()) - _q.addQueryItem("filter", filter); - return _q; -} - -QUrl GetRoomEventsJob::makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& from, const QString& dir, const QString& to, int limit, const QString& filter) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/rooms/" % roomId % "/messages", - queryToGetRoomEvents(from, to, dir, limit, filter)); -} - -GetRoomEventsJob::GetRoomEventsJob(const QString& roomId, const QString& from, const QString& dir, const QString& to, int limit, const QString& filter) - : BaseJob(HttpVerb::Get, "GetRoomEventsJob", - basePath % "/rooms/" % roomId % "/messages", - queryToGetRoomEvents(from, to, dir, limit, filter)) - , d(new Private) -{ -} - -GetRoomEventsJob::~GetRoomEventsJob() = default; - -const QString& GetRoomEventsJob::begin() const -{ - return d->begin; -} - -const QString& GetRoomEventsJob::end() const -{ - return d->end; -} - -RoomEvents&& GetRoomEventsJob::chunk() -{ - return std::move(d->chunk); -} - -BaseJob::Status GetRoomEventsJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->begin = fromJson(json.value("start")); - d->end = fromJson(json.value("end")); - d->chunk = fromJson(json.value("chunk")); - return Success; -} - diff --git a/lib/jobs/generated/message_pagination.h b/lib/jobs/generated/message_pagination.h deleted file mode 100644 index 284895fd..00000000 --- a/lib/jobs/generated/message_pagination.h +++ /dev/null @@ -1,43 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include "events/event.h" - - -namespace QMatrixClient -{ - // Operations - - class GetRoomEventsJob : public BaseJob - { - public: - explicit GetRoomEventsJob(const QString& roomId, const QString& from, const QString& dir, const QString& to = {}, int limit = {}, const QString& filter = {}); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetRoomEventsJob. This function can be used when - * a URL for GetRoomEventsJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& roomId, const QString& from, const QString& dir, const QString& to = {}, int limit = {}, const QString& filter = {}); - - ~GetRoomEventsJob() override; - - // Result properties - - const QString& begin() const; - const QString& end() const; - RoomEvents&& chunk(); - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/notifications.cpp b/lib/jobs/generated/notifications.cpp deleted file mode 100644 index 04ad0175..00000000 --- a/lib/jobs/generated/notifications.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "notifications.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -namespace QMatrixClient -{ - // Converters - - template <> struct FromJson - { - GetNotificationsJob::Notification operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - GetNotificationsJob::Notification result; - result.actions = - fromJson>(o.value("actions")); - result.event = - fromJson(o.value("event")); - result.profileTag = - fromJson(o.value("profile_tag")); - result.read = - fromJson(o.value("read")); - result.roomId = - fromJson(o.value("room_id")); - result.ts = - fromJson(o.value("ts")); - - return result; - } - }; -} // namespace QMatrixClient - -class GetNotificationsJob::Private -{ - public: - QString nextToken; - std::vector notifications; -}; - -BaseJob::Query queryToGetNotifications(const QString& from, int limit, const QString& only) -{ - BaseJob::Query _q; - if (!from.isEmpty()) - _q.addQueryItem("from", from); - _q.addQueryItem("limit", QString("%1").arg(limit)); - if (!only.isEmpty()) - _q.addQueryItem("only", only); - return _q; -} - -QUrl GetNotificationsJob::makeRequestUrl(QUrl baseUrl, const QString& from, int limit, const QString& only) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/notifications", - queryToGetNotifications(from, limit, only)); -} - -GetNotificationsJob::GetNotificationsJob(const QString& from, int limit, const QString& only) - : BaseJob(HttpVerb::Get, "GetNotificationsJob", - basePath % "/notifications", - queryToGetNotifications(from, limit, only)) - , d(new Private) -{ -} - -GetNotificationsJob::~GetNotificationsJob() = default; - -const QString& GetNotificationsJob::nextToken() const -{ - return d->nextToken; -} - -std::vector&& GetNotificationsJob::notifications() -{ - return std::move(d->notifications); -} - -BaseJob::Status GetNotificationsJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->nextToken = fromJson(json.value("next_token")); - if (!json.contains("notifications")) - return { JsonParseError, - "The key 'notifications' not found in the response" }; - d->notifications = fromJson>(json.value("notifications")); - return Success; -} - diff --git a/lib/jobs/generated/notifications.h b/lib/jobs/generated/notifications.h deleted file mode 100644 index 428995ae..00000000 --- a/lib/jobs/generated/notifications.h +++ /dev/null @@ -1,59 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include "events/event.h" -#include -#include - -#include "converters.h" - -namespace QMatrixClient -{ - // Operations - - class GetNotificationsJob : public BaseJob - { - public: - // Inner data structures - - struct Notification - { - QVector actions; - EventPtr event; - QString profileTag; - bool read; - QString roomId; - qint64 ts; - }; - - // Construction/destruction - - explicit GetNotificationsJob(const QString& from = {}, int limit = {}, const QString& only = {}); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetNotificationsJob. This function can be used when - * a URL for GetNotificationsJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& from = {}, int limit = {}, const QString& only = {}); - - ~GetNotificationsJob() override; - - // Result properties - - const QString& nextToken() const; - std::vector&& notifications(); - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/profile.cpp b/lib/jobs/generated/profile.cpp deleted file mode 100644 index d8ddbc14..00000000 --- a/lib/jobs/generated/profile.cpp +++ /dev/null @@ -1,140 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "profile.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -SetDisplayNameJob::SetDisplayNameJob(const QString& userId, const QString& displayname) - : BaseJob(HttpVerb::Put, "SetDisplayNameJob", - basePath % "/profile/" % userId % "/displayname") -{ - QJsonObject _data; - if (!displayname.isEmpty()) - _data.insert("displayname", toJson(displayname)); - setRequestData(_data); -} - -class GetDisplayNameJob::Private -{ - public: - QString displayname; -}; - -QUrl GetDisplayNameJob::makeRequestUrl(QUrl baseUrl, const QString& userId) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/profile/" % userId % "/displayname"); -} - -GetDisplayNameJob::GetDisplayNameJob(const QString& userId) - : BaseJob(HttpVerb::Get, "GetDisplayNameJob", - basePath % "/profile/" % userId % "/displayname", false) - , d(new Private) -{ -} - -GetDisplayNameJob::~GetDisplayNameJob() = default; - -const QString& GetDisplayNameJob::displayname() const -{ - return d->displayname; -} - -BaseJob::Status GetDisplayNameJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->displayname = fromJson(json.value("displayname")); - return Success; -} - -SetAvatarUrlJob::SetAvatarUrlJob(const QString& userId, const QString& avatarUrl) - : BaseJob(HttpVerb::Put, "SetAvatarUrlJob", - basePath % "/profile/" % userId % "/avatar_url") -{ - QJsonObject _data; - if (!avatarUrl.isEmpty()) - _data.insert("avatar_url", toJson(avatarUrl)); - setRequestData(_data); -} - -class GetAvatarUrlJob::Private -{ - public: - QString avatarUrl; -}; - -QUrl GetAvatarUrlJob::makeRequestUrl(QUrl baseUrl, const QString& userId) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/profile/" % userId % "/avatar_url"); -} - -GetAvatarUrlJob::GetAvatarUrlJob(const QString& userId) - : BaseJob(HttpVerb::Get, "GetAvatarUrlJob", - basePath % "/profile/" % userId % "/avatar_url", false) - , d(new Private) -{ -} - -GetAvatarUrlJob::~GetAvatarUrlJob() = default; - -const QString& GetAvatarUrlJob::avatarUrl() const -{ - return d->avatarUrl; -} - -BaseJob::Status GetAvatarUrlJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->avatarUrl = fromJson(json.value("avatar_url")); - return Success; -} - -class GetUserProfileJob::Private -{ - public: - QString avatarUrl; - QString displayname; -}; - -QUrl GetUserProfileJob::makeRequestUrl(QUrl baseUrl, const QString& userId) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/profile/" % userId); -} - -GetUserProfileJob::GetUserProfileJob(const QString& userId) - : BaseJob(HttpVerb::Get, "GetUserProfileJob", - basePath % "/profile/" % userId, false) - , d(new Private) -{ -} - -GetUserProfileJob::~GetUserProfileJob() = default; - -const QString& GetUserProfileJob::avatarUrl() const -{ - return d->avatarUrl; -} - -const QString& GetUserProfileJob::displayname() const -{ - return d->displayname; -} - -BaseJob::Status GetUserProfileJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->avatarUrl = fromJson(json.value("avatar_url")); - d->displayname = fromJson(json.value("displayname")); - return Success; -} - diff --git a/lib/jobs/generated/profile.h b/lib/jobs/generated/profile.h deleted file mode 100644 index 9afc037b..00000000 --- a/lib/jobs/generated/profile.h +++ /dev/null @@ -1,105 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - - - -namespace QMatrixClient -{ - // Operations - - class SetDisplayNameJob : public BaseJob - { - public: - explicit SetDisplayNameJob(const QString& userId, const QString& displayname = {}); - }; - - class GetDisplayNameJob : public BaseJob - { - public: - explicit GetDisplayNameJob(const QString& userId); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetDisplayNameJob. This function can be used when - * a URL for GetDisplayNameJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId); - - ~GetDisplayNameJob() override; - - // Result properties - - const QString& displayname() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; - - class SetAvatarUrlJob : public BaseJob - { - public: - explicit SetAvatarUrlJob(const QString& userId, const QString& avatarUrl = {}); - }; - - class GetAvatarUrlJob : public BaseJob - { - public: - explicit GetAvatarUrlJob(const QString& userId); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetAvatarUrlJob. This function can be used when - * a URL for GetAvatarUrlJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId); - - ~GetAvatarUrlJob() override; - - // Result properties - - const QString& avatarUrl() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; - - class GetUserProfileJob : public BaseJob - { - public: - explicit GetUserProfileJob(const QString& userId); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetUserProfileJob. This function can be used when - * a URL for GetUserProfileJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId); - - ~GetUserProfileJob() override; - - // Result properties - - const QString& avatarUrl() const; - const QString& displayname() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/pusher.cpp b/lib/jobs/generated/pusher.cpp deleted file mode 100644 index dea7cf8b..00000000 --- a/lib/jobs/generated/pusher.cpp +++ /dev/null @@ -1,121 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "pusher.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -namespace QMatrixClient -{ - // Converters - - template <> struct FromJson - { - GetPushersJob::PusherData operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - GetPushersJob::PusherData result; - result.url = - fromJson(o.value("url")); - - return result; - } - }; - - template <> struct FromJson - { - GetPushersJob::Pusher operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - GetPushersJob::Pusher result; - result.pushkey = - fromJson(o.value("pushkey")); - result.kind = - fromJson(o.value("kind")); - result.appId = - fromJson(o.value("app_id")); - result.appDisplayName = - fromJson(o.value("app_display_name")); - result.deviceDisplayName = - fromJson(o.value("device_display_name")); - result.profileTag = - fromJson(o.value("profile_tag")); - result.lang = - fromJson(o.value("lang")); - result.data = - fromJson(o.value("data")); - - return result; - } - }; -} // namespace QMatrixClient - -class GetPushersJob::Private -{ - public: - QVector pushers; -}; - -QUrl GetPushersJob::makeRequestUrl(QUrl baseUrl) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/pushers"); -} - -GetPushersJob::GetPushersJob() - : BaseJob(HttpVerb::Get, "GetPushersJob", - basePath % "/pushers") - , d(new Private) -{ -} - -GetPushersJob::~GetPushersJob() = default; - -const QVector& GetPushersJob::pushers() const -{ - return d->pushers; -} - -BaseJob::Status GetPushersJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->pushers = fromJson>(json.value("pushers")); - return Success; -} - -namespace QMatrixClient -{ - // Converters - - QJsonObject toJson(const PostPusherJob::PusherData& pod) - { - QJsonObject o; - o.insert("url", toJson(pod.url)); - - return o; - } -} // namespace QMatrixClient - -PostPusherJob::PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag, bool append) - : BaseJob(HttpVerb::Post, "PostPusherJob", - basePath % "/pushers/set") -{ - QJsonObject _data; - _data.insert("pushkey", toJson(pushkey)); - _data.insert("kind", toJson(kind)); - _data.insert("app_id", toJson(appId)); - _data.insert("app_display_name", toJson(appDisplayName)); - _data.insert("device_display_name", toJson(deviceDisplayName)); - if (!profileTag.isEmpty()) - _data.insert("profile_tag", toJson(profileTag)); - _data.insert("lang", toJson(lang)); - _data.insert("data", toJson(data)); - _data.insert("append", toJson(append)); - setRequestData(_data); -} - diff --git a/lib/jobs/generated/pusher.h b/lib/jobs/generated/pusher.h deleted file mode 100644 index 4d99d4d0..00000000 --- a/lib/jobs/generated/pusher.h +++ /dev/null @@ -1,78 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - -#include "converters.h" - -namespace QMatrixClient -{ - // Operations - - class GetPushersJob : public BaseJob - { - public: - // Inner data structures - - struct PusherData - { - QString url; - }; - - struct Pusher - { - QString pushkey; - QString kind; - QString appId; - QString appDisplayName; - QString deviceDisplayName; - QString profileTag; - QString lang; - PusherData data; - }; - - // Construction/destruction - - explicit GetPushersJob(); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetPushersJob. This function can be used when - * a URL for GetPushersJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl); - - ~GetPushersJob() override; - - // Result properties - - const QVector& pushers() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; - - class PostPusherJob : public BaseJob - { - public: - // Inner data structures - - struct PusherData - { - QString url; - }; - - // Construction/destruction - - explicit PostPusherJob(const QString& pushkey, const QString& kind, const QString& appId, const QString& appDisplayName, const QString& deviceDisplayName, const QString& lang, const PusherData& data, const QString& profileTag = {}, bool append = {}); - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/receipts.cpp b/lib/jobs/generated/receipts.cpp deleted file mode 100644 index 945e8673..00000000 --- a/lib/jobs/generated/receipts.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "receipts.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -PostReceiptJob::PostReceiptJob(const QString& roomId, const QString& receiptType, const QString& eventId, const QJsonObject& receipt) - : BaseJob(HttpVerb::Post, "PostReceiptJob", - basePath % "/rooms/" % roomId % "/receipt/" % receiptType % "/" % eventId) -{ - setRequestData(Data(toJson(receipt))); -} - diff --git a/lib/jobs/generated/receipts.h b/lib/jobs/generated/receipts.h deleted file mode 100644 index 9eb7a489..00000000 --- a/lib/jobs/generated/receipts.h +++ /dev/null @@ -1,21 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - - -namespace QMatrixClient -{ - // Operations - - class PostReceiptJob : public BaseJob - { - public: - explicit PostReceiptJob(const QString& roomId, const QString& receiptType, const QString& eventId, const QJsonObject& receipt = {}); - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/redaction.cpp b/lib/jobs/generated/redaction.cpp deleted file mode 100644 index 0da35dfc..00000000 --- a/lib/jobs/generated/redaction.cpp +++ /dev/null @@ -1,45 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "redaction.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -class RedactEventJob::Private -{ - public: - QString eventId; -}; - -RedactEventJob::RedactEventJob(const QString& roomId, const QString& eventId, const QString& txnId, const QString& reason) - : BaseJob(HttpVerb::Put, "RedactEventJob", - basePath % "/rooms/" % roomId % "/redact/" % eventId % "/" % txnId) - , d(new Private) -{ - QJsonObject _data; - if (!reason.isEmpty()) - _data.insert("reason", toJson(reason)); - setRequestData(_data); -} - -RedactEventJob::~RedactEventJob() = default; - -const QString& RedactEventJob::eventId() const -{ - return d->eventId; -} - -BaseJob::Status RedactEventJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->eventId = fromJson(json.value("event_id")); - return Success; -} - diff --git a/lib/jobs/generated/redaction.h b/lib/jobs/generated/redaction.h deleted file mode 100644 index 974dfde5..00000000 --- a/lib/jobs/generated/redaction.h +++ /dev/null @@ -1,32 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - - - -namespace QMatrixClient -{ - // Operations - - class RedactEventJob : public BaseJob - { - public: - explicit RedactEventJob(const QString& roomId, const QString& eventId, const QString& txnId, const QString& reason = {}); - ~RedactEventJob() override; - - // Result properties - - const QString& eventId() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/room_send.cpp b/lib/jobs/generated/room_send.cpp deleted file mode 100644 index 9637a205..00000000 --- a/lib/jobs/generated/room_send.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "room_send.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -class SendMessageJob::Private -{ - public: - QString eventId; -}; - -SendMessageJob::SendMessageJob(const QString& roomId, const QString& eventType, const QString& txnId, const QJsonObject& body) - : BaseJob(HttpVerb::Put, "SendMessageJob", - basePath % "/rooms/" % roomId % "/send/" % eventType % "/" % txnId) - , d(new Private) -{ - setRequestData(Data(toJson(body))); -} - -SendMessageJob::~SendMessageJob() = default; - -const QString& SendMessageJob::eventId() const -{ - return d->eventId; -} - -BaseJob::Status SendMessageJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->eventId = fromJson(json.value("event_id")); - return Success; -} - diff --git a/lib/jobs/generated/room_send.h b/lib/jobs/generated/room_send.h deleted file mode 100644 index 370f2865..00000000 --- a/lib/jobs/generated/room_send.h +++ /dev/null @@ -1,33 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - - -namespace QMatrixClient -{ - // Operations - - class SendMessageJob : public BaseJob - { - public: - explicit SendMessageJob(const QString& roomId, const QString& eventType, const QString& txnId, const QJsonObject& body = {}); - ~SendMessageJob() override; - - // Result properties - - const QString& eventId() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/room_state.cpp b/lib/jobs/generated/room_state.cpp deleted file mode 100644 index 39f36afb..00000000 --- a/lib/jobs/generated/room_state.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "room_state.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -class SetRoomStateWithKeyJob::Private -{ - public: - QString eventId; -}; - -SetRoomStateWithKeyJob::SetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey, const QJsonObject& body) - : BaseJob(HttpVerb::Put, "SetRoomStateWithKeyJob", - basePath % "/rooms/" % roomId % "/state/" % eventType % "/" % stateKey) - , d(new Private) -{ - setRequestData(Data(toJson(body))); -} - -SetRoomStateWithKeyJob::~SetRoomStateWithKeyJob() = default; - -const QString& SetRoomStateWithKeyJob::eventId() const -{ - return d->eventId; -} - -BaseJob::Status SetRoomStateWithKeyJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->eventId = fromJson(json.value("event_id")); - return Success; -} - -class SetRoomStateJob::Private -{ - public: - QString eventId; -}; - -SetRoomStateJob::SetRoomStateJob(const QString& roomId, const QString& eventType, const QJsonObject& body) - : BaseJob(HttpVerb::Put, "SetRoomStateJob", - basePath % "/rooms/" % roomId % "/state/" % eventType) - , d(new Private) -{ - setRequestData(Data(toJson(body))); -} - -SetRoomStateJob::~SetRoomStateJob() = default; - -const QString& SetRoomStateJob::eventId() const -{ - return d->eventId; -} - -BaseJob::Status SetRoomStateJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->eventId = fromJson(json.value("event_id")); - return Success; -} - diff --git a/lib/jobs/generated/room_state.h b/lib/jobs/generated/room_state.h deleted file mode 100644 index aea32263..00000000 --- a/lib/jobs/generated/room_state.h +++ /dev/null @@ -1,51 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - - -namespace QMatrixClient -{ - // Operations - - class SetRoomStateWithKeyJob : public BaseJob - { - public: - explicit SetRoomStateWithKeyJob(const QString& roomId, const QString& eventType, const QString& stateKey, const QJsonObject& body = {}); - ~SetRoomStateWithKeyJob() override; - - // Result properties - - const QString& eventId() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; - - class SetRoomStateJob : public BaseJob - { - public: - explicit SetRoomStateJob(const QString& roomId, const QString& eventType, const QJsonObject& body = {}); - ~SetRoomStateJob() override; - - // Result properties - - const QString& eventId() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/tags.cpp b/lib/jobs/generated/tags.cpp deleted file mode 100644 index 9cd78aec..00000000 --- a/lib/jobs/generated/tags.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "tags.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -class GetRoomTagsJob::Private -{ - public: - QJsonObject tags; -}; - -QUrl GetRoomTagsJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/user/" % userId % "/rooms/" % roomId % "/tags"); -} - -GetRoomTagsJob::GetRoomTagsJob(const QString& userId, const QString& roomId) - : BaseJob(HttpVerb::Get, "GetRoomTagsJob", - basePath % "/user/" % userId % "/rooms/" % roomId % "/tags") - , d(new Private) -{ -} - -GetRoomTagsJob::~GetRoomTagsJob() = default; - -const QJsonObject& GetRoomTagsJob::tags() const -{ - return d->tags; -} - -BaseJob::Status GetRoomTagsJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->tags = fromJson(json.value("tags")); - return Success; -} - -SetRoomTagJob::SetRoomTagJob(const QString& userId, const QString& roomId, const QString& tag, const QJsonObject& body) - : BaseJob(HttpVerb::Put, "SetRoomTagJob", - basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag) -{ - setRequestData(Data(toJson(body))); -} - -QUrl DeleteRoomTagJob::makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& tag) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag); -} - -DeleteRoomTagJob::DeleteRoomTagJob(const QString& userId, const QString& roomId, const QString& tag) - : BaseJob(HttpVerb::Delete, "DeleteRoomTagJob", - basePath % "/user/" % userId % "/rooms/" % roomId % "/tags/" % tag) -{ -} - diff --git a/lib/jobs/generated/tags.h b/lib/jobs/generated/tags.h deleted file mode 100644 index f62bd7ad..00000000 --- a/lib/jobs/generated/tags.h +++ /dev/null @@ -1,61 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - - -namespace QMatrixClient -{ - // Operations - - class GetRoomTagsJob : public BaseJob - { - public: - explicit GetRoomTagsJob(const QString& userId, const QString& roomId); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetRoomTagsJob. This function can be used when - * a URL for GetRoomTagsJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId); - - ~GetRoomTagsJob() override; - - // Result properties - - const QJsonObject& tags() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; - - class SetRoomTagJob : public BaseJob - { - public: - explicit SetRoomTagJob(const QString& userId, const QString& roomId, const QString& tag, const QJsonObject& body = {}); - }; - - class DeleteRoomTagJob : public BaseJob - { - public: - explicit DeleteRoomTagJob(const QString& userId, const QString& roomId, const QString& tag); - - /** Construct a URL out of baseUrl and usual parameters passed to - * DeleteRoomTagJob. This function can be used when - * a URL for DeleteRoomTagJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl, const QString& userId, const QString& roomId, const QString& tag); - - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/third_party_membership.cpp b/lib/jobs/generated/third_party_membership.cpp deleted file mode 100644 index b637d481..00000000 --- a/lib/jobs/generated/third_party_membership.cpp +++ /dev/null @@ -1,25 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "third_party_membership.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -InviteBy3PIDJob::InviteBy3PIDJob(const QString& roomId, const QString& idServer, const QString& medium, const QString& address) - : BaseJob(HttpVerb::Post, "InviteBy3PIDJob", - basePath % "/rooms/" % roomId % "/invite") -{ - QJsonObject _data; - _data.insert("id_server", toJson(idServer)); - _data.insert("medium", toJson(medium)); - _data.insert("address", toJson(address)); - setRequestData(_data); -} - diff --git a/lib/jobs/generated/third_party_membership.h b/lib/jobs/generated/third_party_membership.h deleted file mode 100644 index c7b5214e..00000000 --- a/lib/jobs/generated/third_party_membership.h +++ /dev/null @@ -1,20 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - - - -namespace QMatrixClient -{ - // Operations - - class InviteBy3PIDJob : public BaseJob - { - public: - explicit InviteBy3PIDJob(const QString& roomId, const QString& idServer, const QString& medium, const QString& address); - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/to_device.cpp b/lib/jobs/generated/to_device.cpp deleted file mode 100644 index e893fa44..00000000 --- a/lib/jobs/generated/to_device.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "to_device.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -SendToDeviceJob::SendToDeviceJob(const QString& eventType, const QString& txnId, const QHash>& messages) - : BaseJob(HttpVerb::Put, "SendToDeviceJob", - basePath % "/sendToDevice/" % eventType % "/" % txnId) -{ - QJsonObject _data; - _data.insert("messages", toJson(messages)); - setRequestData(_data); -} - diff --git a/lib/jobs/generated/to_device.h b/lib/jobs/generated/to_device.h deleted file mode 100644 index f5910e44..00000000 --- a/lib/jobs/generated/to_device.h +++ /dev/null @@ -1,22 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include -#include - - -namespace QMatrixClient -{ - // Operations - - class SendToDeviceJob : public BaseJob - { - public: - explicit SendToDeviceJob(const QString& eventType, const QString& txnId, const QHash>& messages = {}); - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/typing.cpp b/lib/jobs/generated/typing.cpp deleted file mode 100644 index fa700290..00000000 --- a/lib/jobs/generated/typing.cpp +++ /dev/null @@ -1,24 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "typing.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -SetTypingJob::SetTypingJob(const QString& userId, const QString& roomId, bool typing, int timeout) - : BaseJob(HttpVerb::Put, "SetTypingJob", - basePath % "/rooms/" % roomId % "/typing/" % userId) -{ - QJsonObject _data; - _data.insert("typing", toJson(typing)); - _data.insert("timeout", toJson(timeout)); - setRequestData(_data); -} - diff --git a/lib/jobs/generated/typing.h b/lib/jobs/generated/typing.h deleted file mode 100644 index 0495ed0a..00000000 --- a/lib/jobs/generated/typing.h +++ /dev/null @@ -1,20 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - - - -namespace QMatrixClient -{ - // Operations - - class SetTypingJob : public BaseJob - { - public: - explicit SetTypingJob(const QString& userId, const QString& roomId, bool typing, int timeout = {}); - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/users.cpp b/lib/jobs/generated/users.cpp deleted file mode 100644 index fd2944e4..00000000 --- a/lib/jobs/generated/users.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "users.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -namespace QMatrixClient -{ - // Converters - - template <> struct FromJson - { - SearchUserDirectoryJob::User operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - SearchUserDirectoryJob::User result; - result.userId = - fromJson(o.value("user_id")); - result.displayName = - fromJson(o.value("display_name")); - result.avatarUrl = - fromJson(o.value("avatar_url")); - - return result; - } - }; -} // namespace QMatrixClient - -class SearchUserDirectoryJob::Private -{ - public: - QVector results; - bool limited; -}; - -SearchUserDirectoryJob::SearchUserDirectoryJob(const QString& searchTerm, int limit) - : BaseJob(HttpVerb::Post, "SearchUserDirectoryJob", - basePath % "/user_directory/search") - , d(new Private) -{ - QJsonObject _data; - _data.insert("search_term", toJson(searchTerm)); - _data.insert("limit", toJson(limit)); - setRequestData(_data); -} - -SearchUserDirectoryJob::~SearchUserDirectoryJob() = default; - -const QVector& SearchUserDirectoryJob::results() const -{ - return d->results; -} - -bool SearchUserDirectoryJob::limited() const -{ - return d->limited; -} - -BaseJob::Status SearchUserDirectoryJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - if (!json.contains("results")) - return { JsonParseError, - "The key 'results' not found in the response" }; - d->results = fromJson>(json.value("results")); - if (!json.contains("limited")) - return { JsonParseError, - "The key 'limited' not found in the response" }; - d->limited = fromJson(json.value("limited")); - return Success; -} - diff --git a/lib/jobs/generated/users.h b/lib/jobs/generated/users.h deleted file mode 100644 index fa0d4335..00000000 --- a/lib/jobs/generated/users.h +++ /dev/null @@ -1,46 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - -#include "converters.h" - -namespace QMatrixClient -{ - // Operations - - class SearchUserDirectoryJob : public BaseJob - { - public: - // Inner data structures - - struct User - { - QString userId; - QString displayName; - QString avatarUrl; - }; - - // Construction/destruction - - explicit SearchUserDirectoryJob(const QString& searchTerm, int limit = {}); - ~SearchUserDirectoryJob() override; - - // Result properties - - const QVector& results() const; - bool limited() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/versions.cpp b/lib/jobs/generated/versions.cpp deleted file mode 100644 index 7b55b94f..00000000 --- a/lib/jobs/generated/versions.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "versions.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client"); - -class GetVersionsJob::Private -{ - public: - QStringList versions; -}; - -QUrl GetVersionsJob::makeRequestUrl(QUrl baseUrl) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/versions"); -} - -GetVersionsJob::GetVersionsJob() - : BaseJob(HttpVerb::Get, "GetVersionsJob", - basePath % "/versions", false) - , d(new Private) -{ -} - -GetVersionsJob::~GetVersionsJob() = default; - -const QStringList& GetVersionsJob::versions() const -{ - return d->versions; -} - -BaseJob::Status GetVersionsJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - d->versions = fromJson(json.value("versions")); - return Success; -} - diff --git a/lib/jobs/generated/versions.h b/lib/jobs/generated/versions.h deleted file mode 100644 index 4fe8d9d0..00000000 --- a/lib/jobs/generated/versions.h +++ /dev/null @@ -1,41 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - -#include - - -namespace QMatrixClient -{ - // Operations - - class GetVersionsJob : public BaseJob - { - public: - explicit GetVersionsJob(); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetVersionsJob. This function can be used when - * a URL for GetVersionsJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl); - - ~GetVersionsJob() override; - - // Result properties - - const QStringList& versions() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/generated/whoami.cpp b/lib/jobs/generated/whoami.cpp deleted file mode 100644 index 4c231b5f..00000000 --- a/lib/jobs/generated/whoami.cpp +++ /dev/null @@ -1,50 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#include "whoami.h" - -#include "converters.h" - -#include - -using namespace QMatrixClient; - -static const auto basePath = QStringLiteral("/_matrix/client/r0"); - -class GetTokenOwnerJob::Private -{ - public: - QString userId; -}; - -QUrl GetTokenOwnerJob::makeRequestUrl(QUrl baseUrl) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath % "/account/whoami"); -} - -GetTokenOwnerJob::GetTokenOwnerJob() - : BaseJob(HttpVerb::Get, "GetTokenOwnerJob", - basePath % "/account/whoami") - , d(new Private) -{ -} - -GetTokenOwnerJob::~GetTokenOwnerJob() = default; - -const QString& GetTokenOwnerJob::userId() const -{ - return d->userId; -} - -BaseJob::Status GetTokenOwnerJob::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - if (!json.contains("user_id")) - return { JsonParseError, - "The key 'user_id' not found in the response" }; - d->userId = fromJson(json.value("user_id")); - return Success; -} - diff --git a/lib/jobs/generated/whoami.h b/lib/jobs/generated/whoami.h deleted file mode 100644 index 2b0e7375..00000000 --- a/lib/jobs/generated/whoami.h +++ /dev/null @@ -1,40 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ - -#pragma once - -#include "../basejob.h" - - - -namespace QMatrixClient -{ - // Operations - - class GetTokenOwnerJob : public BaseJob - { - public: - explicit GetTokenOwnerJob(); - - /** Construct a URL out of baseUrl and usual parameters passed to - * GetTokenOwnerJob. This function can be used when - * a URL for GetTokenOwnerJob is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl); - - ~GetTokenOwnerJob() override; - - // Result properties - - const QString& userId() const; - - protected: - Status parseJson(const QJsonDocument& data) override; - - private: - class Private; - QScopedPointer d; - }; -} // namespace QMatrixClient diff --git a/lib/jobs/gtad.yaml b/lib/jobs/gtad.yaml deleted file mode 100644 index 7f6a97e0..00000000 --- a/lib/jobs/gtad.yaml +++ /dev/null @@ -1,139 +0,0 @@ -analyzer: - subst: - "%CLIENT_RELEASE_LABEL%": r0 - "%CLIENT_MAJOR_VERSION%": r0 - identifiers: - signed: signedData - unsigned: unsignedData - default: isDefault - origin_server_ts: originServerTimestamp # Instead of originServerTs - start: begin # Because start() is a method in BaseJob - - types: - # Structure: - # swaggerType: - # OR - # swaggerType: - # - swaggerFormat: - # - /swaggerFormatRegEx/: - # - //: # default, if the format doesn't mach anything above - # WHERE - # targetTypeSpec = targetType OR - # { type: targetType, imports: , } - integer: - - int64: qint64 - - int32: qint32 - - //: int - number: - - float: float - - //: double - boolean: { type: bool, initializer: false } - string: - - byte: &ByteStream - type: QIODevice* - #initializer: '"{{defaultValue}}"' - #string?: true - imports: - - binary: *ByteStream - - date: - type: QDate - initializer: QDate::fromString("{{defaultValue}}") - avoidCopy?: true - imports: - - dateTime: - type: QDateTime - initializer: QDateTime::fromString("{{defaultValue}}") - avoidCopy?: true - imports: - - //: - type: QString - initializer: QStringLiteral("{{defaultValue}}") - string?: true - avoidCopy?: true - file: *ByteStream - object: - - /m\.room\.member$/: # A stub for EventsBatch - - /state_event.yaml$/: - type: StateEventPtr - noCopy?: true - imports: '"events/event.h"' - - /room_event.yaml$/: - type: RoomEventPtr - noCopy?: true - imports: '"events/event.h"' - - /event.yaml$/: - type: EventPtr - noCopy?: true - imports: '"events/event.h"' - - //: - type: QJsonObject - avoidCopy?: true - imports: - array: - - string: - type: QStringList - avoidCopy?: true - imports: - - /^Notification|Result$/: - type: "std::vector<{{1}}>" - noCopy?: true - imports: '"events/event.h"' - - /m\.room\.member$/: - type: "EventsArray" - noCopy?: true - imports: '"events/roommemberevent.h"' - - /state_event.yaml$/: - type: StateEvents - noCopy?: true - - /room_event.yaml$/: - type: RoomEvents - noCopy?: true - - /event.yaml$/: - type: Events - noCopy?: true - - /.+/: - type: "QVector<{{1}}>" - avoidCopy?: true - imports: - - //: { type: QJsonArray, "avoidCopy?": true, imports: } - map: - - RoomState: - type: "std::unordered_map" - noCopy?: true - imports: - - /.+/: - type: "QHash" - avoidCopy?: true - imports: - - //: - type: QVariantHash - avoidCopy?: true - imports: - variant: { type: QVariant, "avoidCopy?": true, imports: } - schema: # Properties of inline structure definitions - avoidCopy?: true - - #operations: - -mustache: - definitions: - _scopeRenderer: "{{scopeCamelCase}}Job::" - _literalQuote: '"' - maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}{{#noCopy?}}&&{{/noCopy?}}" - qualifiedMaybeCrefType: - "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}{{#noCopy?}}&&{{/noCopy?}}" - initializeDefaultValue: "{{#defaultValue}}{{>initializer}}{{/defaultValue}}{{^defaultValue}}{}{{/defaultValue}}" - joinedParamDecl: '{{>maybeCrefType}} {{paramName}}{{^required?}} = {{>initializeDefaultValue}}{{/required?}}{{#@join}}, {{/@join}}' - joinedParamDef: '{{>maybeCrefType}} {{paramName}}{{#@join}}, {{/@join}}' - passQueryParams: '{{#queryParams}}{{paramName}}{{#@join}}, {{/@join}}{{/queryParams}}' - paramToString: '{{#string?}}{{nameCamelCase}}{{/string?}}{{^string?}}QString("%1").arg({{nameCamelCase}}){{/string?}}' - # preamble: preamble.mustache - copyrightName: Kitsune Ral - copyrightEmail: - - templates: - - "{{base}}.h.mustache" - - "{{base}}.cpp.mustache" - - #outFilesList: apifiles.txt - diff --git a/lib/jobs/mediathumbnailjob.h b/lib/jobs/mediathumbnailjob.h index 6e0b94f3..7963796e 100644 --- a/lib/jobs/mediathumbnailjob.h +++ b/lib/jobs/mediathumbnailjob.h @@ -18,7 +18,7 @@ #pragma once -#include "generated/content-repo.h" +#include "csapi/content-repo.h" #include diff --git a/lib/jobs/preamble.mustache b/lib/jobs/preamble.mustache deleted file mode 100644 index 3ba87d61..00000000 --- a/lib/jobs/preamble.mustache +++ /dev/null @@ -1,3 +0,0 @@ -/****************************************************************************** - * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN - */ diff --git a/lib/jobs/{{base}}.cpp.mustache b/lib/jobs/{{base}}.cpp.mustache deleted file mode 100644 index d3726f1e..00000000 --- a/lib/jobs/{{base}}.cpp.mustache +++ /dev/null @@ -1,121 +0,0 @@ -{{#@filePartial}}preamble{{/@filePartial}} -#include "{{filenameBase}}.h" -{{^allModels}} -#include "converters.h" -{{/allModels}}{{#operations}} -{{#producesNonJson?}}#include -{{/producesNonJson?}}#include -{{/operations}} -using namespace QMatrixClient; -{{#models.model}}{{#in?}} -QJsonObject QMatrixClient::toJson(const {{qualifiedName}}& pod) -{ - QJsonObject o; -{{#vars}} o.insert("{{baseName}}", toJson(pod.{{nameCamelCase}})); -{{/vars}} - return o; -} -{{/in?}}{{#out?}} -{{qualifiedName}} FromJson<{{qualifiedName}}>::operator()(const QJsonValue& jv) -{ - const auto& o = jv.toObject(); - {{qualifiedName}} result; - {{#vars}}result.{{nameCamelCase}} = - fromJson<{{dataType.name}}>(o.value("{{baseName}}")); - {{/vars}} - return result; -} -{{/out?}}{{/models.model}}{{#operations}} -static const auto basePath = QStringLiteral("{{basePathWithoutHost}}"); -{{# operation}}{{#models}} -namespace QMatrixClient -{ - // Converters -{{#model}}{{#in?}} - QJsonObject toJson(const {{qualifiedName}}& pod) - { - QJsonObject o; -{{#vars}} o.insert("{{baseName}}", toJson(pod.{{nameCamelCase}})); -{{/vars}} - return o; - } -{{/in?}}{{#out?}} - template <> struct FromJson<{{qualifiedName}}> - { - {{qualifiedName}} operator()(const QJsonValue& jv) - { - const auto& o = jv.toObject(); - {{qualifiedName}} result; -{{#vars}} result.{{nameCamelCase}} = - fromJson<{{dataType.qualifiedName}}>(o.value("{{baseName}}")); -{{/vars}} - return result; - } - }; -{{/out?}}{{/model}}} // namespace QMatrixClient -{{/ models}}{{#responses}}{{#normalResponse?}}{{#allProperties?}} -class {{camelCaseOperationId}}Job::Private -{ - public:{{#allProperties}} - {{dataType.name}} {{paramName}};{{/allProperties}} -}; -{{/ allProperties?}}{{/normalResponse?}}{{/responses}}{{#queryParams?}} -BaseJob::Query queryTo{{camelCaseOperationId}}({{#queryParams}}{{>joinedParamDef}}{{/queryParams}}) -{ - BaseJob::Query _q;{{#queryParams}} -{{^required?}}{{#string?}} if (!{{nameCamelCase}}.isEmpty()) - {{/string?}}{{/required?}} _q.addQueryItem("{{baseName}}", {{>paramToString}});{{/queryParams}} - return _q; -} -{{/queryParams?}}{{^bodyParams}} -QUrl {{camelCaseOperationId}}Job::makeRequestUrl(QUrl baseUrl{{#allParams?}}, {{#allParams}}{{>joinedParamDef}}{{/allParams}}{{/allParams?}}) -{ - return BaseJob::makeRequestUrl(std::move(baseUrl), - basePath{{#pathParts}} % {{_}}{{/pathParts}}{{#queryParams?}}, - queryTo{{camelCaseOperationId}}({{>passQueryParams}}){{/queryParams?}}); -} -{{/ bodyParams}} -{{camelCaseOperationId}}Job::{{camelCaseOperationId}}Job({{#allParams}}{{>joinedParamDef}}{{/allParams}}) - : BaseJob(HttpVerb::{{#@cap}}{{#@tolower}}{{httpMethod}}{{/@tolower}}{{/@cap}}, "{{camelCaseOperationId}}Job", - basePath{{#pathParts}} % {{_}}{{/pathParts}}{{#queryParams?}}, - queryTo{{camelCaseOperationId}}({{>passQueryParams}}){{/queryParams?}}{{#skipAuth}}{{#queryParams?}}, - {}{{/queryParams?}}, false{{/skipAuth}}){{#responses}}{{#normalResponse?}}{{#allProperties?}} - , d(new Private){{/allProperties?}}{{/normalResponse?}}{{/responses}} -{ -{{#headerParams?}}{{#headerParams}} setRequestHeader("{{baseName}}", {{paramName}}.toLatin1()); -{{/headerParams}} -{{/headerParams? -}}{{#bodyParams? -}}{{#inlineBody}} setRequestData(Data({{! - }}{{#consumesNonJson?}}{{nameCamelCase}}{{/consumesNonJson? - }}{{^consumesNonJson?}}toJson({{nameCamelCase}}){{/consumesNonJson?}}));{{/inlineBody -}}{{^inlineBody}} QJsonObject _data;{{#bodyParams}} -{{^required?}}{{#string?}} if (!{{paramName}}.isEmpty()) - {{/string?}}{{/required?}} _data.insert("{{baseName}}", toJson({{paramName}}));{{/bodyParams}} - setRequestData(_data);{{/inlineBody}} -{{/bodyParams?}}{{#producesNonJson?}} setExpectedContentTypes({ {{#produces}}"{{_}}"{{#@join}}, {{/@join}}{{/produces}} }); -{{/producesNonJson?}}}{{!<- mind the actual brace}} -{{# responses}}{{#normalResponse?}}{{#allProperties?}} -{{camelCaseOperationId}}Job::~{{camelCaseOperationId}}Job() = default; -{{# allProperties}} -{{>qualifiedMaybeCrefType}} {{camelCaseOperationId}}Job::{{paramName}}(){{^noCopy?}} const{{/noCopy?}} -{ - return {{#noCopy?}}std::move({{/noCopy?}}d->{{paramName}}{{#noCopy?}}){{/noCopy?}}; -} -{{/ allProperties}}{{#producesNonJson?}} -BaseJob::Status {{camelCaseOperationId}}Job::parseReply(QNetworkReply* reply) -{ - {{#headers}}d->{{paramName}} = reply->rawHeader("{{baseName}}"); {{! We don't check for required headers yet }} - {{/headers}}{{#properties}}d->{{paramName}} = reply;{{/properties}} - return Success; -}{{/ producesNonJson?}}{{^producesNonJson?}} -BaseJob::Status {{camelCaseOperationId}}Job::parseJson(const QJsonDocument& data) -{ - auto json = data.object(); - {{# properties}}{{#required?}}if (!json.contains("{{baseName}}")) - return { JsonParseError, - "The key '{{baseName}}' not found in the response" }; - {{/required?}}d->{{paramName}} = fromJson<{{dataType.name}}>(json.value("{{baseName}}")); - {{/ properties}}return Success; -}{{/ producesNonJson?}} -{{/allProperties?}}{{/normalResponse?}}{{/responses}}{{/operation}}{{/operations}} diff --git a/lib/jobs/{{base}}.h.mustache b/lib/jobs/{{base}}.h.mustache deleted file mode 100644 index e4f45d85..00000000 --- a/lib/jobs/{{base}}.h.mustache +++ /dev/null @@ -1,63 +0,0 @@ -{{#@filePartial}}preamble{{/@filePartial}} -#pragma once - -{{#operations}}#include "../basejob.h" -{{/operations}} -{{#imports}}#include {{_}} -{{/imports}} -{{#allModels}}#include "converters.h" -{{/allModels}} -namespace QMatrixClient -{ -{{#models}} // Data structures -{{# model}} - struct {{name}}{{#parents?}} : {{#parents}}{{name}}{{#@join}}, {{/@join}}{{/parents}}{{/parents?}} - { -{{#vars}} {{dataType.name}} {{nameCamelCase}}; -{{/vars}} }; -{{#in?}} - QJsonObject toJson(const {{name}}& pod); -{{/in?}}{{#out?}} - template <> struct FromJson<{{name}}> - { - {{name}} operator()(const QJsonValue& jv); - }; -{{/ out?}}{{/model}} -{{/models}}{{#operations}} // Operations -{{# operation}} - class {{camelCaseOperationId}}Job : public BaseJob - { - public:{{#models}} - // Inner data structures -{{# model}} - struct {{name}}{{#parents?}} : {{#parents}}{{name}}{{#@join}}, {{/@join}}{{/parents}}{{/parents?}} - { -{{#vars}} {{dataType.name}} {{nameCamelCase}}; -{{/vars}} }; -{{/ model}} - // Construction/destruction -{{/ models}} - explicit {{camelCaseOperationId}}Job({{#allParams}}{{>joinedParamDecl}}{{/allParams}});{{^bodyParams}} - - /** Construct a URL out of baseUrl and usual parameters passed to - * {{camelCaseOperationId}}Job. This function can be used when - * a URL for {{camelCaseOperationId}}Job is necessary but the job - * itself isn't. - */ - static QUrl makeRequestUrl(QUrl baseUrl{{#allParams?}}, {{#allParams}}{{>joinedParamDecl}}{{/allParams}}{{/allParams?}}); -{{/bodyParams}}{{# responses}}{{#normalResponse?}}{{#allProperties?}} - ~{{camelCaseOperationId}}Job() override; - - // Result properties -{{#allProperties}} - {{>maybeCrefType}} {{paramName}}(){{^noCopy?}} const{{/noCopy?}};{{/allProperties}} - - protected: - Status {{#producesNonJson?}}parseReply(QNetworkReply* reply){{/producesNonJson?}}{{^producesNonJson?}}parseJson(const QJsonDocument& data){{/producesNonJson?}} override; - - private: - class Private; - QScopedPointer d;{{/allProperties?}}{{/normalResponse?}}{{/responses}} - }; -{{/operation}}{{/operations}}{{!skip EOL -}}} // namespace QMatrixClient diff --git a/lib/room.cpp b/lib/room.cpp index 2ec5a591..5f2e3088 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -18,15 +18,15 @@ #include "room.h" -#include "jobs/generated/kicking.h" -#include "jobs/generated/inviting.h" -#include "jobs/generated/banning.h" -#include "jobs/generated/leaving.h" -#include "jobs/generated/receipts.h" -#include "jobs/generated/redaction.h" -#include "jobs/generated/account-data.h" -#include "jobs/generated/message_pagination.h" -#include "jobs/generated/room_state.h" +#include "csapi/kicking.h" +#include "csapi/inviting.h" +#include "csapi/banning.h" +#include "csapi/leaving.h" +#include "csapi/receipts.h" +#include "csapi/redaction.h" +#include "csapi/account-data.h" +#include "csapi/message_pagination.h" +#include "csapi/room_state.h" #include "events/simplestateevents.h" #include "events/roomavatarevent.h" #include "events/roommemberevent.h" diff --git a/lib/user.cpp b/lib/user.cpp index 5c380424..025d669c 100644 --- a/lib/user.cpp +++ b/lib/user.cpp @@ -23,9 +23,9 @@ #include "avatar.h" #include "events/event.h" #include "events/roommemberevent.h" -#include "jobs/generated/room_state.h" -#include "jobs/generated/profile.h" -#include "jobs/generated/content-repo.h" +#include "csapi/room_state.h" +#include "csapi/profile.h" +#include "csapi/content-repo.h" #include #include diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri index 3aa419bb..4085e84d 100644 --- a/libqmatrixclient.pri +++ b/libqmatrixclient.pri @@ -38,8 +38,8 @@ HEADERS += \ $$SRCPATH/jobs/mediathumbnailjob.h \ $$SRCPATH/jobs/downloadfilejob.h \ $$SRCPATH/jobs/postreadmarkersjob.h \ - $$files($$SRCPATH/jobs/generated/*.h, false) \ - $$files($$SRCPATH/jobs/generated/definitions/*.h, false) \ + $$files($$SRCPATH/csapi/*.h, false) \ + $$files($$SRCPATH/csapi/definitions/*.h, false) \ $$SRCPATH/logging.h \ $$SRCPATH/settings.h \ $$SRCPATH/networksettings.h \ @@ -67,8 +67,8 @@ SOURCES += \ $$SRCPATH/jobs/syncjob.cpp \ $$SRCPATH/jobs/mediathumbnailjob.cpp \ $$SRCPATH/jobs/downloadfilejob.cpp \ - $$files($$SRCPATH/jobs/generated/*.cpp, false) \ - $$files($$SRCPATH/jobs/generated/definitions/*.cpp, false) \ + $$files($$SRCPATH/csapi/*.cpp, false) \ + $$files($$SRCPATH/csapi/definitions/*.cpp, false) \ $$SRCPATH/logging.cpp \ $$SRCPATH/settings.cpp \ $$SRCPATH/networksettings.cpp \ -- cgit v1.2.3 From dad4eb9b3af7e550d1030d1d0340881508f473f6 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 5 May 2018 18:41:15 +0900 Subject: README.md: cleaning up captions [skip ci] --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 471e5f5a..739cb4ba 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The source code is hosted at GitHub: https://github.com/QMatrixClient/libqmatrix Tags starting with `v` represent released versions; `rc` mark release candidates. -## Pre-requisites +### Pre-requisites - a Linux, OSX or Windows system (desktop versions tried; Ubuntu Touch is known to work; mobile Windows and iOS might work too but never tried) - For Ubuntu flavours - zesty or later (or a derivative) is good enough out of the box; older ones will need PPAs at least for a newer Qt; in particular, if you have xenial you're advised to add Kubuntu Backports PPA for it - a Git client to check out this repo @@ -44,8 +44,8 @@ Just install things from the list above using your preferred package manager. If There are no official MinGW-based 64-bit packages for Qt. If you're determined to build a 64-bit library, either use a Visual Studio toolchain or build Qt5 yourself as described in Qt documentation. -## Build -### CMake-based +### Building +#### CMake-based In the root directory of the project sources: ``` mkdir build_dir @@ -61,7 +61,7 @@ cmake --build . --target install ``` This will also install cmake package config files; once this is done, you can use `examples/CMakeLists.txt` to compile the example with the _installed_ library. This file is a good starting point for your own CMake-based project using libQMatrixClient. -### qmake-based +#### qmake-based The library provides a .pri file with an intention to be included from a bigger project's .pro file. As a starting point you can use `qmc-example.pro` that will build a minimal example of library usage for you. In the root directory of the project sources: ``` qmake qmc-example.pro @@ -84,6 +84,8 @@ CMake Warning at CMakeLists.txt:11 (find_package): ``` ...then you need to set the right `-DCMAKE_PREFIX_PATH` variable, see above. +#### Logging configuration + libqmatrixclient uses Qt's logging categories to make switching certain types of logging easier. In case of troubles at runtime (bugs, crashes) you can increase logging if you add the following to the `QT_LOGGING_RULES` environment variable: ``` libqmatrixclient..= -- cgit v1.2.3 From a63838235134b066c092ad98e1f18ff7991c91c1 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 5 May 2018 18:42:10 +0900 Subject: CONTRIBUTING.md: add a section about using GTAD [skip ci] --- CONTRIBUTING.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6ad968ec..2736dfef 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -108,6 +108,42 @@ We will gladly give credit to anyone who reports a vulnerability so that we can The code should strive to be DRY (don't repeat yourself), clear, and obviously correct. Some technical debt is inevitable, just don't bankrupt us with it. Refactoring is welcome. +### Generated C++ code for CS API +The code in lib/csapi, although it resides in Git, is actually generated from the official Matrix Swagger/OpenAPI definition files. If you're unhappy with something in that directory and want to improve the code, you have to understand the way these files are produced and setup some additional tooling. The shortest possible procedure resembling the below text can be found in .travis.yml (our Travis CI configuration actually regenerates those files upon every build). The generating sequence only works with CMake atm; patches to enable it with qmake are (you guessed it) very welcome. + +#### Why generate the code at all? +Because before both original authors of libQMatrixClient had to do monkey business of writing boilerplate code, with the same patterns, types etc., literally, for every single API endpoint, and one of the authors got fed up with it at some point in time. By then about 15 job classes were written; the entire API counts about 100 endpoints. Besides, the existing jobs had to be updated according to changes in CS API that have been, and will keep coming. Other considerations can be found in [this talk about API description languages that briefly touches on GTAD](https://youtu.be/W5TmRozH-rg). + +#### Prerequisites for CS API code generation +1. Get the source code of GTAD and its dependencies, e.g. using the command: `git clone --recursive https://github.com/KitsuneRal/gtad.git` +2. Build GTAD: in the source code directory, do `cmake . && cmake --build .` (you might need to pass `-DCMAKE_PREFIX_PATH=`, similar to libQMatrixClient itself). +3. Get the Matrix CS API definitions that are included in the matrix-doc repo: `git clone https://github.com/QMatrixClient/matrix-doc.git` (QMatrixClient/matrix-doc is a fork that's known to produce working code; you may want to use your own fork if you wish to alter something in the API). + +#### Generating lib/csapi contents +1. Pass additional configuration to CMake when configuring libQMatrixClient, namely: `-DMATRIX_DOC_PATH= -DGTAD_PATH=`. If everything's right, these two CMake variables will be mentioned in CMake output and will trigger configuration of an additional build target, see the next step. +2. Generate the code: `cmake --build --target update-api`; if you use CMake with GNU Make, you can just do `make update-api` instead. Building this target will create (overwriting without warning) .h and .cpp files in lib/csapi directory for all YAML files it can find in `matrix-doc/api/client-server`. +3. Once you've done that, you can build the library as usual. + +#### Changing things in lib/csapi +See the more detailed description of what GTAD is and how it works in the documentation on GTAD in its source repo. Only parts specific for libQMatrixClient are described here. + +GTAD uses the following three kinds of sources: +1. OpenAPI files. Each file is treated as a separate source (because this is how GTAD works now). +2. A configuration file, in our case it's lib/csapi/gtad.yaml - this one is common for the whole API. +3. Source code template files: lib/csapi/{{base}}.*.mustache - also common. + +The mustache files have a templated (not in C++ sense) definition of a network job, deriving from BaseJob; each job class is prepended, if necessary, with data structure definitions used by this job. The look of those files is hideous for a newcomer; the fact that there's no highlighter for the combination of Mustache (originally a web templating language) and C++ doesn't help things, either. To slightly simplify things some more or less generic constructs are defined in gtad.yaml (see its "mustache:" section). Adventurous souls that would like to figure what's going on in these files should speak up in the libQMatrixClient room - I (Kitsune) will be very glad to help you out. + +The types map in gtad.yaml is the central switchboard when it comes to matching OpenAPI types with C++ (and Qt) ones. It uses the following type attributes aside from pretty obvious "imports:": +* `avoidCopy?` - this attribute defines whether a const ref should be used instead of a value. For basic types like int this is obviously unnecessary; but compound types like `QVector` should rather be taken by reference when possible. +* `noCopy?` - some types are not copyable at all and must be moved instead (an obvious example is anything "tainted" with a member of type `std::unique_ptr<>`). The template will use `T&&` instead of `T` or `const T&` to pass such types around. +* `initializer` - this is a _partial_ (see Mustache documentation for explanations but basically it's a macro that allows Mustache in itself and substitutes Mustache macros when it is substituted by the Mustache processor) that specifies how exactly a default value should be passed to the parameter. E.g., a default value for a `QString` parameter is enclosed into `QStringLiteral`. +* `string?` - indicates that the type has an interface similar to that of `QString`; it is used in the template to test parameters of those types for emptiness and skip insertion of them into request payloads so that the server is not confused with existing JSON keys (`/login` is notably picky about that). + +Instead of relying on the event structure definition in the OpenAPI files, gtad.yaml uses pointers to libQMatrixClient's event structures: `EventPtr`, `RoomEventPtr` and `StateEventPtr`. Respectively, arrays of events, when encountered in OpenAPI definitions, are converted to `Events`, `RoomEvents` and `StateEvents` containers. When there's no way to figure the type from the definition, an opaque `QJsonObject` is used, leaving the conversion to the library and/or client code. Similarly, when the inner type of an array is unknown, `QJsonArray` is exposed into the library interface. + +Although GTAD is now engaged to generate (almost) the entire set of CS API calls (except `/sync` - the hand-written implementation is still better for this particular one), not all files are added to Git. In general, the rule is that only files "looking good enough" are added to Git (and therefore become a part of the official library API); but some of the calls still receive, or return, opaque `QJsonObject` or `QJsonArray` even when the original API definition is elaborate enough because GTAD still doesn't convert some OpenAPI constructs. The work is ongoing to bring those onboard (either by further development on GTAD or by extending the configuration in `gtad.yaml`). + ### Library API and doc-comments Whenever you add a new call to the library API that you expect to be used from client code, you must supply a proper doc-comment along with the call. Doxygen (with backslashes) style is preferred. You can find that some parts of the code still use JavaDoc (with @'s) style; feel free to replace it with Doxygen backslashes if that bothers you. -- cgit v1.2.3