From 396233304328c75d1271465f28f55e4121e956b4 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Mon, 11 Nov 2024 05:00:29 +0000 Subject: [PATCH] partially revert e507c3130673099692143a59adc30a414ef6ca54 Signed-off-by: Jason Volk --- src/api/client/context.rs | 6 ++---- src/api/client/message.rs | 5 +---- src/api/client/relations.rs | 1 - src/api/client/threads.rs | 1 - src/api/server/backfill.rs | 2 +- src/service/rooms/pdu_metadata/data.rs | 2 +- src/service/rooms/threads/mod.rs | 2 +- src/service/rooms/timeline/data.rs | 12 +++++++----- 8 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/api/client/context.rs b/src/api/client/context.rs index f5f981ba..4359ae12 100644 --- a/src/api/client/context.rs +++ b/src/api/client/context.rs @@ -82,7 +82,7 @@ pub(crate) async fn get_context_route( let events_before: Vec<_> = services .rooms .timeline - .pdus_rev(Some(sender_user), room_id, Some(base_token.saturating_sub(1))) + .pdus_rev(Some(sender_user), room_id, Some(base_token)) .await? .ready_filter_map(|item| event_filter(item, filter)) .filter_map(|item| ignored_filter(&services, item, sender_user)) @@ -94,7 +94,7 @@ pub(crate) async fn get_context_route( let events_after: Vec<_> = services .rooms .timeline - .pdus(Some(sender_user), room_id, Some(base_token.saturating_add(1))) + .pdus(Some(sender_user), room_id, Some(base_token)) .await? .ready_filter_map(|item| event_filter(item, filter)) .filter_map(|item| ignored_filter(&services, item, sender_user)) @@ -169,14 +169,12 @@ pub(crate) async fn get_context_route( start: events_before .last() .map(at!(0)) - .map(|count| count.saturating_sub(1)) .as_ref() .map(ToString::to_string), end: events_after .last() .map(at!(0)) - .map(|count| count.saturating_add(1)) .as_ref() .map(ToString::to_string), diff --git a/src/api/client/message.rs b/src/api/client/message.rs index cc636511..88453de0 100644 --- a/src/api/client/message.rs +++ b/src/api/client/message.rs @@ -138,10 +138,7 @@ pub(crate) async fn get_message_events_route( let start_token = events.first().map(at!(0)).unwrap_or(from); - let next_token = events - .last() - .map(at!(0)) - .map(|count| count.saturating_inc(body.dir)); + let next_token = events.last().map(at!(0)); if !cfg!(feature = "element_hacks") { if let Some(next_token) = next_token { diff --git a/src/api/client/relations.rs b/src/api/client/relations.rs index ee62dbfc..902e6be6 100644 --- a/src/api/client/relations.rs +++ b/src/api/client/relations.rs @@ -150,7 +150,6 @@ async fn paginate_relations_with_filter( Direction::Backward => events.first(), } .map(at!(0)) - .map(|count| count.saturating_inc(dir)) .as_ref() .map(ToString::to_string); diff --git a/src/api/client/threads.rs b/src/api/client/threads.rs index 8d4e399b..906f779d 100644 --- a/src/api/client/threads.rs +++ b/src/api/client/threads.rs @@ -46,7 +46,6 @@ pub(crate) async fn get_threads_route( .last() .filter(|_| threads.len() >= limit) .map(at!(0)) - .map(|count| count.saturating_sub(1)) .as_ref() .map(ToString::to_string), diff --git a/src/api/server/backfill.rs b/src/api/server/backfill.rs index 2858d9fd..b0bd48e8 100644 --- a/src/api/server/backfill.rs +++ b/src/api/server/backfill.rs @@ -55,7 +55,7 @@ pub(crate) async fn get_backfill_route( pdus: services .rooms .timeline - .pdus_rev(None, &body.room_id, Some(from)) + .pdus_rev(None, &body.room_id, Some(from.saturating_add(1))) .await? .take(limit) .filter_map(|(_, pdu)| async move { diff --git a/src/service/rooms/pdu_metadata/data.rs b/src/service/rooms/pdu_metadata/data.rs index f3e1ced8..b06e988e 100644 --- a/src/service/rooms/pdu_metadata/data.rs +++ b/src/service/rooms/pdu_metadata/data.rs @@ -57,7 +57,7 @@ impl Data { ) -> impl Stream + Send + '_ { let mut current = ArrayVec::::new(); current.extend(target.to_be_bytes()); - current.extend(from.into_unsigned().to_be_bytes()); + current.extend(from.saturating_inc(dir).into_unsigned().to_be_bytes()); let current = current.as_slice(); match dir { Direction::Forward => self.tofrom_relation.raw_keys_from(current).boxed(), diff --git a/src/service/rooms/threads/mod.rs b/src/service/rooms/threads/mod.rs index fcc629e1..5821f279 100644 --- a/src/service/rooms/threads/mod.rs +++ b/src/service/rooms/threads/mod.rs @@ -132,7 +132,7 @@ impl Service { let current: RawPduId = PduId { shortroomid, - shorteventid, + shorteventid: shorteventid.saturating_sub(1), } .into(); diff --git a/src/service/rooms/timeline/data.rs b/src/service/rooms/timeline/data.rs index 7f1873ab..22a6c1d0 100644 --- a/src/service/rooms/timeline/data.rs +++ b/src/service/rooms/timeline/data.rs @@ -13,7 +13,7 @@ use conduit::{ }; use database::{Database, Deserialized, Json, KeyVal, Map}; use futures::{Stream, StreamExt}; -use ruma::{CanonicalJsonObject, EventId, OwnedRoomId, OwnedUserId, RoomId, UserId}; +use ruma::{api::Direction, CanonicalJsonObject, EventId, OwnedRoomId, OwnedUserId, RoomId, UserId}; use tokio::sync::Mutex; use super::{PduId, RawPduId}; @@ -205,7 +205,9 @@ impl Data { pub(super) async fn pdus_rev<'a>( &'a self, user_id: Option<&'a UserId>, room_id: &'a RoomId, until: PduCount, ) -> Result + Send + 'a> { - let current = self.count_to_id(room_id, until).await?; + let current = self + .count_to_id(room_id, until, Direction::Backward) + .await?; let prefix = current.shortroomid(); let stream = self .pduid_pdu @@ -220,7 +222,7 @@ impl Data { pub(super) async fn pdus<'a>( &'a self, user_id: Option<&'a UserId>, room_id: &'a RoomId, from: PduCount, ) -> Result + Send + 'a> { - let current = self.count_to_id(room_id, from).await?; + let current = self.count_to_id(room_id, from, Direction::Forward).await?; let prefix = current.shortroomid(); let stream = self .pduid_pdu @@ -267,7 +269,7 @@ impl Data { } } - async fn count_to_id(&self, room_id: &RoomId, shorteventid: PduCount) -> Result { + async fn count_to_id(&self, room_id: &RoomId, shorteventid: PduCount, dir: Direction) -> Result { let shortroomid: ShortRoomId = self .services .short @@ -278,7 +280,7 @@ impl Data { // +1 so we don't send the base event let pdu_id = PduId { shortroomid, - shorteventid, + shorteventid: shorteventid.saturating_inc(dir), }; Ok(pdu_id.into())