anna
/
ExtraChat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor(server): apply clippy suggestions

This commit is contained in:
Anna 2024-04-04 14:53:49 -04:00
parent 4483b380d8
commit 6db54b237a
Signed by: anna
GPG Key ID: D0943384CD9F87D1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/handlers/disband.rs
View File

@ -9,7 +9,7 @@ use crate::util::send;
pub async fn disband(state: Arc<RwLock<State>>, client_state: Arc<RwLock<ClientState>>, conn: &mut WsStream, number: u32, req: DisbandRequest) -> Result<()> { pub async fn disband(state: Arc<RwLock<State>>, client_state: Arc<RwLock<ClientState>>, conn: &mut WsStream, number: u32, req: DisbandRequest) -> Result<()> {
match client_state.read().await.get_rank(req.channel, &state).await? { match client_state.read().await.get_rank(req.channel, &state).await? {
Some(rank) if rank == Rank::Admin => {} Some(Rank::Admin) => {}
_ => return send(conn, number, ErrorResponse::new(req.channel, "not in channel/not enough permissions")).await, _ => return send(conn, number, ErrorResponse::new(req.channel, "not in channel/not enough permissions")).await,
} }

2
server/src/handlers/register.rs
View File

@ -66,7 +66,7 @@ pub async fn register(state: Arc<RwLock<State>>, _client_state: Arc<RwLock<Clien
None | Some(_) if generate => { None | Some(_) if generate => {
let mut rand_bytes = [0; 32]; let mut rand_bytes = [0; 32];
rand::thread_rng().fill_bytes(&mut rand_bytes); rand::thread_rng().fill_bytes(&mut rand_bytes);
let challenge = hex::encode(&rand_bytes); let challenge = hex::encode(rand_bytes);
sqlx::query!( sqlx::query!(
// language=sqlite // language=sqlite

2
server/src/handlers/update.rs
View File

@ -9,7 +9,7 @@ use crate::util::send;
pub async fn update(state: Arc<RwLock<State>>, client_state: Arc<RwLock<ClientState>>, conn: &mut WsStream, number: u32, req: UpdateRequest) -> Result<()> { pub async fn update(state: Arc<RwLock<State>>, client_state: Arc<RwLock<ClientState>>, conn: &mut WsStream, number: u32, req: UpdateRequest) -> Result<()> {
match client_state.read().await.get_rank(req.channel, &state).await? { match client_state.read().await.get_rank(req.channel, &state).await? {
Some(rank) if rank == Rank::Admin => {} Some(Rank::Admin) => {}
_ => return send(conn, number, ErrorResponse::new(req.channel, "not in that channel")).await, _ => return send(conn, number, ErrorResponse::new(req.channel, "not in that channel")).await,
} }

6
server/src/updater.rs
View File

@ -32,7 +32,7 @@ pub fn spawn(state: Arc<RwLock<State>>, mut rx: UnboundedReceiver<i64>) -> JoinH
tokio::time::sleep(left).await; tokio::time::sleep(left).await;
} }
match update(&*state, &lodestone, id).await { match update(&state, &lodestone, id).await {
Ok(()) => debug!("updated user {}", id), Ok(()) => debug!("updated user {}", id),
Err(e) => error!("error updating user {}: {:?}", id, e), Err(e) => error!("error updating user {}: {:?}", id, e),
} }
@ -66,11 +66,11 @@ async fn update(state: &RwLock<State>, lodestone: &LodestoneScraper, lodestone_i
if let Some(user) = client_state { if let Some(user) = client_state {
trace!(" [updater] before user write"); trace!(" [updater] before user write");
if let Some(user) = user.write().await.user.as_mut() { if let Some(user) = user.write().await.user.as_mut() {
user.name = info.name.clone(); user.name = info.name;
user.world = info.world; user.world = info.world;
} }
trace!(" [updater] after user write"); trace!(" [updater] after user write");
} }
Ok(()) Ok(())
} }