From 037ce27fb1664fd4cdc55c22116f3c51de86f58a Mon Sep 17 00:00:00 2001 From: Ginger Date: Thu, 11 Sep 2025 16:02:42 -0400 Subject: [PATCH] chore: Clippy fixes --- src/api/client/membership/invite.rs | 2 +- src/api/client/message.rs | 2 +- src/api/client/sync/v3.rs | 2 +- src/api/client/sync/v5.rs | 2 +- src/api/server/invite.rs | 5 ----- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/api/client/membership/invite.rs b/src/api/client/membership/invite.rs index 0263c4913..f69329204 100644 --- a/src/api/client/membership/invite.rs +++ b/src/api/client/membership/invite.rs @@ -73,7 +73,7 @@ pub(crate) async fn invite_user_route( } // check for blocked invites if the recipient is a local user. - if services.globals.user_is_local(&recipient_user) { + if services.globals.user_is_local(recipient_user) { let recipient_filter_level = services .users .invite_filter_level(sender_user, recipient_user) diff --git a/src/api/client/message.rs b/src/api/client/message.rs index 861bbccb6..424807161 100644 --- a/src/api/client/message.rs +++ b/src/api/client/message.rs @@ -7,7 +7,7 @@ use conduwuit::{ }, ref_at, utils::{ - IterStream, ReadyExt, TryFutureExtExt, + IterStream, ReadyExt, result::LogErr, stream::{BroadbandExt, TryIgnore, WidebandExt}, }, diff --git a/src/api/client/sync/v3.rs b/src/api/client/sync/v3.rs index d70cfe44a..1ffeb012c 100644 --- a/src/api/client/sync/v3.rs +++ b/src/api/client/sync/v3.rs @@ -242,7 +242,7 @@ pub(crate) async fn build_sync_events( .state_cache .rooms_invited(sender_user) .wide_filter_map(async |(room_id, invite_state)| { - if is_ignored_invite(&services, sender_user, &room_id).await { + if is_ignored_invite(services, sender_user, &room_id).await { None } else { Some((room_id, invite_state)) diff --git a/src/api/client/sync/v5.rs b/src/api/client/sync/v5.rs index 445a93ac9..8bc9ff295 100644 --- a/src/api/client/sync/v5.rs +++ b/src/api/client/sync/v5.rs @@ -108,7 +108,7 @@ pub(crate) async fn sync_events_v5_route( .state_cache .rooms_invited(sender_user) .wide_filter_map(async |(room_id, invite_state)| { - if is_ignored_invite(&services, sender_user, &room_id).await { + if is_ignored_invite(services, sender_user, &room_id).await { None } else { Some((room_id, invite_state)) diff --git a/src/api/server/invite.rs b/src/api/server/invite.rs index 057af3127..78a65fe81 100644 --- a/src/api/server/invite.rs +++ b/src/api/server/invite.rs @@ -108,11 +108,6 @@ pub(crate) async fn create_invite_route( return Err!(Request(Forbidden("This server does not allow room invites."))); } - let recipient_invite_filter_level = services - .users - .invite_filter_level(sender_user, &recipient_user) - .await; - let mut invite_state = body.invite_room_state.clone(); let mut event: JsonObject = serde_json::from_str(body.event.get())