chore: clean up some rust code

crates/gateway/src/api.rs

@@ -45,7 +45,7 @@ pub async fn run_server(cache: Arc<DiscordCache>, shard_state: Arc<ShardStateMan
         .route(
             "/guilds/{guild_id}/members/@me",
             get(|State(cache): State<Arc<DiscordCache>>, Path(guild_id): Path<u64>| async move {
-                match cache.0.member(Id::new(guild_id), libpk::config.discord.as_ref().expect("missing discord config").client_id) {
+                match cache.0.member(Id::new(guild_id), libpk::config.discord().client_id) {
                     Some(member) => status_code(StatusCode::FOUND, to_string(member.value()).unwrap()),
                     None => status_code(StatusCode::NOT_FOUND, "".to_string()),
                 }
@@ -54,7 +54,7 @@ pub async fn run_server(cache: Arc<DiscordCache>, shard_state: Arc<ShardStateMan
         .route(
             "/guilds/{guild_id}/permissions/@me",
             get(|State(cache): State<Arc<DiscordCache>>, Path(guild_id): Path<u64>| async move {
-                match cache.guild_permissions(Id::new(guild_id), libpk::config.discord.as_ref().expect("missing discord config").client_id).await {
+                match cache.guild_permissions(Id::new(guild_id), libpk::config.discord().client_id).await {
                     Ok(val) => {
                         status_code(StatusCode::FOUND, to_string(&val.bits()).unwrap())
                     },
@@ -122,7 +122,7 @@ pub async fn run_server(cache: Arc<DiscordCache>, shard_state: Arc<ShardStateMan
                 if guild_id == 0 {
                     return status_code(StatusCode::FOUND, to_string(&*DM_PERMISSIONS).unwrap());
                 }
-                match cache.channel_permissions(Id::new(channel_id), libpk::config.discord.as_ref().expect("missing discord config").client_id).await {
+                match cache.channel_permissions(Id::new(channel_id), libpk::config.discord().client_id).await {
                     Ok(val) => status_code(StatusCode::FOUND, to_string(&val).unwrap()),
                     Err(err) => {
                         error!(?err, ?channel_id, ?guild_id, "failed to get own channelpermissions");
@@ -219,7 +219,7 @@ pub async fn run_server(cache: Arc<DiscordCache>, shard_state: Arc<ShardStateMan
         .layer(axum::middleware::from_fn(crate::logger::logger))
         .with_state(cache);
 
-    let addr: &str = libpk::config.discord.as_ref().expect("missing discord config").cache_api_addr.as_ref();
+    let addr: &str = libpk::config.discord().cache_api_addr.as_ref();
     let listener = tokio::net::TcpListener::bind(addr).await?;
     info!("listening on {}", addr);
     axum::serve(listener, app.into_make_service_with_connect_info::<SocketAddr>()).await?;

crates/gateway/src/discord/cache.rs

@@ -91,22 +91,10 @@ fn member_to_cached_member(item: Member, id: Id<UserMarker>) -> CachedMember {
 }
 
 pub fn new() -> DiscordCache {
-    let mut client_builder = twilight_http::Client::builder().token(
-        libpk::config
-            .discord
-            .as_ref()
-            .expect("missing discord config")
-            .bot_token
-            .clone(),
-    );
+    let mut client_builder =
+        twilight_http::Client::builder().token(libpk::config.discord().bot_token.clone());
 
-    if let Some(base_url) = libpk::config
-        .discord
-        .as_ref()
-        .expect("missing discord config")
-        .api_base_url
-        .clone()
-    {
+    if let Some(base_url) = libpk::config.discord().api_base_url.clone() {
         client_builder = client_builder.proxy(base_url, true).ratelimiter(None);
     }
 
@@ -268,13 +256,7 @@ impl DiscordCache {
             return Ok(Permissions::all());
         }
 
-        let member = if user_id
-            == libpk::config
-                .discord
-                .as_ref()
-                .expect("missing discord config")
-                .client_id
-        {
+        let member = if user_id == libpk::config.discord().client_id {
             self.0
                 .member(guild_id, user_id)
                 .ok_or(format_err!("self member not found"))?
@@ -340,13 +322,7 @@ impl DiscordCache {
             return Ok(Permissions::all());
         }
 
-        let member = if user_id
-            == libpk::config
-                .discord
-                .as_ref()
-                .expect("missing discord config")
-                .client_id
-        {
+        let member = if user_id == libpk::config.discord().client_id {
             self.0
                 .member(guild_id, user_id)
                 .ok_or_else(|| {

crates/gateway/src/discord/gateway.rs

@@ -23,9 +23,7 @@ use super::cache::DiscordCache;
 
 pub fn cluster_config() -> ClusterSettings {
     libpk::config
-        .discord
-        .as_ref()
-        .expect("missing discord config")
+        .discord()
         .cluster
         .clone()
         .unwrap_or(libpk::_config::ClusterSettings {
@@ -63,28 +61,15 @@ pub fn create_shards(redis: fred::clients::RedisPool) -> anyhow::Result<Vec<Shar
         )
     };
 
-    let prefix = libpk::config
-        .discord
-        .as_ref()
-        .expect("missing discord config")
-        .bot_prefix_for_gateway
-        .clone();
+    let prefix = libpk::config.discord().bot_prefix_for_gateway.clone();
 
     let shards = create_iterator(
         start_shard..end_shard + 1,
         cluster_settings.total_shards,
-        ConfigBuilder::new(
-            libpk::config
-                .discord
-                .as_ref()
-                .expect("missing discord config")
-                .bot_token
-                .to_owned(),
-            intents,
-        )
-        .presence(presence(format!("{prefix}help").as_str(), false))
-        .queue(queue.clone())
-        .build(),
+        ConfigBuilder::new(libpk::config.discord().bot_token.to_owned(), intents)
+            .presence(presence(format!("{prefix}help").as_str(), false))
+            .queue(queue.clone())
+            .build(),
         |_, builder| builder.build(),
     );
 
@@ -105,11 +90,7 @@ pub async fn runner(
     // let _span = info_span!("shard_runner", shard_id = shard.id().number()).entered();
     let shard_id = shard.id().number();
 
-    let our_user_id = libpk::config
-        .discord
-        .as_ref()
-        .expect("missing discord config")
-        .client_id;
+    let our_user_id = libpk::config.discord().client_id;
 
     info!("waiting for events");
     while let Some(item) = shard.next().await {

crates/gateway/src/discord/identify_queue.rs

@@ -13,11 +13,7 @@ use twilight_gateway::queue::Queue;
 pub fn new(redis: RedisPool) -> RedisQueue {
     RedisQueue {
         redis,
-        concurrency: libpk::config
-            .discord
-            .as_ref()
-            .expect("missing discord config")
-            .max_concurrency,
+        concurrency: libpk::config.discord().max_concurrency,
     }
 }
 

crates/gateway/src/main.rs

@@ -41,13 +41,7 @@ async fn main() -> anyhow::Result<()> {
     );
 
     // hacky, but needed for selfhost for now
-    if let Some(target) = libpk::config
-        .discord
-        .as_ref()
-        .unwrap()
-        .gateway_target
-        .clone()
-    {
+    if let Some(target) = libpk::config.discord().gateway_target.clone() {
         runtime_config
             .set(RUNTIME_CONFIG_KEY_EVENT_TARGET.to_string(), target)
             .await?;
@@ -237,12 +231,7 @@ async fn main() -> anyhow::Result<()> {
 }
 
 async fn scheduled_task(redis: RedisPool, senders: Vec<(ShardId, MessageSender)>) {
-    let prefix = libpk::config
-        .discord
-        .as_ref()
-        .expect("missing discord config")
-        .bot_prefix_for_gateway
-        .clone();
+    let prefix = libpk::config.discord().bot_prefix_for_gateway.clone();
 
     println!("{prefix}");