From 23d188f6122f5814275cfd217d091fa8e3882e25 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 8 Jul 2025 12:27:29 +0000 Subject: [PATCH] Spacing/formatting adjustments. Signed-off-by: Jason Volk --- src/service/admin/grant.rs | 2 ++ src/service/admin/mod.rs | 1 + src/service/rooms/auth_chain/mod.rs | 1 + src/service/rooms/event_handler/mod.rs | 1 + src/service/rooms/state/mod.rs | 1 + src/service/rooms/timeline/create.rs | 1 - src/service/sending/sender.rs | 1 + src/service/services.rs | 2 ++ 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/service/admin/grant.rs b/src/service/admin/grant.rs index c61ee68e..d9a513e6 100644 --- a/src/service/admin/grant.rs +++ b/src/service/admin/grant.rs @@ -38,6 +38,7 @@ pub async fn make_user_admin(&self, user_id: &UserId) -> Result { { return Err!(debug_warn!("User is already joined in the admin room")); } + if self .services .state_cache @@ -132,6 +133,7 @@ pub async fn make_user_admin(&self, user_id: &UserId) -> Result { .config .admin_room_tag .as_str(); + if !room_tag.is_empty() { if let Err(e) = self .set_room_tag(&room_id, user_id, room_tag) diff --git a/src/service/admin/mod.rs b/src/service/admin/mod.rs index 89888990..dadf351b 100644 --- a/src/service/admin/mod.rs +++ b/src/service/admin/mod.rs @@ -428,6 +428,7 @@ impl Service { .services .write() .expect("locked for writing"); + let weak = services.map(Arc::downgrade); *receiver = weak; } diff --git a/src/service/rooms/auth_chain/mod.rs b/src/service/rooms/auth_chain/mod.rs index ec519785..52d41d68 100644 --- a/src/service/rooms/auth_chain/mod.rs +++ b/src/service/rooms/auth_chain/mod.rs @@ -157,6 +157,7 @@ async fn get_auth_chain_outer( let auth_chain = self .get_auth_chain_inner(room_id, event_id) .await?; + self.cache_auth_chain_vec(vec![shortid], auth_chain.as_slice()); debug!( ?event_id, diff --git a/src/service/rooms/event_handler/mod.rs b/src/service/rooms/event_handler/mod.rs index bfb3c290..bc91f17d 100644 --- a/src/service/rooms/event_handler/mod.rs +++ b/src/service/rooms/event_handler/mod.rs @@ -90,6 +90,7 @@ impl crate::Service for Service { .read() .expect("locked for reading") .len(); + writeln!(out, "federation_handletime: {federation_handletime}")?; Ok(()) diff --git a/src/service/rooms/state/mod.rs b/src/service/rooms/state/mod.rs index fef12ed5..84963c00 100644 --- a/src/service/rooms/state/mod.rs +++ b/src/service/rooms/state/mod.rs @@ -225,6 +225,7 @@ impl Service { } else { (state_ids_compressed, Arc::new(CompressedState::new())) }; + self.services .state_compressor .save_state_from_diff( diff --git a/src/service/rooms/timeline/create.rs b/src/service/rooms/timeline/create.rs index ab263cb0..545fd296 100644 --- a/src/service/rooms/timeline/create.rs +++ b/src/service/rooms/timeline/create.rs @@ -86,7 +86,6 @@ pub async fn create_hash_and_sign_event( .saturating_add(uint!(1)); let mut unsigned = unsigned.unwrap_or_default(); - if let Some(state_key) = &state_key { if let Ok(prev_pdu) = self .services diff --git a/src/service/sending/sender.rs b/src/service/sending/sender.rs index c5244b8c..f50deaff 100644 --- a/src/service/sending/sender.rs +++ b/src/service/sending/sender.rs @@ -184,6 +184,7 @@ impl Service { .into_iter() .map(|(_, event)| event) .collect(); + futures.push(self.send_events(dest.clone(), new_events_vec)); } else { statuses.remove(dest); diff --git a/src/service/services.rs b/src/service/services.rs index 69eb1ac7..b882409f 100644 --- a/src/service/services.rs +++ b/src/service/services.rs @@ -117,6 +117,7 @@ impl Services { self.admin .set_services(Some(Arc::clone(self)).as_ref()); + super::migrations::migrations(self).await?; self.manager .lock() @@ -137,6 +138,7 @@ impl Services { } debug_info!("Services startup complete."); + Ok(Arc::clone(self)) }