Skip to content

Commit

Permalink
Adjust Connection::joinRoom() for Matrix 1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
KitsuneRal committed Sep 21, 2024
1 parent 4f55444 commit 8db3d43
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions Quotient/connection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -660,16 +660,14 @@ JobHandle<JoinRoomJob> Connection::joinRoom(const QString& roomAlias, const QStr
// Upon completion, ensure a room object is created in case it hasn't come with a sync yet.
// If the room object is not there, provideRoom() will create it in Join state. Using
// the continuation ensures that the room is provided before any client connections.
return callApi<JoinRoomJob>(roomAlias, serverNames).then([this](const QString& roomId) {
provideRoom(roomId);
});
return callApi<JoinRoomJob>(roomAlias, serverNames, serverNames)
.then([this](const QString& roomId) { provideRoom(roomId); });
}

QFuture<Room*> Connection::joinAndGetRoom(const QString& roomAlias, const QStringList& serverNames)
{
return callApi<JoinRoomJob>(roomAlias, serverNames).then([this](const QString& roomId) {
return provideRoom(roomId);
});
return callApi<JoinRoomJob>(roomAlias, serverNames, serverNames)
.then([this](const QString& roomId) { return provideRoom(roomId); });
}

LeaveRoomJob* Connection::leaveRoom(Room* room)
Expand Down

0 comments on commit 8db3d43

Please sign in to comment.