Make `Args::parse` more pretty

client/src/args.rs

@@ -45,24 +45,22 @@ impl Args {
         use bevy::log::error;
         use web_sys::{UrlSearchParams, window};
 
-        let Some(window) = window() else {
+        let params = window()
-            return Self::default();
+            .and_then(|window| window.location().search().ok())
-        };
+            .and_then(|search| UrlSearchParams::new_with_str(&search).ok());
-        let Ok(search) = window.location().search() else {
+
-            return Self::default();
+        if let Some(params) = params {
-        };
+            if let Some(address) = params.get("connect") {
-        let Ok(params) = UrlSearchParams::new_with_str(&search) else {
+                if let Some(digest) = params.get("digest") {
-            return Self::default();
+                    return Self {
-        };
+                        mode: Some(Mode::Connect { address, digest }),
-        let Some(address) = params.get("connect") else {
-            return Self::default();
                     };
-        let Some(digest) = params.get("digest") else {
+                } else {
                     error!("Missing 'digest' parameter.");
-            return Self::default();
-        };
-        Self {
-            mode: Some(Mode::Connect { address, digest }),
                 }
             }
         }
+
+        Self::default()
+    }
+}