style: Reformat

This commit is contained in:
timedout
2026-05-09 20:06:53 +01:00
parent 5d4b7bfea3
commit 3764faeefc
5 changed files with 50 additions and 44 deletions
@@ -1,13 +1,13 @@
use std::collections::{hash_map, BTreeMap, HashMap};
use std::collections::{BTreeMap, HashMap, hash_map};
use conduwuit::{
debug, debug_info, debug_warn, err, implement, state_res, trace, warn, Err, Event,
PduEvent, Result,
Err, Event, PduEvent, Result, debug, debug_info, debug_warn, err, implement, state_res,
trace, warn,
};
use futures::future::ready;
use ruma::{
events::StateEventType, CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, RoomId,
ServerName,
CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, RoomId, ServerName,
events::StateEventType,
};
use super::{check_room_id, get_room_version_rules};
+20 -20
View File
@@ -1,46 +1,46 @@
use std::{collections::HashMap, sync::Arc};
use conduwuit::{
debug, debug_info, debug_warn, err, error, info, is_true, matrix::{
event::{gen_event_id, gen_event_id_canonical_json},
Err, Pdu, Result, Server, debug, debug_info, debug_warn, err, error, info, is_true,
matrix::{
StateKey,
}, pdu::PartialPdu, state_res, trace,
utils::{self, to_canonical_object, IterStream, ReadyExt},
event::{gen_event_id, gen_event_id_canonical_json},
},
pdu::PartialPdu,
state_res, trace,
utils::{self, IterStream, ReadyExt, to_canonical_object},
warn,
Err, Pdu,
Result,
Server,
};
use database::Database;
use futures::{join, FutureExt, StreamExt, TryFutureExt};
use futures::{FutureExt, StreamExt, TryFutureExt, join};
use ruma::{
CanonicalJsonObject, CanonicalJsonValue, OwnedRoomId, OwnedServerName, OwnedUserId, RoomId,
RoomVersionId, UserId,
api::{
error::{ErrorKind, IncompatibleRoomVersionErrorData},
federation,
}, canonical_json::to_canonical_value, events::{
},
canonical_json::to_canonical_value,
events::{
StateEventType, StaticEventContent,
room::{
join_rules::RoomJoinRulesEventContent,
member::{MembershipState, RoomMemberEventContent},
}, StateEventType,
StaticEventContent,
}, room::{AllowRule, JoinRule}, CanonicalJsonObject, CanonicalJsonValue,
OwnedRoomId, OwnedServerName,
OwnedUserId,
RoomId,
RoomVersionId,
UserId,
},
},
room::{AllowRule, JoinRule},
};
use crate::{
antispam, globals, rooms::{
Dep, antispam, globals,
rooms::{
metadata, outlier, pdu_metadata, short,
state::{self, RoomMutexGuard},
state_accessor, state_cache,
state_compressor::{self, CompressedState, HashSetCompressStateEvent},
timeline::{self, pdu_fits},
},
sending,
server_keys, users, Dep,
sending, server_keys, users,
};
pub struct Service {
+3 -3
View File
@@ -4,22 +4,22 @@ use conduwuit::{
arrayvec::ArrayVec,
matrix::{Event, PduCount},
utils::{
ReadyExt,
stream::{TryIgnore, WidebandExt},
u64_from_u8,
ReadyExt,
},
};
use database::Map;
use futures::{Stream, StreamExt};
use ruma::{api::Direction, EventId, RoomId, UserId};
use ruma::{EventId, RoomId, UserId, api::Direction};
use crate::{
Dep,
rooms::{
self,
short::{ShortEventId, ShortRoomId},
timeline::{PduId, PdusIterItem, RawPduId},
},
Dep,
};
pub(super) struct Data {
+4 -4
View File
@@ -2,14 +2,14 @@ mod bundled_aggregations;
mod data;
use std::sync::Arc;
use conduwuit::{matrix::PduCount, Result};
use futures::{future::try_join, StreamExt};
use ruma::{api::Direction, EventId, RoomId, UserId};
use conduwuit::{Result, matrix::PduCount};
use futures::{StreamExt, future::try_join};
use ruma::{EventId, RoomId, UserId, api::Direction};
use self::data::Data;
use crate::{
rooms::{self, timeline::PdusIterItem},
Dep,
rooms::{self, timeline::PdusIterItem},
};
pub struct Service {