From 2eba8360ed75a96a8170d59624243a6f6f3e5946 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sun, 17 Mar 2024 16:52:05 +0100
Subject: use system username as username

---
 client-native-rift/src/main.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'client-native-rift/src')

diff --git a/client-native-rift/src/main.rs b/client-native-rift/src/main.rs
index 9ba171f..150a573 100644
--- a/client-native-rift/src/main.rs
+++ b/client-native-rift/src/main.rs
@@ -28,6 +28,7 @@ use tokio::{
     io::{stdin, stdout, AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt},
     sync::RwLock,
 };
+use users::get_current_username;
 
 fn main() {
     env_logger::builder()
@@ -47,8 +48,8 @@ pub struct Args {
     /// keks-meet server used for establishing p2p connection
     #[clap(long, default_value = "wss://meet.metamuffin.org")]
     signaling_uri: String,
-    /// username for the `identify` packet
-    #[clap(short, long, default_value = "guest")]
+    /// username override
+    #[clap(short, long, default_value_t = get_username())]
     username: String,
     /// pre-shared secret (aka. room name)
     #[clap(short, long)]
@@ -60,6 +61,13 @@ pub struct Args {
     one_file: bool,
 }
 
+fn get_username() -> String {
+    get_current_username()
+        .map(|u| u.to_str().unwrap().to_string())
+        .unwrap_or("guest".to_string())
+        .to_owned()
+}
+
 async fn run() {
     let args = Args::parse();
 
-- 
cgit v1.2.3-70-g09d2