From 5a27ef07f1b0c250925009789d131049bbeb2343 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 23 Jan 2021 15:14:57 -0800 Subject: [PATCH] Adding optional `limit` field to /message/time_range handler --- server-api/src/messages.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server-api/src/messages.rs b/server-api/src/messages.rs index b906588..e93cef4 100644 --- a/server-api/src/messages.rs +++ b/server-api/src/messages.rs @@ -31,9 +31,14 @@ pub async fn get_by_time(pool: &Pool, response: &mut Response, params: Val Some(val) => val.as_i64(), None => None }; + let limit = match params.get("limit") { + Some(val) => val.as_u64(), + None => None + }; + // TODO: flatten me mommy if let (Some(channel), Some(start), Some(end)) = (channel, start_time, end_time) { - match Message::get_time_range(pool, channel, start, end).await { + match Message::get_time_range(pool, channel, start, end, limit).await { Ok(db_response) => { match db_response { db::Response::Set(messages) => { @@ -132,7 +137,6 @@ pub async fn from_id(pool: &Pool, response: &mut Response, params: Value) None => None }; - // TODO: untested lmao if let (Some(channel), Some(start_id)) = (channel, start_id) { match Message::get_from_id(pool, channel, start_id, limit).await { Ok(db_response) => {