Merge branch 'master' of https://github.com/quotient-im/libQuotient into bhat-powerlevel

3 files changed, 2 insertions, 396 deletions

diff --git a/lib/csapi/gtad.yaml b/lib/csapi/gtad.yaml
index 301ee0b6..6d4e080f 100644
--- a/lib/csapi/gtad.yaml
+++ b/lib/csapi/gtad.yaml
@@ -95,9 +95,9 @@ analyzer:
       - //: { type: "QVector<{{1}}>", imports: <QtCore/QVector> }
     - map: # `additionalProperties` in OpenAPI
       - RoomState:
-          type: "std::unordered_map<QString, {{1}}>"
+          type: "UnorderedMap<QString, {{1}}>"
           moveOnly:
-          imports: <unordered_map>
+          imports: '"util.h"'
       - /.+/:
           type: "QHash<QString, {{1}}>"
           imports: <QtCore/QHash>
diff --git a/lib/csapi/search.cpp b/lib/csapi/search.cpp
deleted file mode 100644
index 9619f340..00000000
--- a/lib/csapi/search.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#include "search.h"
-
-#include "converters.h"
-
-#include <QtCore/QStringBuilder>
-
-using namespace Quotient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-// Converters
-namespace Quotient
-{
-
-template <>
-struct JsonObjectConverter<SearchJob::IncludeEventContext>
-{
-    static void dumpTo(QJsonObject& jo,
-                       const SearchJob::IncludeEventContext& pod)
-    {
-        addParam<IfNotEmpty>(jo, QStringLiteral("before_limit"),
-                             pod.beforeLimit);
-        addParam<IfNotEmpty>(jo, QStringLiteral("after_limit"), pod.afterLimit);
-        addParam<IfNotEmpty>(jo, QStringLiteral("include_profile"),
-                             pod.includeProfile);
-    }
-};
-
-template <>
-struct JsonObjectConverter<SearchJob::Group>
-{
-    static void dumpTo(QJsonObject& jo, const SearchJob::Group& pod)
-    {
-        addParam<IfNotEmpty>(jo, QStringLiteral("key"), pod.key);
-    }
-};
-
-template <>
-struct JsonObjectConverter<SearchJob::Groupings>
-{
-    static void dumpTo(QJsonObject& jo, const SearchJob::Groupings& pod)
-    {
-        addParam<IfNotEmpty>(jo, QStringLiteral("group_by"), pod.groupBy);
-    }
-};
-
-template <>
-struct JsonObjectConverter<SearchJob::RoomEventsCriteria>
-{
-    static void dumpTo(QJsonObject& jo, const SearchJob::RoomEventsCriteria& pod)
-    {
-        addParam<>(jo, QStringLiteral("search_term"), pod.searchTerm);
-        addParam<IfNotEmpty>(jo, QStringLiteral("keys"), pod.keys);
-        addParam<IfNotEmpty>(jo, QStringLiteral("filter"), pod.filter);
-        addParam<IfNotEmpty>(jo, QStringLiteral("order_by"), pod.orderBy);
-        addParam<IfNotEmpty>(jo, QStringLiteral("event_context"),
-                             pod.eventContext);
-        addParam<IfNotEmpty>(jo, QStringLiteral("include_state"),
-                             pod.includeState);
-        addParam<IfNotEmpty>(jo, QStringLiteral("groupings"), pod.groupings);
-    }
-};
-
-template <>
-struct JsonObjectConverter<SearchJob::Categories>
-{
-    static void dumpTo(QJsonObject& jo, const SearchJob::Categories& pod)
-    {
-        addParam<IfNotEmpty>(jo, QStringLiteral("room_events"), pod.roomEvents);
-    }
-};
-
-template <>
-struct JsonObjectConverter<SearchJob::UserProfile>
-{
-    static void fillFrom(const QJsonObject& jo, SearchJob::UserProfile& result)
-    {
-        fromJson(jo.value("displayname"_ls), result.displayname);
-        fromJson(jo.value("avatar_url"_ls), result.avatarUrl);
-    }
-};
-
-template <>
-struct JsonObjectConverter<SearchJob::EventContext>
-{
-    static void fillFrom(const QJsonObject& jo, SearchJob::EventContext& result)
-    {
-        fromJson(jo.value("start"_ls), result.begin);
-        fromJson(jo.value("end"_ls), result.end);
-        fromJson(jo.value("profile_info"_ls), result.profileInfo);
-        fromJson(jo.value("events_before"_ls), result.eventsBefore);
-        fromJson(jo.value("events_after"_ls), result.eventsAfter);
-    }
-};
-
-template <>
-struct JsonObjectConverter<SearchJob::Result>
-{
-    static void fillFrom(const QJsonObject& jo, SearchJob::Result& result)
-    {
-        fromJson(jo.value("rank"_ls), result.rank);
-        fromJson(jo.value("result"_ls), result.result);
-        fromJson(jo.value("context"_ls), result.context);
-    }
-};
-
-template <>
-struct JsonObjectConverter<SearchJob::GroupValue>
-{
-    static void fillFrom(const QJsonObject& jo, SearchJob::GroupValue& result)
-    {
-        fromJson(jo.value("next_batch"_ls), result.nextBatch);
-        fromJson(jo.value("order"_ls), result.order);
-        fromJson(jo.value("results"_ls), result.results);
-    }
-};
-
-template <>
-struct JsonObjectConverter<SearchJob::ResultRoomEvents>
-{
-    static void fillFrom(const QJsonObject& jo,
-                         SearchJob::ResultRoomEvents& result)
-    {
-        fromJson(jo.value("count"_ls), result.count);
-        fromJson(jo.value("highlights"_ls), result.highlights);
-        fromJson(jo.value("results"_ls), result.results);
-        fromJson(jo.value("state"_ls), result.state);
-        fromJson(jo.value("groups"_ls), result.groups);
-        fromJson(jo.value("next_batch"_ls), result.nextBatch);
-    }
-};
-
-template <>
-struct JsonObjectConverter<SearchJob::ResultCategories>
-{
-    static void fillFrom(const QJsonObject& jo,
-                         SearchJob::ResultCategories& result)
-    {
-        fromJson(jo.value("room_events"_ls), result.roomEvents);
-    }
-};
-
-} // namespace Quotient
-
-class SearchJob::Private
-{
-public:
-    ResultCategories searchCategories;
-};
-
-BaseJob::Query queryToSearch(const QString& nextBatch)
-{
-    BaseJob::Query _q;
-    addParam<IfNotEmpty>(_q, QStringLiteral("next_batch"), nextBatch);
-    return _q;
-}
-
-static const auto SearchJobName = QStringLiteral("SearchJob");
-
-SearchJob::SearchJob(const Categories& searchCategories,
-                     const QString& nextBatch)
-    : BaseJob(HttpVerb::Post, SearchJobName, basePath % "/search",
-              queryToSearch(nextBatch))
-    , d(new Private)
-{
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("search_categories"), searchCategories);
-    setRequestData(_data);
-}
-
-SearchJob::~SearchJob() = default;
-
-const SearchJob::ResultCategories& SearchJob::searchCategories() const
-{
-    return d->searchCategories;
-}
-
-BaseJob::Status SearchJob::parseJson(const QJsonDocument& data)
-{
-    auto json = data.object();
-    if (!json.contains("search_categories"_ls))
-        return { IncorrectResponse,
-                 "The key 'search_categories' not found in the response" };
-    fromJson(json.value("search_categories"_ls), d->searchCategories);
-
-    return Success;
-}
diff --git a/lib/csapi/search.h b/lib/csapi/search.h
deleted file mode 100644
index 079ac8e9..00000000
--- a/lib/csapi/search.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/******************************************************************************
- * THIS FILE IS GENERATED - ANY EDITS WILL BE OVERWRITTEN
- */
-
-#pragma once
-
-#include "converters.h"
-
-#include "csapi/definitions/room_event_filter.h"
-
-#include "events/eventloader.h"
-#include "jobs/basejob.h"
-
-#include <QtCore/QHash>
-#include <QtCore/QVector>
-
-#include <unordered_map>
-
-namespace Quotient
-{
-
-// Operations
-
-/// Perform a server-side search.
-/*!
- * Performs a full text search across different categories.
- */
-class SearchJob : public BaseJob
-{
-public:
-    // Inner data structures
-
-    /// Configures whether any context for the eventsreturned are included in
-    /// the response.
-    struct IncludeEventContext
-    {
-        /// How many events before the result arereturned. By default, this is
-        /// ``5``.
-        Omittable<int> beforeLimit;
-        /// How many events after the result arereturned. By default, this is
-        /// ``5``.
-        Omittable<int> afterLimit;
-        /// Requests that the server returns thehistoric profile information for
-        /// the usersthat sent the events that were returned.By default, this is
-        /// ``false``.
-        Omittable<bool> includeProfile;
-    };
-
-    /// Configuration for group.
-    struct Group
-    {
-        /// Key that defines the group.
-        QString key;
-    };
-
-    /// Requests that the server partitions the result setbased on the provided
-    /// list of keys.
-    struct Groupings
-    {
-        /// List of groups to request.
-        QVector<Group> groupBy;
-    };
-
-    /// Mapping of category name to search criteria.
-    struct RoomEventsCriteria
-    {
-        /// The string to search events for
-        QString searchTerm;
-        /// The keys to search. Defaults to all.
-        QStringList keys;
-        /// This takes a `filter`_.
-        Omittable<RoomEventFilter> filter;
-        /// The order in which to search for results.By default, this is
-        /// ``"rank"``.
-        QString orderBy;
-        /// Configures whether any context for the eventsreturned are included
-        /// in the response.
-        Omittable<IncludeEventContext> eventContext;
-        /// Requests the server return the current state foreach room returned.
-        Omittable<bool> includeState;
-        /// Requests that the server partitions the result setbased on the
-        /// provided list of keys.
-        Omittable<Groupings> groupings;
-    };
-
-    /// Describes which categories to search in and their criteria.
-    struct Categories
-    {
-        /// Mapping of category name to search criteria.
-        Omittable<RoomEventsCriteria> roomEvents;
-    };
-
-    /// Performs a full text search across different categories.
-    struct UserProfile
-    {
-        /// Performs a full text search across different categories.
-        QString displayname;
-        /// Performs a full text search across different categories.
-        QString avatarUrl;
-    };
-
-    /// Context for result, if requested.
-    struct EventContext
-    {
-        /// Pagination token for the start of the chunk
-        QString begin;
-        /// Pagination token for the end of the chunk
-        QString end;
-        /// The historic profile information of theusers that sent the events
-        /// returned.The ``string`` key is the user ID for whichthe profile
-        /// belongs to.
-        QHash<QString, UserProfile> profileInfo;
-        /// Events just before the result.
-        RoomEvents eventsBefore;
-        /// Events just after the result.
-        RoomEvents eventsAfter;
-    };
-
-    /// The result object.
-    struct Result
-    {
-        /// A number that describes how closely this result matches the search.
-        /// Higher is closer.
-        Omittable<double> rank;
-        /// The event that matched.
-        RoomEventPtr result;
-        /// Context for result, if requested.
-        Omittable<EventContext> context;
-    };
-
-    /// The results for a particular group value.
-    struct GroupValue
-    {
-        /// Token that can be used to get the next batchof results in the group,
-        /// by passing as the`next_batch` parameter to the next call. Ifthis
-        /// field is absent, there are no moreresults in this group.
-        QString nextBatch;
-        /// Key that can be used to order differentgroups.
-        Omittable<int> order;
-        /// Which results are in this group.
-        QStringList results;
-    };
-
-    /// Mapping of category name to search criteria.
-    struct ResultRoomEvents
-    {
-        /// An approximate count of the total number of results found.
-        Omittable<int> count;
-        /// List of words which should be highlighted, useful for stemming which
-        /// may change the query terms.
-        QStringList highlights;
-        /// List of results in the requested order.
-        std::vector<Result> results;
-        /// The current state for every room in the results.This is included if
-        /// the request had the``include_state`` key set with a value of
-        /// ``true``.The ``string`` key is the room ID for which the
-        /// ``StateEvent`` array belongs to.
-        std::unordered_map<QString, StateEvents> state;
-        /// Any groups that were requested.The outer ``string`` key is the group
-        /// key requested (eg: ``room_id``or ``sender``). The inner ``string``
-        /// key is the grouped value (eg: a room's ID or a user's ID).
-        QHash<QString, QHash<QString, GroupValue>> groups;
-        /// Token that can be used to get the next batch ofresults, by passing
-        /// as the `next_batch` parameter tothe next call. If this field is
-        /// absent, there are nomore results.
-        QString nextBatch;
-    };
-
-    /// Describes which categories to search in and their criteria.
-    struct ResultCategories
-    {
-        /// Mapping of category name to search criteria.
-        Omittable<ResultRoomEvents> roomEvents;
-    };
-
-    // Construction/destruction
-
-    /*! Perform a server-side search.
-     * \param searchCategories
-     *   Describes which categories to search in and their criteria.
-     * \param nextBatch
-     *   The point to return events from. If given, this should be a
-     *   ``next_batch`` result from a previous call to this endpoint.
-     */
-    explicit SearchJob(const Categories& searchCategories,
-                       const QString& nextBatch = {});
-
-    ~SearchJob() override;
-
-    // Result properties
-
-    /// Describes which categories to search in and their criteria.
-    const ResultCategories& searchCategories() const;
-
-protected:
-    Status parseJson(const QJsonDocument& data) override;
-
-private:
-    class Private;
-    QScopedPointer<Private> d;
-};
-
-} // namespace Quotient