magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

larcen state-res from ruma

Browse source
This commit is contained in:
Jason Volk 2025-02-05 12:22:22 +00:00 • committed by strawberry
parent b872f8e593
commit 0a9a9b3c92
24 changed files with 5082 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/client/membership.rs
View file

@ -12,7 +12,7 @@ use conduwuit::{
at, debug, debug_info, debug_warn, err, info,
pdu::{gen_event_id_canonical_json, PduBuilder},
result::FlatOk,
trace,
state_res, trace,
utils::{self, shuffle, IterStream, ReadyExt},
warn, Err, PduEvent, Result,
};
@ -40,8 +40,8 @@ use ruma::{
},
StateEventType,
},
state_res, CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedRoomId,
OwnedServerName, OwnedUserId, RoomId, RoomVersionId, ServerName, UserId,
CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedRoomId, OwnedServerName,
OwnedUserId, RoomId, RoomVersionId, ServerName, UserId,
};
use service::{
appservice::RegistrationInfo,

3
src/api/client/sync/v5.rs
View file

@ -11,7 +11,7 @@ use conduwuit::{
math::{ruma_from_usize, usize_from_ruma},
BoolExt, IterStream, ReadyExt, TryFutureExtExt,
},
warn, Error, Result,
warn, Error, Result, TypeStateKey,
};
use futures::{FutureExt, StreamExt, TryFutureExt};
use ruma::{
@ -24,7 +24,6 @@ use ruma::{
AnyRawAccountDataEvent, AnySyncEphemeralRoomEvent, StateEventType, TimelineEventType,
},
serde::Raw,
state_res::TypeStateKey,
uint, DeviceId, OwnedEventId, OwnedRoomId, RoomId, UInt, UserId,
};
use service::{rooms::read_receipt::pack_receipts, PduCount};