From ecb0a55511d9cbe2e781c9bd1c3159c99bb14a8a Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Thu, 2 May 2024 18:30:39 -0700 Subject: [PATCH] respect filter.limit in the /messages endpoint As far as I can tell, 'filter.limit' and the 'limit' query parameter are completely redundant. --- src/api/client_server/message.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/api/client_server/message.rs b/src/api/client_server/message.rs index 7033a768..fd4cef90 100644 --- a/src/api/client_server/message.rs +++ b/src/api/client_server/message.rs @@ -159,7 +159,9 @@ pub(crate) async fn get_message_events_route( .lazy_load_confirm_delivery(sender_user, sender_device, &body.room_id, from) .await?; - let limit = u64::from(body.limit).min(100) as usize; + let limit = u64::from(body.limit) + .min(body.filter.limit.map_or(u64::MAX, u64::from)) + .min(100) as usize; let next_token;