fix(panics): replace runtime-fallible unwraps with graceful fallbacks

Author: DevYukine

src/abstraction/command.rs

@@ -43,7 +43,7 @@ impl CommandData {
 			))
 			.default_headers(headers)
 			.build()
-			.unwrap();
+			.expect("failed to build reqwest client");
 
 		let inner = playmatch_client::Client::new_with_client(
 			&env::var("PLAYMATCH_API_URL")
@@ -67,13 +67,13 @@ impl CommandData {
 
 lazy_static! {
 	pub static ref STAFF_ROLE_ID: u64 = env::var("DISCORD_RETROREALM_STAFF_ROLE_ID")
-		.unwrap_or_default()
-		.parse()
-		.unwrap();
+		.ok()
+		.and_then(|v| v.parse().ok())
+		.unwrap_or(0);
 	pub static ref TRUSTED_ROLE_IDS: Vec<u64> = env::var("DISCORD_TRUSTED_ROLE_IDS")
 		.unwrap_or_default()
-		.split(",")
-		.map(|id| id.trim().parse().unwrap())
+		.split(',')
+		.filter_map(|id| id.trim().parse().ok())
 		.collect();
 }
 
@@ -85,11 +85,9 @@ pub async fn is_user_trusted_or_above(ctx: CommandContext<'_>) -> CheckResult {
 		return Ok(true);
 	}
 
-	if member.is_none() {
+	let Some(member) = member else {
 		return Ok(false);
-	}
-
-	let member = member.unwrap();
+	};
 
 	if member.roles.iter().any(|role_id| {
 		role_id == &RoleId::new(*STAFF_ROLE_ID) || TRUSTED_ROLE_IDS.contains(&role_id.get())

src/command/mod.rs

@@ -11,16 +11,16 @@ use poise::Command;
 
 lazy_static! {
 	pub static ref RETROREALM_SERVER_ID: u64 = std::env::var("DISCORD_RETROREALM_SERVER_ID")
-		.unwrap_or_default()
-		.parse()
-		.unwrap();
+		.ok()
+		.and_then(|v| v.parse().ok())
+		.unwrap_or(0);
 	static ref UPDATE_ROLE_ID: String =
 		std::env::var("DISCORD_RETROREALM_UPDATE_ROLE_ID").unwrap_or_default();
 	pub(crate) static ref SUGGESTION_CHANNEL_ID: u64 =
 		std::env::var("DISCORD_RETROREALM_SUGGESTION_CHANNEL_ID")
-			.unwrap_or_default()
-			.parse()
-			.unwrap();
+			.ok()
+			.and_then(|v| v.parse().ok())
+			.unwrap_or(0);
 }
 
 pub fn get_all_commands() -> Vec<Command<CommandData, CommandError>> {

src/command/playmatch.rs

@@ -230,25 +230,25 @@ pub async fn get_game_metadata(
 				MetadataMatchType::Automatic => {
 					let reason = metadata_mapping
 						.automatic_match_reason
-						.expect("Automatic match reason is missing");
+						.ok_or_else(|| anyhow!("Automatic match is missing reason"))?;
 					let provider_id = metadata_mapping
 						.provider_id
-						.expect("Provider ID is missing for automatic match");
+						.ok_or_else(|| anyhow!("Automatic match is missing provider id"))?;
 					format!("\nReason: `{reason}`\nProvider ID: `{provider_id}`")
 				}
 				MetadataMatchType::Manual => {
 					let manual_match_type = metadata_mapping
 						.manual_match_type
-						.expect("Manual match type is missing");
+						.ok_or_else(|| anyhow!("Manual match is missing match type"))?;
 					let provider_id = metadata_mapping
 						.provider_id
-						.expect("Provider ID is missing for manual match");
+						.ok_or_else(|| anyhow!("Manual match is missing provider id"))?;
 					format!("\nMatched By: `{manual_match_type}`\nProvider ID: `{provider_id}`")
 				}
 				MetadataMatchType::Failed => {
 					let failed_reason = metadata_mapping
 						.failed_match_reason
-						.expect("Failed match reason is missing");
+						.ok_or_else(|| anyhow!("Failed match is missing reason"))?;
 					format!("\nReason: `{failed_reason}`")
 				}
 				MetadataMatchType::None => String::new(),