Add upper-bound for presence_since().

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/presence/data.rs

@@ -154,13 +154,15 @@ impl Data {
 	pub(super) fn presence_since(
 		&self,
 		since: u64,
+		to: Option<u64>,
 	) -> impl Stream<Item = (&UserId, u64, &[u8])> + Send + '_ {
 		self.presenceid_presence
 			.raw_stream()
 			.ignore_err()
 			.ready_filter_map(move |(key, presence)| {
 				let (count, user_id) = presenceid_parse(key).ok()?;
-				(count > since).then_some((user_id, count, presence))
+				(count > since && to.is_none_or(|to| count <= to))
+					.then_some((user_id, count, presence))
 			})
 	}
 }

src/service/presence/mod.rs

@@ -239,8 +239,9 @@ impl Service {
 	pub fn presence_since(
 		&self,
 		since: u64,
+		to: Option<u64>,
 	) -> impl Stream<Item = (&UserId, u64, &[u8])> + Send + '_ {
-		self.db.presence_since(since)
+		self.db.presence_since(since, to)
 	}
 
 	#[inline]

src/service/sending/sender.rs

@@ -605,14 +605,15 @@ impl Service {
 		since: (u64, u64),
 		max_edu_count: &AtomicU64,
 	) -> Option<EduBuf> {
-		let presence_since = self.services.presence.presence_since(since.0);
+		let presence_since = self
+			.services
+			.presence
+			.presence_since(since.0, Some(since.1));
 
 		pin_mut!(presence_since);
 		let mut presence_updates = HashMap::<OwnedUserId, PresenceUpdate>::new();
 		while let Some((user_id, count, presence_bytes)) = presence_since.next().await {
-			if count > since.1 {
-				break;
-			}
+			debug_assert!(count <= since.1, "exceeded upper-bound");
 
 			max_edu_count.fetch_max(count, Ordering::Relaxed);
 			if !self.services.globals.user_is_local(user_id) {