shockrah/freechat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated /message/get_time to pass client api testing

Browse Source
This commit is contained in:
shockrah
2021-01-18 23:28:32 -08:00
parent c89c2a4469
commit 5c4bc6f96f
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
server-api/src/messages.rs
View File

@@ -33,22 +33,26 @@ pub async fn get_by_time(pool: &Pool, response: &mut Response<Body>, params: Val
use db::messages::Message;
match (channel, start_time, end_time) {
(Some(channel), Some(start), Some(end)) => {
if let Ok(data) = Message::get_time_range(pool, channel, start, end).await {
response.headers_mut().insert(
"Content-Type",
HeaderValue::from_static("application/json"));
match Message::get_time_range(pool, channel, start, end).await {
Ok(data) => {
response.headers_mut().insert(
"Content-Type",
HeaderValue::from_static("application/json"));
let msg_vec = match data {
db::Response::Set(data) => data,
_ => Vec::new()
};
// this absolute lack of data streaming is prolly gonna suck like
// a whoe in hell week for performance but lets pretend servers don't get massive
let payload = json!({"messages": msg_vec});
*response.body_mut() = Body::from(payload.to_string());
} else {
*response.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;
}
let msg_vec = match data {
db::Response::Set(data) => data,
_ => Vec::new()
};
// this absolute lack of data streaming is prolly gonna suck like
// a whoe in hell week for performance but lets pretend servers don't get massive
let payload = json!({"messages": msg_vec});
*response.body_mut() = Body::from(payload.to_string());
},
Err(e) => {
eprintln!("{}", e);
*response.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;
}
};
},
_ => *response.status_mut() = StatusCode::BAD_REQUEST
};