1 files changed, 10 insertions, 17 deletions
diff --git a/lib/csapi/report_content.cpp b/lib/csapi/report_content.cpp
index a79d4dad..bc52208f 100644
--- a/lib/csapi/report_content.cpp
+++ b/lib/csapi/report_content.cpp
@@ -4,23 +4,16 @@
 
 #include "report_content.h"
 
-#include "converters.h"
+using namespace Quotient;
 
-#include <QtCore/QStringBuilder>
-
-using namespace QMatrixClient;
-
-static const auto basePath = QStringLiteral("/_matrix/client/r0");
-
-static const auto ReportContentJobName = QStringLiteral("ReportContentJob");
-
-ReportContentJob::ReportContentJob(const QString& roomId, const QString& eventId, int score, const QString& reason)
-    : BaseJob(HttpVerb::Post, ReportContentJobName,
-        basePath % "/rooms/" % roomId % "/report/" % eventId)
+ReportContentJob::ReportContentJob(const QString& roomId, const QString& eventId,
+                                   Omittable<int> score, const QString& reason)
+    : BaseJob(HttpVerb::Post, QStringLiteral("ReportContentJob"),
+              makePath("/_matrix/client/v3", "/rooms/", roomId, "/report/",
+                       eventId))
 {
-    QJsonObject _data;
-    addParam<>(_data, QStringLiteral("score"), score);
-    addParam<>(_data, QStringLiteral("reason"), reason);
-    setRequestData(_data);
+    QJsonObject _dataJson;
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("score"), score);
+    addParam<IfNotEmpty>(_dataJson, QStringLiteral("reason"), reason);
+    setRequestData({ _dataJson });
 }
-