From 974173857c4d164c5d6abc70035c7d745af391fc Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 11 Sep 2023 20:03:56 +0100 Subject: [PATCH] fmt: fmt and clippy --- src/bin/update_data.rs | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/bin/update_data.rs b/src/bin/update_data.rs index df2f95c..e43d7c0 100644 --- a/src/bin/update_data.rs +++ b/src/bin/update_data.rs @@ -1,4 +1,4 @@ -use skynet_discord_bot::{db_init, get_config, Accounts, Config, DataBase, get_server_config_bulk, Servers}; +use skynet_discord_bot::{db_init, get_config, get_server_config_bulk, Accounts, Config, DataBase, Servers}; use std::{process, sync::Arc}; use serde::Deserialize; @@ -78,7 +78,6 @@ async fn fetch_accounts(ctx: &Context) { // get from skynet for the compsoc server only get_skynet(&db, &config).await; - } #[derive(Debug, Deserialize)] @@ -86,11 +85,11 @@ pub struct SkynetResult { discord: String, wolves_id: String, } -async fn get_skynet(db: &Pool, config: &Config){ +async fn get_skynet(db: &Pool, config: &Config) { let url = format!("{}/ldap/discord?auth={}", &config.ldap_api, &config.auth); if let Ok(result) = surf::get(url).recv_json::>().await { for user in result { - add_users_skynet(&db, &config.skynet_server, &user).await; + add_users_skynet(db, &config.skynet_server, &user).await; } } } @@ -122,36 +121,36 @@ struct WolvesResult { pub email: String, pub expiry: String, } -async fn get_wolves(db: &Pool){ +async fn get_wolves(db: &Pool) { for server_config in get_server_config_bulk(db).await { let Servers { server, wolves_api, .. } = server_config; - + // get the data here - let mut result: Vec = vec![]; + let result: Vec = vec![]; for user in result { - add_users_wolves(&db, &server, &user).await; + add_users_wolves(db, &server, &user).await; } } } async fn add_users_wolves(db: &Pool, server: &GuildId, user: &WolvesResult) { match sqlx::query_as::<_, Accounts>( - " + " INSERT OR REPLACE INTO accounts (server, wolves_id, email, expiry) VALUES (?1, ?2, ?3, ?4) ", ) - .bind(*server.as_u64() as i64) - .bind(&user.id_wolves) - .bind(&user.email) - .bind(&user.expiry) - .fetch_optional(db) - .await + .bind(*server.as_u64() as i64) + .bind(&user.id_wolves) + .bind(&user.email) + .bind(&user.expiry) + .fetch_optional(db) + .await { Ok(_) => {} Err(e) => { @@ -159,4 +158,4 @@ async fn add_users_wolves(db: &Pool, server: &GuildId, user: &WolvesResu println!("{:?}", e); } } -} \ No newline at end of file +}