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

* Flattening /message/time_range handler further dfc-chan returns

Browse Source
This commit is contained in:
shockrah 2021-01-23 13:36:30 -08:00
parent 5855387a52
commit b9573ee09c
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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