Skynet/discord-bot
7
0
Fork 2
Code Issues 2 Pull requests Projects 1 Releases Packages Wiki Activity Actions

fix: slight duplicate removal

Browse source
This commit is contained in:
silver 2025-02-18 22:46:58 +00:00
parent 8c81fb864a
commit a8c1cc9cf1
Signed by: silver
GPG key ID: 36F93D61BAD3FD7D
3 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/minecraft.rs
View file

@ -102,7 +102,7 @@ struct BodyDelete {
} }
pub async fn whitelist_wipe(server: &str, token: &str) { pub async fn whitelist_wipe(server: &str, token: &str) {
let url_base = format!("http://panel.games.skynet.ie/api/client/servers/{server}"); let url_base = format!("https://panel.games.skynet.ie/api/client/servers/{server}");
let bearer = format!("Bearer {token}"); let bearer = format!("Bearer {token}");
// delete whitelist // delete whitelist
@ -123,7 +123,7 @@ pub async fn whitelist_wipe(server: &str, token: &str) {
} }
pub async fn server_information(server: &str, token: &str) -> Option<ServerDetailsRes> { pub async fn server_information(server: &str, token: &str) -> Option<ServerDetailsRes> {
let url_base = format!("http://panel.games.skynet.ie/api/client/servers/{server}"); let url_base = format!("https://panel.games.skynet.ie/api/client/servers/{server}");
let bearer = format!("Bearer {token}"); let bearer = format!("Bearer {token}");
get::<ServerDetailsRes>(&format!("{url_base}/"), &bearer).await get::<ServerDetailsRes>(&format!("{url_base}/"), &bearer).await
} }

10
src/common/set_roles.rs
View file

@ -341,21 +341,17 @@ pub mod committee {
} }
async fn get_committees(db: &Pool<Sqlite>) -> Vec<Committees> { async fn get_committees(db: &Pool<Sqlite>) -> Vec<Committees> {
match sqlx::query_as::<_, Committees>( sqlx::query_as::<_, Committees>(
r#" r#"
SELECT * SELECT *
FROM committees FROM committees
"#, "#,
) )
.fetch_all(db) .fetch_all(db)
.await .await.unwrap_or_else(|e| {
{
Ok(a) => a,
Err(e) => {
dbg!(e); dbg!(e);
vec![] vec![]
} })
}
} }
async fn get_server_member_discord(db: &Pool<Sqlite>, user: &i64) -> Option<Wolves> { async fn get_server_member_discord(db: &Pool<Sqlite>, user: &i64) -> Option<Wolves> {

28
src/main.rs
View file

@ -91,6 +91,20 @@ Sign up on [UL Wolves]({}) and go to https://discord.com/channels/{}/{} and use
} }
} }
// handles role updates
async fn guild_member_update(&self, ctx: Context, _old_data: Option<Member>, new_data: Member) {
// get config/db
let db_lock = {
let data_read = ctx.data.read().await;
data_read.get::<DataBase>().expect("Expected Config in TypeMap.").clone()
};
let db = db_lock.read().await;
// check if the role changed is part of the oens for this server
on_role_change(&db, &ctx, new_data).await;
}
async fn ready(&self, ctx: Context, ready: Ready) { async fn ready(&self, ctx: Context, ready: Ready) {
println!("[Main] {} is connected!", ready.user.name); println!("[Main] {} is connected!", ready.user.name);
ctx.set_presence(Some(Activity::playing("with humanity's fate")), OnlineStatus::Online).await; ctx.set_presence(Some(Activity::playing("with humanity's fate")), OnlineStatus::Online).await;
@ -139,20 +153,6 @@ Sign up on [UL Wolves]({}) and go to https://discord.com/channels/{}/{} and use
} }
} }
} }
// handles role updates
async fn guild_member_update(&self, ctx: Context, _old_data: Option<Member>, new_data: Member) {
// get config/db
let db_lock = {
let data_read = ctx.data.read().await;
data_read.get::<DataBase>().expect("Expected Config in TypeMap.").clone()
};
let db = db_lock.read().await;
// check if the role changed is part of the oens for this server
on_role_change(&db, &ctx, new_data).await;
}
} }
async fn get_committee(db: &Pool<Sqlite>, committee: &str) -> Vec<Committees> { async fn get_committee(db: &Pool<Sqlite>, committee: &str) -> Vec<Committees> {