refactor(server): apply clippy suggestions
This commit is contained in:
parent
4e4e36c2d9
commit
a8ea3044de
@ -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,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
@ -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,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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,7 +66,7 @@ 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");
|
||||||
|
Loading…
Reference in New Issue
Block a user