melody/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-06-26 17:46:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

lock the getter instead ??? c/o M
Some checks failed
Release Docker Image / define-variables (push) Failing after 1s
Details
Release Docker Image / build-image (linux/amd64, linux-amd64) (push) Has been skipped
Details
Release Docker Image / build-image (linux/arm64, linux-arm64) (push) Has been skipped
Details
Release Docker Image / merge (push) Has been skipped
Details
Rust Checks / Format (push) Failing after 1s
Details
Rust Checks / Clippy (push) Failing after 24s
Details
Rust Checks / Cargo Test (push) Failing after 25s
Details

Browse source
This commit is contained in:
Jacob Taylor 2025-06-18 16:57:19 -07:00
parent cd29b06221
commit 660c260b8d
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/service/rooms/event_handler/upgrade_outlier_pdu.rs
View file

@ -141,7 +141,7 @@ pub(super) async fn upgrade_outlier_to_timeline_pdu(
let extremities: Vec<_> = self let extremities: Vec<_> = self
.services .services
.state .state
.get_forward_extremities(room_id) .get_forward_extremities(room_id, &state_lock)
.map(ToOwned::to_owned) .map(ToOwned::to_owned)
.ready_filter(|event_id| { .ready_filter(|event_id| {
// Remove any that are referenced by this incoming event's prev_events // Remove any that are referenced by this incoming event's prev_events

1
src/service/rooms/state/mod.rs
View file

@ -384,6 +384,7 @@ impl Service {
pub fn get_forward_extremities<'a>( pub fn get_forward_extremities<'a>(
&'a self, &'a self,
room_id: &'a RoomId, room_id: &'a RoomId,
_state_lock: &'a RoomMutexGuard,
) -> impl Stream<Item = &EventId> + Send + '_ { ) -> impl Stream<Item = &EventId> + Send + '_ {
let prefix = (room_id, Interfix); let prefix = (room_id, Interfix);

2
src/service/rooms/timeline/mod.rs
View file

@ -654,7 +654,7 @@ impl Service {
let prev_events: Vec<OwnedEventId> = self let prev_events: Vec<OwnedEventId> = self
.services .services
.state .state
.get_forward_extremities(room_id) .get_forward_extremities(room_id, _mutex_lock)
.take(20) .take(20)
.map(Into::into) .map(Into::into)
.collect() .collect()