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

make pdu batch tokens zeroith-indexed

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-11-06 22:21:51 +00:00
parent f36757027e
commit e507c31306
9 changed files with 67 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/api/client/message.rs
View file

@ -100,14 +100,14 @@ pub(crate) async fn get_message_events_route(
Direction::Forward => services
.rooms
.timeline
.pdus_after(sender_user, room_id, from)
.pdus(sender_user, room_id, from)
.await?
.boxed(),
Direction::Backward => services
.rooms
.timeline
.pdus_until(sender_user, room_id, from)
.pdus_rev(sender_user, room_id, from)
.await?
.boxed(),
};
@ -136,7 +136,12 @@ pub(crate) async fn get_message_events_route(
.collect()
.await;
let next_token = events.last().map(|(count, _)| count).copied();
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));
if !cfg!(feature = "element_hacks") {
if let Some(next_token) = next_token {
@ -154,8 +159,8 @@ pub(crate) async fn get_message_events_route(
.collect();
Ok(get_message_events::v3::Response {
start: from.to_string(),
end: next_token.as_ref().map(PduCount::to_string),
start: start_token.to_string(),
end: next_token.as_ref().map(ToString::to_string),
chunk,
state,
})