makeMediaUrl(): overwrite existing query items

...instead of just appending key-value pairs. (cherry picked from commit e7fe0b9)
quotient-im · Jan 24, 2025 · 0fca50c · 0fca50c
1 parent 4a0edac
commit 0fca50c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Quotient/connection.cpp b/Quotient/connection.cpp
@@ -711,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;
 }