Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 8 insertions, 61 deletions

diff --git a/lib/csapi/users.cpp b/lib/csapi/users.cpp
index 97d8962d..a0279d7e 100644
--- a/lib/csapi/users.cpp
+++ b/lib/csapi/users.cpp
@@ -4,72 +4,19 @@
 
 #include "users.h"
 
-#include "converters.h"
-
 #include <QtCore/QStringBuilder>
 
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-namespace QMatrixClient
-{
-    // Converters
-
-    template <> struct JsonObjectConverter<SearchUserDirectoryJob::User>
-    {
-        static void fillFrom(const QJsonObject& jo, SearchUserDirectoryJob::User& result)
-        {
-            fromJson(jo.value("user_id"_ls), result.userId);
-            fromJson(jo.value("display_name"_ls), result.displayName);
-            fromJson(jo.value("avatar_url"_ls), result.avatarUrl);
-        }
-    };
-} // namespace QMatrixClient
+using namespace Quotient;
 
-class SearchUserDirectoryJob::Private
-{
-    public:
-        QVector<User> results;
-        bool limited;
-};
-
-static const auto SearchUserDirectoryJobName = QStringLiteral("SearchUserDirectoryJob");
-
-SearchUserDirectoryJob::SearchUserDirectoryJob(const QString& searchTerm, Omittable<int> limit)
-    : BaseJob(HttpVerb::Post, SearchUserDirectoryJobName,
-        basePath % "/user_directory/search")
-    , d(new Private)
+SearchUserDirectoryJob::SearchUserDirectoryJob(const QString& searchTerm,
+                                               Omittable<int> limit)
+    : BaseJob(HttpVerb::Post, QStringLiteral("SearchUserDirectoryJob"),
+              QStringLiteral("/_matrix/client/r0") % "/user_directory/search")
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("search_term"), searchTerm);
     addParam<IfNotEmpty>(_data, QStringLiteral("limit"), limit);
-    setRequestData(_data);
+    setRequestData(std::move(_data));
+    addExpectedKey("results");
+    addExpectedKey("limited");
 }
-
-SearchUserDirectoryJob::~SearchUserDirectoryJob() = default;
-
-const QVector<SearchUserDirectoryJob::User>& 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"_ls))
-        return { JsonParseError,
-            "The key 'results' not found in the response" };
-    fromJson(json.value("results"_ls), d->results);
-    if (!json.contains("limited"_ls))
-        return { JsonParseError,
-            "The key 'limited' not found in the response" };
-    fromJson(json.value("limited"_ls), d->limited);
-    return Success;
-}
-