diff --git a/src/common/set_roles.rs b/src/common/set_roles.rs index b857e8a..0dc7cc5 100644 --- a/src/common/set_roles.rs +++ b/src/common/set_roles.rs @@ -135,7 +135,7 @@ pub mod committee { use crate::common::wolves::committees::Committees; use crate::Config; use serde::{Deserialize, Serialize}; - use serenity::all::EditRole; + use serenity::all::{EditRole, GuildId}; use serenity::builder::CreateChannel; use serenity::client::Context; use serenity::model::channel::ChannelType; @@ -161,7 +161,7 @@ pub mod committee { }; let config_global = config_lock.read().await; - let server = config_global.committee_server; + let server = GuildId::new(1220150752656363520); // because to use it to update a single user we need to pre-get the members of teh server let mut members = server.members(&ctx, None, None).await.unwrap_or_default(); @@ -172,8 +172,8 @@ pub mod committee { /** This function can take a vec of members (or just one) and gives tehm the appropiate roles on teh committee server */ - pub async fn update_committees(db: &Pool, ctx: &Context, config: &Config, members: &mut Vec) { - let server = config.committee_server; + pub async fn update_committees(db: &Pool, ctx: &Context, _config: &Config, members: &mut Vec) { + let server = GuildId::new(1220150752656363520); let committee_member = RoleId::new(1226602779968274573); let committees = get_committees(db).await; let categories = [ diff --git a/src/main.rs b/src/main.rs index dc15840..be31da8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,7 +40,8 @@ impl EventHandler for Handler { let config_global = config_lock.read().await; // committee server takes priority - if new_member.guild_id.eq(&config_global.committee_server) { + let committee_server = GuildId::new(1220150752656363520); + if new_member.guild_id.get() == committee_server.get() { let mut member = vec![new_member.clone()]; update_committees(&db, &ctx, &config_global, &mut member).await; return; @@ -128,14 +129,7 @@ Sign up on [UL Wolves]({}) and go to https://discord.com/channels/{}/{} and use } } - let config_lock = { - let data_read = ctx.data.read().await; - data_read.get::().expect("Expected Config in TypeMap.").clone() - }; - let config_global = config_lock.read().await; - - match &config_global - .committee_server + match GuildId::new(1220150752656363520) .set_commands(&ctx.http, vec![commands::count::committee::register()]) .await {