From 480e9758772e2e4f49718b4293e83b7e82fd4229 Mon Sep 17 00:00:00 2001 From: Logan Devine Date: Sun, 19 Jul 2026 10:15:39 -0700 Subject: [PATCH] chore: clean up unused imports of ClientIp --- src/api/client/account/mod.rs | 2 +- src/api/client/dehydrated_device.rs | 2 +- src/api/client/directory.rs | 2 +- src/api/client/media.rs | 2 +- src/api/client/media_legacy.rs | 2 +- src/api/client/membership/invite.rs | 2 +- src/api/client/membership/join.rs | 2 +- src/api/client/membership/knock.rs | 2 +- src/api/client/report.rs | 2 +- src/api/client/room/summary.rs | 2 +- src/api/server/invite.rs | 2 +- src/api/server/media.rs | 2 +- src/api/server/publicrooms.rs | 2 +- src/api/server/send.rs | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/api/client/account/mod.rs b/src/api/client/account/mod.rs index bcd8768cd..be7d46bfa 100644 --- a/src/api/client/account/mod.rs +++ b/src/api/client/account/mod.rs @@ -26,7 +26,7 @@ use ruma::{ use service::{mailer::messages, uiaa::UiaaInitiator, users::HashedPassword}; use super::DEVICE_ID_LENGTH; -use crate::{Ruma, client_ip::ClientIp, router::ClientIdentity}; +use crate::{Ruma, router::ClientIdentity}; pub(crate) mod register; pub(crate) mod threepid; diff --git a/src/api/client/dehydrated_device.rs b/src/api/client/dehydrated_device.rs index 2b78bd180..72ae2b955 100644 --- a/src/api/client/dehydrated_device.rs +++ b/src/api/client/dehydrated_device.rs @@ -11,7 +11,7 @@ use ruma::{ assign, }; -use crate::{Ruma, client_ip::ClientIp}; +use crate::Ruma; const MAX_BATCH_EVENTS: usize = 50; diff --git a/src/api/client/directory.rs b/src/api/client/directory.rs index f19b16a44..a4d137202 100644 --- a/src/api/client/directory.rs +++ b/src/api/client/directory.rs @@ -27,7 +27,7 @@ use ruma::{ }; use tokio::join; -use crate::{Ruma, client_ip::ClientIp}; +use crate::Ruma; /// # `POST /_matrix/client/v3/publicRooms` /// diff --git a/src/api/client/media.rs b/src/api/client/media.rs index 2b41b765c..824d98541 100644 --- a/src/api/client/media.rs +++ b/src/api/client/media.rs @@ -23,7 +23,7 @@ use ruma::{ }; use service::media::mxc::Mxc; -use crate::{Ruma, client_ip::ClientIp}; +use crate::Ruma; /// # `GET /_matrix/client/v1/media/config` pub(crate) async fn get_media_config_route( diff --git a/src/api/client/media_legacy.rs b/src/api/client/media_legacy.rs index 3ddea19b7..ddc7e9c92 100644 --- a/src/api/client/media_legacy.rs +++ b/src/api/client/media_legacy.rs @@ -16,7 +16,7 @@ use ruma::{ }; use service::media::mxc::Mxc; -use crate::{Ruma, RumaResponse, client::create_content_route, client_ip::ClientIp}; +use crate::{Ruma, RumaResponse, client::create_content_route}; /// # `GET /_matrix/media/v3/config` /// diff --git a/src/api/client/membership/invite.rs b/src/api/client/membership/invite.rs index c9b4ac4f7..cf88de8f9 100644 --- a/src/api/client/membership/invite.rs +++ b/src/api/client/membership/invite.rs @@ -17,7 +17,7 @@ use ruminuwuity::invite_permission_config::FilterLevel; use service::Services; use super::banned_room_check; -use crate::{Ruma, client_ip::ClientIp}; +use crate::Ruma; /// # `POST /_matrix/client/r0/rooms/{roomId}/invite` /// diff --git a/src/api/client/membership/join.rs b/src/api/client/membership/join.rs index 70f2c46a8..037941e79 100644 --- a/src/api/client/membership/join.rs +++ b/src/api/client/membership/join.rs @@ -11,7 +11,7 @@ use ruma::{ }; use super::banned_room_check; -use crate::{Ruma, client_ip::ClientIp}; +use crate::Ruma; /// # `POST /_matrix/client/r0/rooms/{roomId}/join` /// diff --git a/src/api/client/membership/knock.rs b/src/api/client/membership/knock.rs index b7184bb08..583fc6e94 100644 --- a/src/api/client/membership/knock.rs +++ b/src/api/client/membership/knock.rs @@ -39,7 +39,7 @@ use service::{ }; use super::banned_room_check; -use crate::{Ruma, client_ip::ClientIp}; +use crate::Ruma; /// # `POST /_matrix/client/*/knock/{roomIdOrAlias}` /// diff --git a/src/api/client/report.rs b/src/api/client/report.rs index 15294ad95..a0d1bea26 100644 --- a/src/api/client/report.rs +++ b/src/api/client/report.rs @@ -13,7 +13,7 @@ use ruma::{ }; use tokio::time::sleep; -use crate::{Ruma, client_ip::ClientIp}; +use crate::Ruma; struct Report { sender: OwnedUserId, diff --git a/src/api/client/room/summary.rs b/src/api/client/room/summary.rs index 834c362ce..da6958242 100644 --- a/src/api/client/room/summary.rs +++ b/src/api/client/room/summary.rs @@ -3,7 +3,7 @@ use conduwuit::{Err, Result}; use ruma::api::client::room::get_summary; use service::rooms::summary::Accessibility; -use crate::{Ruma, client_ip::ClientIp, router::ClientIdentity}; +use crate::{Ruma, router::ClientIdentity}; /// # `GET /_matrix/client/v1/room_summary/{roomIdOrAlias}` /// diff --git a/src/api/server/invite.rs b/src/api/server/invite.rs index bb95892f2..8ad765b27 100644 --- a/src/api/server/invite.rs +++ b/src/api/server/invite.rs @@ -22,7 +22,7 @@ use ruma::{ }; use serde::Deserialize; -use crate::{Ruma, client_ip::ClientIp, server::utils::validate_any_membership_event}; +use crate::{Ruma, server::utils::validate_any_membership_event}; /// # `PUT /_matrix/federation/v2/invite/{roomId}/{eventId}` /// diff --git a/src/api/server/media.rs b/src/api/server/media.rs index 8a227003e..98b3ae7ed 100644 --- a/src/api/server/media.rs +++ b/src/api/server/media.rs @@ -6,7 +6,7 @@ use ruma::api::federation::authenticated_media::{ }; use service::media::mxc::Mxc; -use crate::{Ruma, client_ip::ClientIp}; +use crate::Ruma; /// # `GET /_matrix/federation/v1/media/download/{mediaId}` /// diff --git a/src/api/server/publicrooms.rs b/src/api/server/publicrooms.rs index 813a989df..42baf081f 100644 --- a/src/api/server/publicrooms.rs +++ b/src/api/server/publicrooms.rs @@ -6,7 +6,7 @@ use ruma::{ directory::Filter, }; -use crate::{Ruma, client_ip::ClientIp}; +use crate::Ruma; /// # `POST /_matrix/federation/v1/publicRooms` /// diff --git a/src/api/server/send.rs b/src/api/server/send.rs index 7d588dd18..3599c105b 100644 --- a/src/api/server/send.rs +++ b/src/api/server/send.rs @@ -45,7 +45,7 @@ use service::{ use tokio::sync::watch::{Receiver, Sender}; use tracing::instrument; -use crate::{Ruma, client_ip::ClientIp}; +use crate::Ruma; type ResolvedMap = BTreeMap; type Pdu = (OwnedRoomId, OwnedEventId, CanonicalJsonObject);