From ddb4ef539f8a08aa0acfb49bd5b064a3a0273ca2 Mon Sep 17 00:00:00 2001 From: timedout Date: Tue, 16 Jun 2026 18:31:09 +0100 Subject: [PATCH] fix: un-forget how streams work --- .../rooms/event_handler/handle_incoming_pdu.rs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/service/rooms/event_handler/handle_incoming_pdu.rs b/src/service/rooms/event_handler/handle_incoming_pdu.rs index 750de59d8..a082b370b 100644 --- a/src/service/rooms/event_handler/handle_incoming_pdu.rs +++ b/src/service/rooms/event_handler/handle_incoming_pdu.rs @@ -15,7 +15,6 @@ room::member::{MembershipState, RoomMemberEventContent}, }, }; -use serde_json::{json, value::to_raw_value}; use crate::rooms::timeline::{RawPduId, pdu_fits}; @@ -272,13 +271,8 @@ pub async fn handle_incoming_pdu<'a>( "Attempting to squash extremities after upgrading pdu" ); // Try to send a dummy event to squash extremities. See issue #1844 - while let Some(user_id) = self - .services - .state_cache - .local_users_in_room(room_id) - .next() - .await - { + let mut local_users = self.services.state_cache.local_users_in_room(room_id); + while let Some(user_id) = local_users.next().await { let state_lock = self.services.state.mutex.lock(room_id).await; if self .services @@ -286,11 +280,7 @@ pub async fn handle_incoming_pdu<'a>( .build_and_append_pdu( PartialPdu { event_type: "org.matrix.dummy_event".into(), - content: to_raw_value(&json!({})).expect("john json"), - unsigned: None, - state_key: None, - redacts: None, - timestamp: None, + ..PartialPdu::default() }, &user_id, Some(room_id),