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

partially revert e507c31306

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-11-11 05:00:29 +00:00
parent 61174dd0d3
commit 3962333043
8 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/client/context.rs
View file

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

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

@ -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 {

1
src/api/client/relations.rs
View file

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

1
src/api/client/threads.rs
View file

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