partially revert e507c31306

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

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),
 

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 {

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);
 

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),
 

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 {