csapi/: refresh from the latest matrix-doc

3 files changed, 14 insertions, 11 deletions

diff --git a/lib/csapi/logout.h b/lib/csapi/logout.h
index e9a7ef89..78f14e40 100644
--- a/lib/csapi/logout.h
+++ b/lib/csapi/logout.h
@@ -34,11 +34,12 @@ public:
  * devices for the user are also deleted. `Device keys <#device-keys>`_ for the
  * device are deleted alongside the device.
  *
- * This endpoint does not require UI authorization because UI authorization is
- * designed to protect against attacks where the someone gets hold of a single
- * access token then takes over the account. This endpoint invalidates all
- * access tokens for the user, including the token used in the request, and
- * therefore the attacker is unable to take over the account in this way.
+ * This endpoint does not use the `User-Interactive Authentication API`_ because
+ * User-Interactive Authentication is designed to protect against attacks where
+ * the someone gets hold of a single access token then takes over the account.
+ * This endpoint invalidates all access tokens for the user, including the token
+ * used in the request, and therefore the attacker is unable to take over the
+ * account in this way.
  */
 class LogoutAllJob : public BaseJob {
 public:
diff --git a/lib/csapi/pushrules.cpp b/lib/csapi/pushrules.cpp
index f2a16f1b..86165744 100644
--- a/lib/csapi/pushrules.cpp
+++ b/lib/csapi/pushrules.cpp
@@ -64,7 +64,8 @@ auto queryToSetPushRule(const QString& before, const QString& after)
 }
 
 SetPushRuleJob::SetPushRuleJob(const QString& scope, const QString& kind,
-                               const QString& ruleId, const QStringList& actions,
+                               const QString& ruleId,
+                               const QVector<QVariant>& actions,
                                const QString& before, const QString& after,
                                const QVector<PushCondition>& conditions,
                                const QString& pattern)
@@ -135,7 +136,7 @@ GetPushRuleActionsJob::GetPushRuleActionsJob(const QString& scope,
 SetPushRuleActionsJob::SetPushRuleActionsJob(const QString& scope,
                                              const QString& kind,
                                              const QString& ruleId,
-                                             const QStringList& actions)
+                                             const QVector<QVariant>& actions)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetPushRuleActionsJob"),
               QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
                   % kind % "/" % ruleId % "/actions")
diff --git a/lib/csapi/pushrules.h b/lib/csapi/pushrules.h
index f6d3458a..1c6d5c2d 100644
--- a/lib/csapi/pushrules.h
+++ b/lib/csapi/pushrules.h
@@ -148,7 +148,8 @@ public:
      * against.
      */
     explicit SetPushRuleJob(const QString& scope, const QString& kind,
-                            const QString& ruleId, const QStringList& actions,
+                            const QString& ruleId,
+                            const QVector<QVariant>& actions,
                             const QString& before = {},
                             const QString& after = {},
                             const QVector<PushCondition>& conditions = {},
@@ -246,9 +247,9 @@ public:
     // Result properties
 
     /// The action(s) to perform for this rule.
-    QStringList actions() const
+    QVector<QVariant> actions() const
     {
-        return loadFromJson<QStringList>("actions"_ls);
+        return loadFromJson<QVector<QVariant>>("actions"_ls);
     }
 };
 
@@ -275,7 +276,7 @@ public:
      */
     explicit SetPushRuleActionsJob(const QString& scope, const QString& kind,
                                    const QString& ruleId,
-                                   const QStringList& actions);
+                                   const QVector<QVariant>& actions);
 };
 
 } // namespace Quotient