1 files changed, 45 insertions, 29 deletions
diff --git a/lib/csapi/definitions/push_condition.h b/lib/csapi/definitions/push_condition.h
index defcebb3..6a048ba8 100644
--- a/lib/csapi/definitions/push_condition.h
+++ b/lib/csapi/definitions/push_condition.h
@@ -6,34 +6,50 @@
 
 #include "converters.h"
 
-
-namespace QMatrixClient
-{
-    // Data structures
-
-    struct PushCondition
+namespace Quotient {
+
+struct PushCondition {
+    /// The kind of condition to apply. See
+    /// [conditions](/client-server-api/#conditions) for more information on the
+    /// allowed kinds and how they work.
+    QString kind;
+
+    /// Required for `event_match` conditions. The dot-separated field of the
+    /// event to match.
+    ///
+    /// Required for `sender_notification_permission` conditions. The field in
+    /// the power level event the user needs a minimum power level for. Fields
+    /// must be specified under the `notifications` property in the power level
+    /// event's `content`.
+    QString key;
+
+    /// Required for `event_match` conditions. The glob-style pattern to
+    /// match against.
+    QString pattern;
+
+    /// Required for `room_member_count` conditions. A decimal integer
+    /// optionally prefixed by one of, ==, <, >, >= or <=. A prefix of < matches
+    /// rooms where the member count is strictly less than the given number and
+    /// so forth. If no prefix is present, this parameter defaults to ==.
+    QString is;
+};
+
+template <>
+struct JsonObjectConverter<PushCondition> {
+    static void dumpTo(QJsonObject& jo, const PushCondition& pod)
     {
-        QString kind;
-        /// Required for ``event_match`` conditions. The dot-separated field of the
-        /// event to match.
-        QString key;
-        /// Required for ``event_match`` conditions. The glob-style pattern to
-        /// match against. Patterns with no special glob characters should be
-        /// treated as having asterisks prepended and appended when testing the
-        /// condition.
-        QString pattern;
-        /// Required for ``room_member_count`` conditions. A decimal integer
-        /// optionally prefixed by one of, ==, <, >, >= or <=. A prefix of < matches
-        /// rooms where the member count is strictly less than the given number and
-        /// so forth. If no prefix is present, this parameter defaults to ==.
-        QString is;
-    };
-
-    QJsonObject toJson(const PushCondition& pod);
-
-    template <> struct FromJsonObject<PushCondition>
+        addParam<>(jo, QStringLiteral("kind"), pod.kind);
+        addParam<IfNotEmpty>(jo, QStringLiteral("key"), pod.key);
+        addParam<IfNotEmpty>(jo, QStringLiteral("pattern"), pod.pattern);
+        addParam<IfNotEmpty>(jo, QStringLiteral("is"), pod.is);
+    }
+    static void fillFrom(const QJsonObject& jo, PushCondition& pod)
     {
-        PushCondition operator()(const QJsonObject& jo) const;
-    };
-
-} // namespace QMatrixClient
+        fromJson(jo.value("kind"_ls), pod.kind);
+        fromJson(jo.value("key"_ls), pod.key);
+        fromJson(jo.value("pattern"_ls), pod.pattern);
+        fromJson(jo.value("is"_ls), pod.is);
+    }
+};
+
+} // namespace Quotient