Merge branch 'dev' into pinned

1 files changed, 27 insertions, 32 deletions

diff --git a/lib/csapi/content-repo.cpp b/lib/csapi/content-repo.cpp
index 7ae89739..6d1e38b6 100644
--- a/lib/csapi/content-repo.cpp
+++ b/lib/csapi/content-repo.cpp
@@ -4,13 +4,11 @@
 
 #include "content-repo.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 auto queryToUploadContent(const QString& filename)
 {
-    BaseJob::Query _q;
+    QUrlQuery _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("filename"), filename);
     return _q;
 }
@@ -18,17 +16,17 @@ auto queryToUploadContent(const QString& filename)
 UploadContentJob::UploadContentJob(QIODevice* content, const QString& filename,
                                    const QString& contentType)
     : BaseJob(HttpVerb::Post, QStringLiteral("UploadContentJob"),
-              QStringLiteral("/_matrix/media/r0") % "/upload",
+              makePath("/_matrix/media/r0", "/upload"),
               queryToUploadContent(filename))
 {
     setRequestHeader("Content-Type", contentType.toLatin1());
-    setRequestData(Data(content));
+    setRequestData(RequestData(content));
     addExpectedKey("content_uri");
 }
 
 auto queryToGetContent(bool allowRemote)
 {
-    BaseJob::Query _q;
+    QUrlQuery _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("allow_remote"), allowRemote);
     return _q;
 }
@@ -37,17 +35,16 @@ QUrl GetContentJob::makeRequestUrl(QUrl baseUrl, const QString& serverName,
                                    const QString& mediaId, bool allowRemote)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/media/r0")
-                                       % "/download/" % serverName % "/"
-                                       % mediaId,
+                                   makePath("/_matrix/media/r0", "/download/",
+                                            serverName, "/", mediaId),
                                    queryToGetContent(allowRemote));
 }
 
 GetContentJob::GetContentJob(const QString& serverName, const QString& mediaId,
                              bool allowRemote)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetContentJob"),
-              QStringLiteral("/_matrix/media/r0") % "/download/" % serverName
-                  % "/" % mediaId,
+              makePath("/_matrix/media/r0", "/download/", serverName, "/",
+                       mediaId),
               queryToGetContent(allowRemote), {}, false)
 {
     setExpectedContentTypes({ "*/*" });
@@ -55,7 +52,7 @@ GetContentJob::GetContentJob(const QString& serverName, const QString& mediaId,
 
 auto queryToGetContentOverrideName(bool allowRemote)
 {
-    BaseJob::Query _q;
+    QUrlQuery _q;
     addParam<IfNotEmpty>(_q, QStringLiteral("allow_remote"), allowRemote);
     return _q;
 }
@@ -67,9 +64,9 @@ QUrl GetContentOverrideNameJob::makeRequestUrl(QUrl baseUrl,
                                                bool allowRemote)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/media/r0")
-                                       % "/download/" % serverName % "/"
-                                       % mediaId % "/" % fileName,
+                                   makePath("/_matrix/media/r0", "/download/",
+                                            serverName, "/", mediaId, "/",
+                                            fileName),
                                    queryToGetContentOverrideName(allowRemote));
 }
 
@@ -78,8 +75,8 @@ GetContentOverrideNameJob::GetContentOverrideNameJob(const QString& serverName,
                                                      const QString& fileName,
                                                      bool allowRemote)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetContentOverrideNameJob"),
-              QStringLiteral("/_matrix/media/r0") % "/download/" % serverName
-                  % "/" % mediaId % "/" % fileName,
+              makePath("/_matrix/media/r0", "/download/", serverName, "/",
+                       mediaId, "/", fileName),
               queryToGetContentOverrideName(allowRemote), {}, false)
 {
     setExpectedContentTypes({ "*/*" });
@@ -88,7 +85,7 @@ GetContentOverrideNameJob::GetContentOverrideNameJob(const QString& serverName,
 auto queryToGetContentThumbnail(int width, int height, const QString& method,
                                 bool allowRemote)
 {
-    BaseJob::Query _q;
+    QUrlQuery _q;
     addParam<>(_q, QStringLiteral("width"), width);
     addParam<>(_q, QStringLiteral("height"), height);
     addParam<IfNotEmpty>(_q, QStringLiteral("method"), method);
@@ -104,8 +101,7 @@ QUrl GetContentThumbnailJob::makeRequestUrl(QUrl baseUrl,
 {
     return BaseJob::makeRequestUrl(
         std::move(baseUrl),
-        QStringLiteral("/_matrix/media/r0") % "/thumbnail/" % serverName % "/"
-            % mediaId,
+        makePath("/_matrix/media/r0", "/thumbnail/", serverName, "/", mediaId),
         queryToGetContentThumbnail(width, height, method, allowRemote));
 }
 
@@ -114,45 +110,44 @@ GetContentThumbnailJob::GetContentThumbnailJob(const QString& serverName,
                                                int height, const QString& method,
                                                bool allowRemote)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetContentThumbnailJob"),
-              QStringLiteral("/_matrix/media/r0") % "/thumbnail/" % serverName
-                  % "/" % mediaId,
+              makePath("/_matrix/media/r0", "/thumbnail/", serverName, "/",
+                       mediaId),
               queryToGetContentThumbnail(width, height, method, allowRemote),
               {}, false)
 {
     setExpectedContentTypes({ "image/jpeg", "image/png" });
 }
 
-auto queryToGetUrlPreview(const QString& url, Omittable<qint64> ts)
+auto queryToGetUrlPreview(const QUrl& url, Omittable<qint64> ts)
 {
-    BaseJob::Query _q;
+    QUrlQuery _q;
     addParam<>(_q, QStringLiteral("url"), url);
     addParam<IfNotEmpty>(_q, QStringLiteral("ts"), ts);
     return _q;
 }
 
-QUrl GetUrlPreviewJob::makeRequestUrl(QUrl baseUrl, const QString& url,
+QUrl GetUrlPreviewJob::makeRequestUrl(QUrl baseUrl, const QUrl& url,
                                       Omittable<qint64> ts)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/media/r0")
-                                       % "/preview_url",
+                                   makePath("/_matrix/media/r0",
+                                            "/preview_url"),
                                    queryToGetUrlPreview(url, ts));
 }
 
-GetUrlPreviewJob::GetUrlPreviewJob(const QString& url, Omittable<qint64> ts)
+GetUrlPreviewJob::GetUrlPreviewJob(const QUrl& url, Omittable<qint64> ts)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetUrlPreviewJob"),
-              QStringLiteral("/_matrix/media/r0") % "/preview_url",
+              makePath("/_matrix/media/r0", "/preview_url"),
               queryToGetUrlPreview(url, ts))
 {}
 
 QUrl GetConfigJob::makeRequestUrl(QUrl baseUrl)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/media/r0")
-                                       % "/config");
+                                   makePath("/_matrix/media/r0", "/config"));
 }
 
 GetConfigJob::GetConfigJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetConfigJob"),
-              QStringLiteral("/_matrix/media/r0") % "/config")
+              makePath("/_matrix/media/r0", "/config"))
 {}