Merge #858(kitsune): Minor fixes - 0.10

quotient-im · Jan 24, 2025 · 93a694f · 93a694f
2 parents adf69bc + 0fca50c
commit 93a694f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Quotient/connection.cpp b/Quotient/connection.cpp
@@ -404,6 +404,7 @@ QFuture<void> Connection::logout()
     emit stateChanged();
 
     QFutureInterface<void> p;
+    p.reportStarted();
     connect(d->logoutJob.get(), &BaseJob::finished, this, [this, wasSyncing, p]() mutable {
         if (d->logoutJob->status().good()
             || d->logoutJob->error() == BaseJob::Unauthorised
@@ -710,6 +711,7 @@ QUrl Connection::makeMediaUrl(QUrl mxcUrl) const
 {
     Q_ASSERT(mxcUrl.scheme() == "mxc"_L1);
     QUrlQuery q(mxcUrl.query());
+    q.removeAllQueryItems(u"user_id"_s);
     q.addQueryItem(u"user_id"_s, userId());
     mxcUrl.setQuery(q);
     return mxcUrl;

diff --git a/Quotient/room.cpp b/Quotient/room.cpp
@@ -1416,8 +1416,10 @@ QUrl Room::makeMediaUrl(const QString& eventId, const QUrl& mxcUrl) const
     auto url = connection()->makeMediaUrl(mxcUrl);
     QUrlQuery q(url.query());
     Q_ASSERT(q.hasQueryItem("user_id"_L1));
-    q.addQueryItem("room_id"_L1, id());
-    q.addQueryItem("event_id"_L1, eventId);
+    q.removeAllQueryItems(u"room_id"_s);
+    q.addQueryItem(u"room_id"_s, id());
+    q.removeAllQueryItems(u"event_id"_s);
+    q.addQueryItem(u"event_id"_s, eventId);
     url.setQuery(q);
     return url;
 }