oss/continuwuity
oss/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-07-28 02:38:30 +00:00
Code Wiki Activity

fix(space-upgrades): Incorrectly updated parent children events

Browse source
This commit is contained in:
nexy7574 2025-07-19 15:22:50 +01:00 • committed by Jade Ellis
parent 3b5335630d
commit f063814d94
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/api/client/room/upgrade.rs
View file

@ -2,7 +2,7 @@ use std::cmp::max;
use axum::extract::State; use axum::extract::State;
use conduwuit::{ use conduwuit::{
Err, Error, Event, Result, err, info, Err, Error, Event, Result, debug, err, info,
matrix::{StateKey, pdu::PduBuilder}, matrix::{StateKey, pdu::PduBuilder},
}; };
use futures::{FutureExt, StreamExt}; use futures::{FutureExt, StreamExt};
@ -316,7 +316,6 @@ pub(crate) async fn upgrade_room_route(
for raw_space_id in parents { for raw_space_id in parents {
let space_id = RoomId::parse(&raw_space_id)?; let space_id = RoomId::parse(&raw_space_id)?;
let state_key = StateKey::from(raw_space_id.clone());
let Ok(child) = services let Ok(child) = services
.rooms .rooms
.state_accessor .state_accessor
@ -330,8 +329,13 @@ pub(crate) async fn upgrade_room_route(
// If the space does not have a child event for this room, we can skip it // If the space does not have a child event for this room, we can skip it
continue; continue;
}; };
debug!(
"Updating space {space_id} child event for room {} to {replacement_room}",
&body.room_id
);
// First, drop the space's child event // First, drop the space's child event
let state_lock = services.rooms.state.mutex.lock(space_id).await; let state_lock = services.rooms.state.mutex.lock(space_id).await;
debug!("Removing space child event for room {} in space {space_id}", &body.room_id);
services services
.rooms .rooms
.timeline .timeline
@ -340,7 +344,7 @@ pub(crate) async fn upgrade_room_route(
event_type: StateEventType::SpaceChild.into(), event_type: StateEventType::SpaceChild.into(),
content: to_raw_value(&RedactedSpaceChildEventContent {}) content: to_raw_value(&RedactedSpaceChildEventContent {})
.expect("event is valid, we just created it"), .expect("event is valid, we just created it"),
state_key: Some(state_key), state_key: Some(body.room_id.clone().as_str().into()),
..Default::default() ..Default::default()
}, },
sender_user, sender_user,
@ -351,6 +355,7 @@ pub(crate) async fn upgrade_room_route(
.await .await
.ok(); .ok();
// Now, add a new child event for the replacement room // Now, add a new child event for the replacement room
debug!("Adding space child event for room {replacement_room} in space {space_id}");
services services
.rooms .rooms
.timeline .timeline
@ -358,7 +363,7 @@ pub(crate) async fn upgrade_room_route(
PduBuilder { PduBuilder {
event_type: StateEventType::SpaceChild.into(), event_type: StateEventType::SpaceChild.into(),
content: to_raw_value(&child).expect("event is valid, we just created it"), content: to_raw_value(&child).expect("event is valid, we just created it"),
state_key: Some(StateKey::new()), state_key: Some(replacement_room.as_str().into()),
..Default::default() ..Default::default()
}, },
sender_user, sender_user,
@ -368,6 +373,10 @@ pub(crate) async fn upgrade_room_route(
.boxed() .boxed()
.await .await
.ok(); .ok();
debug!(
"Finished updating space {space_id} child event for room {} to {replacement_room}",
&body.room_id
);
drop(state_lock); drop(state_lock);
} }