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

further optimize presence_since iteration

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-10-22 03:28:45 +00:00 • committed by strawberry
parent c06f560913
commit 0e0438e1f9
5 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/service/presence/data.rs
View file

@ -7,7 +7,7 @@ use conduit::{
};
use database::{Deserialized, Json, Map};
use futures::Stream;
use ruma::{events::presence::PresenceEvent, presence::PresenceState, OwnedUserId, UInt, UserId};
use ruma::{events::presence::PresenceEvent, presence::PresenceState, UInt, UserId};
use super::Presence;
use crate::{globals, users, Dep};
@ -137,13 +137,14 @@ impl Data {
self.userid_presenceid.remove(user_id);
}
pub fn presence_since(&self, since: u64) -> impl Stream<Item = (OwnedUserId, u64, Vec<u8>)> + Send + '_ {
#[inline]
pub(super) fn presence_since(&self, since: u64) -> impl Stream<Item = (&UserId, u64, &[u8])> + Send + '_ {
self.presenceid_presence
.raw_stream()
.ignore_err()
.ready_filter_map(move |(key, presence_bytes)| {
let (count, user_id) = presenceid_parse(key).expect("invalid presenceid_parse");
(count > since).then(|| (user_id.to_owned(), count, presence_bytes.to_vec()))
.ready_filter_map(move |(key, presence)| {
let (count, user_id) = presenceid_parse(key).ok()?;
(count > since).then_some((user_id, count, presence))
})
}
}

3
src/service/presence/mod.rs
View file

@ -162,8 +162,7 @@ impl Service {
/// Returns the most recent presence updates that happened after the event
/// with id `since`.
#[inline]
pub fn presence_since(&self, since: u64) -> impl Stream<Item = (OwnedUserId, u64, Vec<u8>)> + Send + '_ {
pub fn presence_since(&self, since: u64) -> impl Stream<Item = (&UserId, u64, &[u8])> + Send + '_ {
self.db.presence_since(since)
}