diff --git a/werewolves/src/clients/client/connection.rs b/werewolves/src/clients/client/connection.rs index 0d12af2..3305c6c 100644 --- a/werewolves/src/clients/client/connection.rs +++ b/werewolves/src/clients/client/connection.rs @@ -39,12 +39,7 @@ pub enum ConnectionError { } fn url() -> String { - format!( - "{}client", - option_env!("LOCAL") - .map(|_| crate::clients::DEBUG_URL) - .unwrap_or(crate::clients::LIVE_URL) - ) + format!("{}/connect/client", crate::clients::BASE_URL) } #[derive(Clone)] diff --git a/werewolves/src/clients/host/host.rs b/werewolves/src/clients/host/host.rs index d00ae73..969ece8 100644 --- a/werewolves/src/clients/host/host.rs +++ b/werewolves/src/clients/host/host.rs @@ -54,12 +54,7 @@ use crate::{ use crate::WerewolfError; fn url() -> String { - format!( - "{}host", - option_env!("LOCAL") - .map(|_| crate::clients::DEBUG_URL) - .unwrap_or(crate::clients::LIVE_URL) - ) + format!("{}/connect/host", crate::clients::BASE_URL) } async fn connect_ws() -> WebSocket { diff --git a/werewolves/src/clients/mod.rs b/werewolves/src/clients/mod.rs index 0c66738..a3fbca0 100644 --- a/werewolves/src/clients/mod.rs +++ b/werewolves/src/clients/mod.rs @@ -22,5 +22,7 @@ pub mod host { pub use host::*; } -const DEBUG_URL: &str = "ws://192.168.1.162:8080/connect/"; -const LIVE_URL: &str = "wss://wolf.emilis.dev/connect/"; +const BASE_URL: &str = match option_env!("BASE_URL") { + Some(base_url) => base_url, + None => "ws://192.168.1.162:8080", +};