Update upstream source from tag 'upstream/0.6.4'

Update to upstream version '0.6.4'
with Debian dir aa8705fd74743e79c043bc9e3e425d5064404cfe

1 files changed, 44 insertions, 29 deletions

diff --git a/lib/csapi/definitions/push_rule.h b/lib/csapi/definitions/push_rule.h
index bea13e96..43749bae 100644
--- a/lib/csapi/definitions/push_rule.h
+++ b/lib/csapi/definitions/push_rule.h
@@ -7,37 +7,52 @@
 #include "converters.h"
 
 #include "csapi/definitions/push_condition.h"
-#include <QtCore/QJsonObject>
-#include <QtCore/QVector>
-#include <QtCore/QVariant>
-#include "converters.h"
 
-namespace QMatrixClient
-{
-    // Data structures
+namespace Quotient {
+
+struct PushRule {
+    /// The actions to perform when this rule is matched.
+    QVector<QVariant> actions;
+
+    /// Whether this is a default rule, or has been set explicitly.
+    bool isDefault;
+
+    /// Whether the push rule is enabled or not.
+    bool enabled;
+
+    /// The ID of this rule.
+    QString ruleId;
+
+    /// The conditions that must hold true for an event in order for a rule to
+    /// be applied to an event. A rule with no conditions always matches. Only
+    /// applicable to ``underride`` and ``override`` rules.
+    QVector<PushCondition> conditions;
+
+    /// The glob-style pattern to match against.  Only applicable to ``content``
+    /// rules.
+    QString pattern;
+};
 
-    struct PushRule
+template <>
+struct JsonObjectConverter<PushRule> {
+    static void dumpTo(QJsonObject& jo, const PushRule& pod)
     {
-        /// The actions to perform when this rule is matched.
-        QVector<QVariant> actions;
-        /// Whether this is a default rule, or has been set explicitly.
-        bool isDefault;
-        /// Whether the push rule is enabled or not.
-        bool enabled;
-        /// The ID of this rule.
-        QString ruleId;
-        /// The conditions that must hold true for an event in order for a rule to be
-        /// applied to an event. A rule with no conditions always matches. Only
-        /// applicable to ``underride`` and ``override`` rules.
-        QVector<PushCondition> conditions;
-        /// The glob-style pattern to match against.  Only applicable to ``content``
-        /// rules.
-        QString pattern;
-    };
-    template <> struct JsonObjectConverter<PushRule>
+        addParam<>(jo, QStringLiteral("actions"), pod.actions);
+        addParam<>(jo, QStringLiteral("default"), pod.isDefault);
+        addParam<>(jo, QStringLiteral("enabled"), pod.enabled);
+        addParam<>(jo, QStringLiteral("rule_id"), pod.ruleId);
+        addParam<IfNotEmpty>(jo, QStringLiteral("conditions"), pod.conditions);
+        addParam<IfNotEmpty>(jo, QStringLiteral("pattern"), pod.pattern);
+    }
+    static void fillFrom(const QJsonObject& jo, PushRule& pod)
     {
-        static void dumpTo(QJsonObject& jo, const PushRule& pod);
-        static void fillFrom(const QJsonObject& jo, PushRule& pod);
-    };
+        fromJson(jo.value("actions"_ls), pod.actions);
+        fromJson(jo.value("default"_ls), pod.isDefault);
+        fromJson(jo.value("enabled"_ls), pod.enabled);
+        fromJson(jo.value("rule_id"_ls), pod.ruleId);
+        fromJson(jo.value("conditions"_ls), pod.conditions);
+        fromJson(jo.value("pattern"_ls), pod.pattern);
+    }
+};
 
-} // namespace QMatrixClient
+} // namespace Quotient