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

More warning removals and more db-lib result wrapping

Browse Source 
This should be everything now
This commit is contained in:
shockrah
2021-03-30 23:00:50 -07:00
parent 4615374357
commit afdeef0a49
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
json-api/src/channels.rs
View File

@@ -86,6 +86,7 @@ pub async fn delete_channel(pool: &Pool, response: &mut Response<Body>, params:
let uid = qs_param!(params, "id", u64).unwrap();
let permissions = match Member::get(pool, uid).await {
Ok(Row(user)) => user.permissions,
Ok(_) => 0,
Err(e) => {
eprintln!("{}", e);
0
@@ -112,6 +113,7 @@ pub async fn delete_channel(pool: &Pool, response: &mut Response<Body>, params:
if let Some(id) = channel_id {
match Channel::delete(pool, id).await {
Ok(Success) => {/* nothing to do on sucess */},
Ok(_) => {/* can't actually happen */}
Err(e) => { // ngmi
eprintln!("{}", e);
*response.status_mut() = StatusCode::INTERNAL_SERVER_ERROR;

10
json-api/src/invites.rs
View File

@@ -121,8 +121,14 @@ async fn allowed_perm_invite(pool: &Pool, uid: u64) -> bool {
use crate::perms;
return match Member::get(pool, uid).await {
db::Response::Row(user) => perms::has_perm(user.permissions, perms::CREATE_PERM_INVITES),
_ => false
Ok(response) => match response {
db::Response::Row(user) => perms::has_perm(user.permissions, perms::CREATE_PERM_INVITES),
_ => false
},
Err(e) => {
eprintln!("[HTTP-DB-ERROR] {}", e);
false
}
};
}
pub async fn create(pool: &Pool, response: &mut Response<Body>, params: HashMap<String, String>) {

2
json-api/src/main.rs
View File

@@ -190,7 +190,7 @@ async fn attempt_owner_creation(name: &str) {
else {
eprintln!("Could not generate a proper secret");
}
p.disconnect();
let _ = p.disconnect().await;
}
#[tokio::main]