diff --git a/src/admin/user/commands.rs b/src/admin/user/commands.rs index 0278649c..17ea503f 100644 --- a/src/admin/user/commands.rs +++ b/src/admin/user/commands.rs @@ -5,7 +5,7 @@ use std::{ use api::client::{full_user_deactivate, join_room_by_id_helper, leave_room, remote_leave_room}; use conduwuit::{ - Err, Result, debug, debug_warn, error, info, is_equal_to, + Err, Result, debug_warn, error, info, matrix::{Event, pdu::PduBuilder}, utils::{self, ReadyExt}, warn, diff --git a/src/api/client/account.rs b/src/api/client/account.rs index 174499f5..ca0be346 100644 --- a/src/api/client/account.rs +++ b/src/api/client/account.rs @@ -3,7 +3,7 @@ use std::fmt::Write; use axum::extract::State; use axum_client_ip::InsecureClientIp; use conduwuit::{ - Err, Error, Event, Result, debug_info, err, error, info, is_equal_to, + Err, Error, Event, Result, debug_info, err, error, info, matrix::pdu::PduBuilder, utils::{self, ReadyExt, stream::BroadbandExt}, warn, diff --git a/src/service/admin/grant.rs b/src/service/admin/grant.rs index 809ba4fe..3054627a 100644 --- a/src/service/admin/grant.rs +++ b/src/service/admin/grant.rs @@ -9,7 +9,6 @@ use ruma::{ RoomAccountDataEventType, StateEventType, room::{ member::{MembershipState, RoomMemberEventContent}, - message::RoomMessageEventContent, power_levels::RoomPowerLevelsEventContent, }, tag::{TagEvent, TagEventContent, TagInfo}, diff --git a/src/service/firstrun/mod.rs b/src/service/firstrun/mod.rs index edb7c624..27290372 100644 --- a/src/service/firstrun/mod.rs +++ b/src/service/firstrun/mod.rs @@ -5,7 +5,7 @@ use std::{ use askama::Template; use async_trait::async_trait; -use conduwuit::{Result, info, utils::ReadyExt, warn}; +use conduwuit::{Result, utils::ReadyExt}; use futures::StreamExt; use ruma::{UserId, events::room::message::RoomMessageEventContent}; diff --git a/src/service/users/mod.rs b/src/service/users/mod.rs index 4563bdc4..463fd9b2 100644 --- a/src/service/users/mod.rs +++ b/src/service/users/mod.rs @@ -30,7 +30,7 @@ use ruma::{ use serde::{Deserialize, Serialize}; use serde_json::json; -use crate::{Dep, account_data, admin, appservice, firstrun, globals, rooms}; +use crate::{Dep, account_data, admin, appservice, globals, rooms}; #[derive(Debug, Clone, Serialize, Deserialize)] pub struct UserSuspension { @@ -55,7 +55,6 @@ struct Services { globals: Dep, state_accessor: Dep, state_cache: Dep, - firstrun: Dep, } struct Data { @@ -97,7 +96,6 @@ impl crate::Service for Service { state_accessor: args .depend::("rooms::state_accessor"), state_cache: args.depend::("rooms::state_cache"), - firstrun: args.depend::("firstrun"), }, db: Data { keychangeid_userid: args.db["keychangeid_userid"].clone(),