diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2020-09-11 07:15:01 +0200 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2020-11-06 14:07:20 +0100 |
| commit | c5b162574d937408927d0ad89fb0c6ba96d49dd8 (patch) | |
| tree | 0f9d43b8a4f348e186363d21f334697a021a52be | |
| parent | 2753ebd6c6c320e459d2cab65e8a0328138c1d60 (diff) | |
| download | libquotient-c5b162574d937408927d0ad89fb0c6ba96d49dd8.tar.gz libquotient-c5b162574d937408927d0ad89fb0c6ba96d49dd8.zip | |
Uri::toUrl(): fix incorrect matrix.to rep
The first character inside the fragment should be /
(cherry picked from commit 948be2ef2bf04e306fbb0e2c3e0a98f4151337a7)
| -rw-r--r-- | lib/uri.cpp | 2 | ||||
| -rw-r--r-- | tests/quotest.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/uri.cpp b/lib/uri.cpp index f813794c..8370d83a 100644 --- a/lib/uri.cpp +++ b/lib/uri.cpp @@ -134,7 +134,7 @@ QUrl Uri::toUrl(UriForm form) const url.setScheme("https"); url.setHost("matrix.to"); url.setPath("/"); - auto fragment = primaryId(); + auto fragment = '/' + primaryId(); if (const auto& secId = secondaryId(); !secId.isEmpty()) fragment += '/' + secId; if (const auto& q = query(); !q.isEmpty()) diff --git a/tests/quotest.cpp b/tests/quotest.cpp index 3a32da69..3b7f2f48 100644 --- a/tests/quotest.cpp +++ b/tests/quotest.cpp @@ -649,6 +649,11 @@ TEST_IMPL(visitResources) Uri uri { uriString }; clog << "Checking " << uriString.toStdString() << " -> " << uri.toDisplayString().toStdString() << endl; + if (auto matrixToUrl = uri.toUrl(Uri::MatrixToUri).toDisplayString(); + !matrixToUrl.startsWith("https://matrix.to/#/")) { + clog << "Incorrect matrix.to representation:" + << matrixToUrl.toStdString() << endl; + } ud.visitResource(connection(), uriString); if (spy.count() != 1) { clog << "Wrong number of signal emissions (" << spy.count() |