Add upper-bound to readreceipts_since() and callsites.

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

src/service/account_data/mod.rs

@@ -75,6 +75,7 @@ pub async fn update(
 		.roomusertype_roomuserdataid
 		.qry(&key)
 		.await;
+
 	self.db
 		.roomusertype_roomuserdataid
 		.put(key, roomuserdataid);

src/service/rooms/read_receipt/data.rs

@@ -66,6 +66,7 @@ impl Data {
 		&'a self,
 		room_id: &'a RoomId,
 		since: u64,
+		to: Option<u64>,
 	) -> impl Stream<Item = ReceiptItem<'_>> + Send + 'a {
 		type Key<'a> = (&'a RoomId, u64, &'a UserId);
 		type KeyVal<'a> = (Key<'a>, CanonicalJsonObject);
@@ -76,7 +77,9 @@ impl Data {
 		self.readreceiptid_readreceipt
 			.stream_from(&first_possible_edu)
 			.ignore_err()
-			.ready_take_while(move |((r, ..), _): &KeyVal<'_>| *r == room_id)
+			.ready_take_while(move |((r, c, ..), _): &KeyVal<'_>| {
+				*r == room_id && to.is_none_or(|to| *c <= to)
+			})
 			.map(move |((_, count, user_id), mut json): KeyVal<'_>| {
 				json.remove("room_id");
 

src/service/rooms/read_receipt/mod.rs

@@ -126,8 +126,9 @@ impl Service {
 		&'a self,
 		room_id: &'a RoomId,
 		since: u64,
+		to: Option<u64>,
 	) -> impl Stream<Item = ReceiptItem<'_>> + Send + 'a {
-		self.db.readreceipts_since(room_id, since)
+		self.db.readreceipts_since(room_id, since, to)
 	}
 
 	/// Sets a private read marker at PDU `count`.

src/service/sending/sender.rs

@@ -536,17 +536,15 @@ impl Service {
 		max_edu_count: &AtomicU64,
 		num: &AtomicUsize,
 	) -> ReceiptMap {
-		let receipts = self
-			.services
-			.read_receipt
-			.readreceipts_since(room_id, since.0);
+		let receipts =
+			self.services
+				.read_receipt
+				.readreceipts_since(room_id, since.0, Some(since.1));
 
 		pin_mut!(receipts);
 		let mut read = BTreeMap::<OwnedUserId, ReceiptData>::new();
 		while let Some((user_id, count, read_receipt)) = receipts.next().await {
-			if count > since.1 {
-				break;
-			}
+			debug_assert!(count <= since.1, "exceeds upper-bound");
 
 			max_edu_count.fetch_max(count, Ordering::Relaxed);
 			if !self.services.globals.user_is_local(user_id) {