New upstream version 0.7.0

1 files changed, 10 insertions, 17 deletions

diff --git a/lib/csapi/typing.cpp b/lib/csapi/typing.cpp
index bf10912b..21bd45ae 100644
--- a/lib/csapi/typing.cpp
+++ b/lib/csapi/typing.cpp
@@ -4,23 +4,16 @@
 
 #include "typing.h"
 
-#include "converters.h"
+using namespace Quotient;
 
-#include <QtCore/QStringBuilder>
-
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-static const auto SetTypingJobName = QStringLiteral("SetTypingJob");
-
-SetTypingJob::SetTypingJob(const QString& userId, const QString& roomId, bool typing, Omittable<int> timeout)
-    : BaseJob(HttpVerb::Put, SetTypingJobName,
-        basePath % "/rooms/" % roomId % "/typing/" % userId)
+SetTypingJob::SetTypingJob(const QString& userId, const QString& roomId,
+                           bool typing, Omittable<int> timeout)
+    : BaseJob(HttpVerb::Put, QStringLiteral("SetTypingJob"),
+              makePath("/_matrix/client/v3", "/rooms/", roomId, "/typing/",
+                       userId))
 {
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("typing"), typing);
-    addParam<IfNotEmpty>(_data, QStringLiteral("timeout"), timeout);
-    setRequestData(_data);
+    QJsonObject _dataJson;
+    addParam<>(_dataJson, QStringLiteral("typing"), typing);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("timeout"), timeout);
+    setRequestData({ _dataJson });
 }
-