Fix read receipts and redactions on v3 rooms

Previously slashes in eventIds (that come plenty in v3 due to base64 encoding) were not properly encoded - they are now.
quotient-im · Mar 13, 2019 · f13d54b · f13d54b
1 parent 8c685b4
commit f13d54b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
@@ -186,7 +186,7 @@ QUrl BaseJob::makeRequestUrl(QUrl baseUrl,
     if (!pathBase.endsWith('/') && !path.startsWith('/'))
         pathBase.push_back('/');
 
-    baseUrl.setPath( pathBase + path );
+    baseUrl.setPath(pathBase + path, QUrl::TolerantMode);
     baseUrl.setQuery(query);
     return baseUrl;
 }

diff --git a/lib/room.cpp b/lib/room.cpp
@@ -579,8 +579,8 @@ Room::Changes Room::Private::markMessagesAsRead(rev_iter_t upToMarker)
     {
         if ((*upToMarker)->senderId() != q->localUser()->id())
         {
-            connection->callApi<PostReceiptJob>(id, "m.read",
-                                                (*upToMarker)->id());
+            connection->callApi<PostReceiptJob>(id, QStringLiteral("m.read"),
+                QUrl::toPercentEncoding((*upToMarker)->id()));
             break;
         }
     }
@@ -1734,8 +1734,8 @@ void Room::unban(const QString& userId)
 
 void Room::redactEvent(const QString& eventId, const QString& reason)
 {
-    connection()->callApi<RedactEventJob>(
-        id(), eventId, connection()->generateTxnId(), reason);
+    connection()->callApi<RedactEventJob>(id(),
+        QUrl::toPercentEncoding(eventId), connection()->generateTxnId(), reason);
 }
 
 void Room::uploadFile(const QString& id, const QUrl& localFilename,