From 002fbbe8a44ef02bcd2c44b435649efa34790c90 Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Tue, 4 Nov 2025 08:27:32 +0100 Subject: [PATCH] set netplay id from environment (#606) --- build.rs | 3 +++ src/ui/netplay.rs | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build.rs b/build.rs index 3748c6d4..93a506bd 100644 --- a/build.rs +++ b/build.rs @@ -193,5 +193,8 @@ fn main() { let git_hash = String::from_utf8(git_output.stdout).unwrap(); println!("cargo:rustc-env=GIT_HASH={git_hash}"); + let netplay_id = std::env::var("NETPLAY_ID").unwrap_or("gopher64".to_string()); + println!("cargo:rustc-env=NETPLAY_ID={netplay_id}"); + println!("cargo:rustc-env=N64_STACK_SIZE={}", 8 * 1024 * 1024); } diff --git a/src/ui/netplay.rs b/src/ui/netplay.rs index be11bb6b..5c08867b 100644 --- a/src/ui/netplay.rs +++ b/src/ui/netplay.rs @@ -111,7 +111,7 @@ impl NetplayPages for NetplayJoin { fn populate_server_names(weak: slint::Weak) { let task = reqwest::Client::new() .get("https://dispatch.gopher64.com/getRegions") - .header("netplay-id", EMU_NAME) + .header("netplay-id", env!("NETPLAY_ID")) .send(); tokio::spawn(async move { let mut local_servers: Vec<(String, String)> = vec![]; @@ -296,7 +296,7 @@ pub fn setup_create_window( let task = reqwest::Client::new() .get("https://dispatch.gopher64.com/createServer") .query(&[("region", server_url.strip_prefix("dispatcher:").unwrap())]) - .header("netplay-id", EMU_NAME) + .header("netplay-id", env!("NETPLAY_ID")) .send(); let netplay_read_sender = netplay_read_sender.clone(); let netplay_write_receiver = netplay_write_receiver.resubscribe(); @@ -448,7 +448,7 @@ fn show_netplay_error(message: String) { fn update_sessions(weak: slint::Weak) { let task = reqwest::Client::new() .get("https://dispatch.gopher64.com/getServers") - .header("netplay-id", EMU_NAME) + .header("netplay-id", env!("NETPLAY_ID")) .send(); tokio::spawn(async move { let mut dispatcher_servers = std::collections::HashMap::new();