oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-09-05 18:41:00 +00:00
Code Wiki Activity

feat: MSC4291, Room IDs as hashes of the create event (1/2)

Browse source
This commit is contained in:
Matthias Ahouansou 2025-08-01 15:52:52 +02:00
parent b5e318561c
commit f6d14fdabd
No known key found for this signature in database
3 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/api/client_server/room.rs
View file

@ -57,7 +57,7 @@ pub async fn create_room_route(
let sender_user = body.sender_user.as_ref().expect("user is authenticated");
let room_id = RoomId::new(services().globals.server_name());
let room_id = RoomId::new_v1(services().globals.server_name());
services().rooms.short.get_or_create_shortroomid(&room_id)?;
@ -622,7 +622,7 @@ pub async fn upgrade_room_route(
.authorization;
// Create a replacement room
let replacement_room = RoomId::new(services().globals.server_name());
let replacement_room = RoomId::new_v1(services().globals.server_name());
services()
.rooms
.short
@ -689,10 +689,11 @@ pub async fn upgrade_room_route(
.map_err(|_| Error::bad_database("Invalid room event in database."))?;
// Use the m.room.tombstone event as the predecessor
let predecessor = Some(ruma::events::room::create::PreviousRoom::new(
body.room_id.clone(),
(*tombstone_event_id).to_owned(),
));
#[allow(deprecated)]
let predecessor = Some(ruma::events::room::create::PreviousRoom {
room_id: body.room_id.clone(),
event_id: Some((*tombstone_event_id).to_owned()),
});
// Send a m.room.create event containing a predecessor field and the applicable room_version
if rules.use_room_create_sender {

2
src/service/admin/mod.rs
View file

@ -1672,7 +1672,7 @@ impl Service {
/// Users in this room are considered admins by conduit, and the room can be
/// used to issue admin commands by talking to the server user inside it.
pub(crate) async fn create_admin_room(&self) -> Result<()> {
let room_id = RoomId::new(services().globals.server_name());
let room_id = RoomId::new_v1(services().globals.server_name());
services().rooms.short.get_or_create_shortroomid(&room_id)?;