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

syncv3: use RoomTypeFilter struct instead of Option<RoomType>

Browse source 
Signed-off-by: morguldir <morguldir@protonmail.com>
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
morguldir 2024-09-07 18:09:21 +02:00
parent 593d3bb321
commit 3e0d404fb4
No known key found for this signature in database
GPG key ID: 5A6025D4F6E7A8A3
3 changed files with 31 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/api/client/sync.rs
View file

@ -25,12 +25,12 @@ use ruma::{
},
uiaa::UiaaResponse,
},
directory::RoomTypeFilter,
events::{
presence::PresenceEvent,
room::member::{MembershipState, RoomMemberEventContent},
AnyRawAccountDataEvent, StateEventType, TimelineEventType,
},
room::RoomType,
serde::Raw,
state_res::Event,
uint, DeviceId, EventId, MilliSecondsSinceUnixEpoch, OwnedRoomId, OwnedUserId, RoomId, UInt, UserId,
@ -1760,32 +1760,23 @@ pub(crate) async fn sync_events_v4_route(
}
fn filter_rooms(
rooms: &[OwnedRoomId], State(services): State<crate::State>, filter: &[Option<RoomType>], negate: bool,
rooms: &[OwnedRoomId], State(services): State<crate::State>, filter: &[RoomTypeFilter], negate: bool,
) -> Vec<OwnedRoomId> {
return rooms
.iter()
.filter(|r| {
match services.rooms.state_accessor.get_room_type(r) {
Err(e) => {
warn!("Requested room type for {}, but could not retrieve with error {}", r, e);
false
},
Ok(None) => {
// For rooms which do not have a room type, use 'null' to include them
if negate {
!filter.contains(&None)
} else {
filter.contains(&None)
}
},
Ok(Some(room_type)) => {
if negate {
!filter.contains(&Some(room_type))
} else {
filter.is_empty() || filter.contains(&Some(room_type))
}
},
}
.filter(|r| match services.rooms.state_accessor.get_room_type(r) {
Err(e) => {
warn!("Requested room type for {}, but could not retrieve with error {}", r, e);
false
},
Ok(result) => {
let result = RoomTypeFilter::from(result);
if negate {
!filter.contains(&result)
} else {
filter.is_empty() || filter.contains(&result)
}
},
})
.cloned()
.collect();