From 45bddfe06708067954fc8519be9afd5c602c4ce6 Mon Sep 17 00:00:00 2001 From: alemi Date: Wed, 21 Feb 2024 19:53:39 +0100 Subject: [PATCH] fix: don't overwrite name with empty str --- src/model.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model.rs b/src/model.rs index 82a3068..2b737bc 100644 --- a/src/model.rs +++ b/src/model.rs @@ -67,9 +67,9 @@ impl User { pub fn update(&mut self, state: crate::tcp::proto::UserState) { if state.session() != self.session { tracing::warn!("updating with different session??") } if let Some(actor) = state.actor { self.actor = actor } - if let Some(name) = state.name { self.name = name } - if let Some(user_id) = state.user_id { self.user_id = Some(user_id) } - if let Some(comment) = state.comment { self.comment = Some(comment) } + if let Some(name) = state.name { if !name.is_empty() { self.name = name } } + if let Some(user_id) = state.user_id { if user_id != 0 { self.user_id = Some(user_id) } } + if let Some(comment) = state.comment { if !comment.is_empty() { self.comment = Some(comment) } } if let Some(mute) = state.mute { self.properties.mute = mute } if let Some(deaf) = state.deaf { self.properties.deaf = deaf } if let Some(suppress) = state.suppress { self.properties.suppress = suppress }