Merge branch 'master' into kitsune-fix-read-receipts-and-markers

1 files changed, 27 insertions, 32 deletions

diff --git a/lib/csapi/pushrules.cpp b/lib/csapi/pushrules.cpp
index ab7d0038..0d840788 100644
--- a/lib/csapi/pushrules.cpp
+++ b/lib/csapi/pushrules.cpp
@@ -4,20 +4,17 @@
 
 #include "pushrules.h"
 
-#include <QtCore/QStringBuilder>
-
 using namespace Quotient;
 
 QUrl GetPushRulesJob::makeRequestUrl(QUrl baseUrl)
 {
-    return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/pushrules");
+    return BaseJob::makeRequestUrl(
+        std::move(baseUrl), makePath("/_matrix/client/r0", "/pushrules"));
 }
 
 GetPushRulesJob::GetPushRulesJob()
     : BaseJob(HttpVerb::Get, QStringLiteral("GetPushRulesJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules")
+              makePath("/_matrix/client/r0", "/pushrules"))
 {
     addExpectedKey("global");
 }
@@ -26,16 +23,15 @@ QUrl GetPushRuleJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
                                     const QString& kind, const QString& ruleId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/pushrules/" % scope % "/" % kind
-                                       % "/" % ruleId);
+                                   makePath("/_matrix/client/r0", "/pushrules/",
+                                            scope, "/", kind, "/", ruleId));
 }
 
 GetPushRuleJob::GetPushRuleJob(const QString& scope, const QString& kind,
                                const QString& ruleId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetPushRuleJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId)
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId))
 {}
 
 QUrl DeletePushRuleJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
@@ -43,16 +39,15 @@ QUrl DeletePushRuleJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
                                        const QString& ruleId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/pushrules/" % scope % "/" % kind
-                                       % "/" % ruleId);
+                                   makePath("/_matrix/client/r0", "/pushrules/",
+                                            scope, "/", kind, "/", ruleId));
 }
 
 DeletePushRuleJob::DeletePushRuleJob(const QString& scope, const QString& kind,
                                      const QString& ruleId)
     : BaseJob(HttpVerb::Delete, QStringLiteral("DeletePushRuleJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId)
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId))
 {}
 
 auto queryToSetPushRule(const QString& before, const QString& after)
@@ -70,8 +65,8 @@ SetPushRuleJob::SetPushRuleJob(const QString& scope, const QString& kind,
                                const QVector<PushCondition>& conditions,
                                const QString& pattern)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetPushRuleJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId,
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId),
               queryToSetPushRule(before, after))
 {
     QJsonObject _data;
@@ -86,17 +81,17 @@ QUrl IsPushRuleEnabledJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
                                           const QString& ruleId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/pushrules/" % scope % "/" % kind
-                                       % "/" % ruleId % "/enabled");
+                                   makePath("/_matrix/client/r0", "/pushrules/",
+                                            scope, "/", kind, "/", ruleId,
+                                            "/enabled"));
 }
 
 IsPushRuleEnabledJob::IsPushRuleEnabledJob(const QString& scope,
                                            const QString& kind,
                                            const QString& ruleId)
     : BaseJob(HttpVerb::Get, QStringLiteral("IsPushRuleEnabledJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId % "/enabled")
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId, "/enabled"))
 {
     addExpectedKey("enabled");
 }
@@ -105,8 +100,8 @@ SetPushRuleEnabledJob::SetPushRuleEnabledJob(const QString& scope,
                                              const QString& kind,
                                              const QString& ruleId, bool enabled)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetPushRuleEnabledJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId % "/enabled")
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId, "/enabled"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("enabled"), enabled);
@@ -118,17 +113,17 @@ QUrl GetPushRuleActionsJob::makeRequestUrl(QUrl baseUrl, const QString& scope,
                                            const QString& ruleId)
 {
     return BaseJob::makeRequestUrl(std::move(baseUrl),
-                                   QStringLiteral("/_matrix/client/r0")
-                                       % "/pushrules/" % scope % "/" % kind
-                                       % "/" % ruleId % "/actions");
+                                   makePath("/_matrix/client/r0", "/pushrules/",
+                                            scope, "/", kind, "/", ruleId,
+                                            "/actions"));
 }
 
 GetPushRuleActionsJob::GetPushRuleActionsJob(const QString& scope,
                                              const QString& kind,
                                              const QString& ruleId)
     : BaseJob(HttpVerb::Get, QStringLiteral("GetPushRuleActionsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId % "/actions")
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId, "/actions"))
 {
     addExpectedKey("actions");
 }
@@ -138,8 +133,8 @@ SetPushRuleActionsJob::SetPushRuleActionsJob(const QString& scope,
                                              const QString& ruleId,
                                              const QVector<QVariant>& actions)
     : BaseJob(HttpVerb::Put, QStringLiteral("SetPushRuleActionsJob"),
-              QStringLiteral("/_matrix/client/r0") % "/pushrules/" % scope % "/"
-                  % kind % "/" % ruleId % "/actions")
+              makePath("/_matrix/client/r0", "/pushrules/", scope, "/", kind,
+                       "/", ruleId, "/actions"))
 {
     QJsonObject _data;
     addParam<>(_data, QStringLiteral("actions"), actions);