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

User API changes to now use the new behavior for adding channels

Browse Source
This commit is contained in:
shockrah 2020-11-07 18:27:14 -08:00
parent 4668ce7d0f
commit c8a6aa204d
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server-api/src/channels.rs
View File

@ -38,14 +38,29 @@ pub async fn create_channel(pool: &Pool, response: &mut Response<Body>, params:
*/ */
// Theres an extra un-needed unwrap to be cut out from this proc // Theres an extra un-needed unwrap to be cut out from this proc
// specifically with the desc parameter // specifically with the desc parameter
use std::convert::TryInto;
let req_params: (Option<&str>, Option<&str>, Option<i64>) = let req_params: (Option<&str>, Option<&str>, Option<i64>) =
match (params.get("name"), params.get("description"), params.get("kind")) { match (params.get("name"), params.get("description"), params.get("kind")) {
(Some(name), Some(desc), Some(kind)) => (name.as_str(), desc.as_str(), kind.as_i64()), (Some(name), Some(desc), Some(kind)) => (name.as_str(), desc.as_str(), kind.as_i64()),
(Some(name), None, Some(kind)) => (name.as_str(), Some("No Description"), kind.as_i64()), (Some(name), None, Some(kind)) => (name.as_str(), Some("No Description"), kind.as_i64()),
_ => (None, None, None) _ => (None, None, None)
}; };
match req_params { match req_params {
(Some(name), Some(desc), Some(kind)) => { (Some(name), Some(desc), Some(kind)) => {
// Send the data up to the db, then return the new channel back to the user(?)
match db::channels::Channel::add(pool, name, desc, kind.try_into().unwrap()).await {
db::Response::Row(row) => {
response.headers_mut().insert("Content type",
HeaderValue::from_static("json/application"));
*response.body_mut() = Body::from(to_string(&row).unwrap_or("{}".into()));
},
db::Response::Empty => {},
db::Response::Other(msg) => {},
_ => {*response.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;}
}
}, },
// basically one of the parameter gets failed so we bail on all of this // basically one of the parameter gets failed so we bail on all of this
_ => *response.status_mut() = StatusCode::BAD_REQUEST _ => *response.status_mut() = StatusCode::BAD_REQUEST