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

style(presence): use flat_map instead of matching Results in filter

Browse source
This commit is contained in:
Jakub Kubík 2023-12-20 12:04:47 +01:00 • committed by strawberry
parent e93b4aa08e
commit 69025d30f7
5 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/service/rooms/edus/presence/data.rs
View file

@ -29,5 +29,5 @@ pub trait Data: Send + Sync {
&'a self,
room_id: &RoomId,
since: u64,
) -> Box<dyn Iterator<Item = Result<(OwnedUserId, u64, PresenceEvent)>> + 'a>;
) -> Box<dyn Iterator<Item = (OwnedUserId, u64, PresenceEvent)> + 'a>;
}

6
src/service/rooms/edus/presence/mod.rs
View file

@ -122,11 +122,11 @@ impl Service {
}
/// Returns the most recent presence updates that happened after the event with id `since`.
pub fn presence_since<'a>(
&'a self,
pub fn presence_since(
&self,
room_id: &RoomId,
since: u64,
) -> Box<dyn Iterator<Item = Result<(OwnedUserId, u64, PresenceEvent)>> + 'a> {
) -> Box<dyn Iterator<Item = (OwnedUserId, u64, PresenceEvent)>> {
self.db.presence_since(room_id, since)
}
}

4
src/service/sending/mod.rs
View file

@ -290,14 +290,12 @@ impl Service {
// Look for presence updates in this room
let mut presence_updates = Vec::new();
for presence_data in services()
for (user_id, count, presence_event) in services()
.rooms
.edus
.presence
.presence_since(&room_id, since)
{
let (user_id, count, presence_event) = presence_data?;
if count > max_edu_count {
max_edu_count = count;
}