From 7b180667e8c72c4c7f1d7c8b29c0c8ee2a4b744d Mon Sep 17 00:00:00 2001 From: timedout Date: Wed, 7 Oct 2026 09:53:36 +0100 Subject: [PATCH] style: Reformat --- src/api/client/message.rs | 3 +-- src/api/client/room/upgrade.rs | 11 ++++---- src/api/client/sync/v3/left.rs | 4 +-- src/api/client/sync/v5.rs | 3 +-- src/core/matrix/state_res/event_auth.rs | 27 +++++++++---------- .../rooms/event_handler/handle_outlier_pdu.rs | 4 +-- src/service/rooms/summary/mod.rs | 11 ++++---- src/service/sending/mod.rs | 3 +-- src/service/transactions/mod.rs | 3 +-- src/service/users/account.rs | 3 +-- src/service/users/profile.rs | 3 +-- 11 files changed, 33 insertions(+), 42 deletions(-) diff --git a/src/api/client/message.rs b/src/api/client/message.rs index 72b1b29e5..5f3b3ef6f 100644 --- a/src/api/client/message.rs +++ b/src/api/client/message.rs @@ -380,6 +380,5 @@ pub(crate) async fn is_ignored_invite( services .users .invite_filter_level(&sender_user, recipient_user) - .await - == FilterLevel::Ignore + .await == FilterLevel::Ignore } diff --git a/src/api/client/room/upgrade.rs b/src/api/client/room/upgrade.rs index 1d4a623f1..38a594fcc 100644 --- a/src/api/client/room/upgrade.rs +++ b/src/api/client/room/upgrade.rs @@ -305,8 +305,8 @@ pub(crate) async fn upgrade_room_route( return Err!(Request(Forbidden("Upgrading the admin room this way is not allowed."))); } - // 1. Check that the user has permission to send m.room.tombstone events in - // the room. + // 1. Check that the user has permission to send m.room.tombstone events in the + // room. let old_room_state_lock = services.rooms.state.mutex.lock(body.room_id.as_str()).await; // Check tombstone permission by attempting to create (but not send) the @@ -556,8 +556,8 @@ pub(crate) async fn upgrade_room_route( )?; } - // 5. Send a `m.room.tombstone` event to the old room to indicate that it is - // not intended to be used any further. + // 5. Send a `m.room.tombstone` event to the old room to indicate that it is not + // intended to be used any further. debug!(target=?body.room_id, "Sending tombstone to old room"); services .rooms @@ -598,8 +598,7 @@ pub(crate) async fn upgrade_room_route( power_levels.events_default = new_level; power_levels.invite = new_level; - // 6. Modify the power levels in the old room to prevent sending of events - // and + // 6. Modify the power levels in the old room to prevent sending of events and // inviting new users // Spec dictates that this is allowed to fail. debug!(target=?body.room_id, ?new_level, "Raising power level in old room to lock it"); diff --git a/src/api/client/sync/v3/left.rs b/src/api/client/sync/v3/left.rs index d5d453da1..2e6776284 100644 --- a/src/api/client/sync/v3/left.rs +++ b/src/api/client/sync/v3/left.rs @@ -74,8 +74,8 @@ pub(super) async fn load_left_room( // return early if: // - this is an initial sync and the room filter doesn't include leaves, or - // - this is an incremental sync, and we've already synced the leave, and - // the room filter doesn't include leaves + // - this is an incremental sync, and we've already synced the leave, and the + // room filter doesn't include leaves if last_sync_end_count.is_none_or(|last_sync_end_count| last_sync_end_count >= left_count) && !filter.room.include_leave { diff --git a/src/api/client/sync/v5.rs b/src/api/client/sync/v5.rs index 7f8997aec..94e8c215d 100644 --- a/src/api/client/sync/v5.rs +++ b/src/api/client/sync/v5.rs @@ -726,8 +726,7 @@ async fn stripped_state_event( .get_field::("type") .ok() .flatten() - .as_ref() - == Some(event_type) + .as_ref() == Some(event_type) }) } diff --git a/src/core/matrix/state_res/event_auth.rs b/src/core/matrix/state_res/event_auth.rs index e5693cf78..3aa470496 100644 --- a/src/core/matrix/state_res/event_auth.rs +++ b/src/core/matrix/state_res/event_auth.rs @@ -763,8 +763,8 @@ where Ok(match target_membership { | MembershipState::Join => { trace!("starting target_membership=join check"); - // 1. If the only previous event is an m.room.create and the - // state_key is the creator, + // 1. If the only previous event is an m.room.create and the state_key is the + // creator, // allow let mut prev_events = current_event.prev_events(); @@ -1052,8 +1052,8 @@ where allow }, | MembershipState::Knock if room_version.authorization.knocking => { - // 1. If the `join_rule` is anything other than `knock` or - // `knock_restricted`, reject. + // 1. If the `join_rule` is anything other than `knock` or `knock_restricted`, + // reject. if !matches!(join_rules, JoinRule::KnockRestricted(_) | JoinRule::Knock) { warn!( "Join rule is not set to knock or knock_restricted, knocking is not allowed" @@ -1062,8 +1062,8 @@ where } else if matches!(join_rules, JoinRule::KnockRestricted(_)) && !room_version.authorization.knock_restricted_join_rule { - // 2. If the `join_rule` is `knock_restricted`, but the room - // does not support `knock_restricted`, reject. + // 2. If the `join_rule` is `knock_restricted`, but the room does not support + // `knock_restricted`, reject. warn!( "Join rule is set to knock_restricted but room version does not support \ knock_restricted, knocking is not allowed" @@ -1081,8 +1081,8 @@ where sender_membership, MembershipState::Ban | MembershipState::Invite | MembershipState::Join ) { - // 4. If the `sender`'s current membership is not `ban`, - // `invite`, or `join`, allow. + // 4. If the `sender`'s current membership is not `ban`, `invite`, or `join`, + // allow. // 5. Otherwise, reject. warn!( ?target_user_membership_event_id, @@ -1173,12 +1173,11 @@ fn check_power_levels( } // - If any of the keys users_default, events_default, state_default, ban, - // redact, kick, or invite in content are present and not an integer, - // reject. - // - If either of the keys events or notifications in content are present - // and not a dictionary with values that are integers, reject. - // - If users key in content is not a dictionary with keys that are valid - // user IDs with values that are integers, reject. + // redact, kick, or invite in content are present and not an integer, reject. + // - If either of the keys events or notifications in content are present and + // not a dictionary with values that are integers, reject. + // - If users key in content is not a dictionary with keys that are valid user + // IDs with values that are integers, reject. let user_content: RoomPowerLevelsEventContent = deserialize_power_levels(power_event.content().get(), room_version)?; diff --git a/src/service/rooms/event_handler/handle_outlier_pdu.rs b/src/service/rooms/event_handler/handle_outlier_pdu.rs index ee81a0c04..4c2cd2d54 100644 --- a/src/service/rooms/event_handler/handle_outlier_pdu.rs +++ b/src/service/rooms/event_handler/handle_outlier_pdu.rs @@ -161,8 +161,8 @@ impl super::Service { } } - // 4. Reject "due to auth events" if the event doesn't pass auth based - // on the claimed auth events + // 4. Reject "due to auth events" if the event doesn't pass auth based on the + // claimed auth events debug!("Checking based on auth events"); let mut auth_events_by_key: HashMap<_, _> = HashMap::with_capacity(auth_events.len()); // Build map of auth events diff --git a/src/service/rooms/summary/mod.rs b/src/service/rooms/summary/mod.rs index f2d56eb52..604c5c8dc 100644 --- a/src/service/rooms/summary/mod.rs +++ b/src/service/rooms/summary/mod.rs @@ -553,12 +553,11 @@ impl Service { .services .state_cache .is_joined(querying_user, &summary.room_id) - .await - || self - .services - .state_cache - .is_invited(querying_user, &summary.room_id) - .await) + .await || self + .services + .state_cache + .is_invited(querying_user, &summary.room_id) + .await) { return true; } diff --git a/src/service/sending/mod.rs b/src/service/sending/mod.rs index 8cb1010cf..b244eff57 100644 --- a/src/service/sending/mod.rs +++ b/src/service/sending/mod.rs @@ -289,8 +289,7 @@ impl Service { .services .state_cache .appservice_in_room(room_id, &appservice) - .await - || matching_aliases(appservice.aliases.clone()).await + .await || matching_aliases(appservice.aliases.clone()).await { _ = self .send_edu_appservice(&appservice.registration.id, serialized.clone()) diff --git a/src/service/transactions/mod.rs b/src/service/transactions/mod.rs index 094317c8b..c95cf346f 100644 --- a/src/service/transactions/mod.rs +++ b/src/service/transactions/mod.rs @@ -198,8 +198,7 @@ impl Service { && let active_count = state .values() .filter(|v| matches!(v, TxnState::Active(_))) - .count() - && active_count >= max_active_txns + .count() && active_count >= max_active_txns { warn!( active = active_count, diff --git a/src/service/users/account.rs b/src/service/users/account.rs index 39cadab32..b8b1e261f 100644 --- a/src/service/users/account.rs +++ b/src/service/users/account.rs @@ -409,8 +409,7 @@ impl super::Service { .services .appservice .is_exclusive_user_id(&user_id) - .await - && !emergency_mode_enabled + .await && !emergency_mode_enabled { return Err!(Request(Exclusive("Username is reserved by an appservice."))); } diff --git a/src/service/users/profile.rs b/src/service/users/profile.rs index 954b0eac4..614ff851c 100644 --- a/src/service/users/profile.rs +++ b/src/service/users/profile.rs @@ -81,8 +81,7 @@ impl super::Service { if let Ok(canonical_profile) = to_canonical_object(full_profile) { if serde_json::to_string(&canonical_profile) .expect("should be able to serialize to string") - .len() - > MAX_PROFILE_LENGTH_BYTES + .len() > MAX_PROFILE_LENGTH_BYTES { return Err!( "Profile data must not exceed {MAX_PROFILE_LENGTH_BYTES} bytes in \