From 55bfceffb1b4323c1edca560c4199b2dc73512ef Mon Sep 17 00:00:00 2001 From: Alex-Emmet Date: Thu, 29 Jan 2026 13:50:58 +0100 Subject: [PATCH] [Fix] user status names --- src/server/omikron_connection.rs | 12 ++++++------ src/sql/connection_status.rs | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/server/omikron_connection.rs b/src/server/omikron_connection.rs index f96738f..07fde6c 100644 --- a/src/server/omikron_connection.rs +++ b/src/server/omikron_connection.rs @@ -225,7 +225,7 @@ impl OmikronConnection { // ONLINE STATUS TRACKING if cv.is_type(CommunicationType::user_connected) { if let Some(user_id) = cv.get_data(DataTypes::user_id).and_then(|v| v.as_i64()) { - user_online_tracker::track_user_status(user_id, UserStatus::Online, omikron_id); + user_online_tracker::track_user_status(user_id, UserStatus::online, omikron_id); } return; } @@ -234,7 +234,7 @@ impl OmikronConnection { if let Some(status) = user_online_tracker::get_user_status(user_id) { user_online_tracker::track_user_status( user_id, - UserStatus::UserOffline, + UserStatus::user_offline, status.omikron_id, ); } @@ -252,7 +252,7 @@ impl OmikronConnection { let _ = user_ids.push(JsonValue::from(user.0)); user_online_tracker::track_user_status( user.0, - UserStatus::UserOffline, + UserStatus::user_offline, omikron_id, ); } @@ -291,7 +291,7 @@ impl OmikronConnection { if let Some(user_id) = user_id_json.as_i64() { user_online_tracker::track_user_status( user_id, - UserStatus::Online, + UserStatus::online, omikron_id, ); } @@ -387,7 +387,7 @@ impl OmikronConnection { } else { response = response.add_data( DataTypes::online_status, - JsonValue::String(UserStatus::IotaOffline.to_string()), + JsonValue::String(UserStatus::iota_offline.to_string()), ); } @@ -463,7 +463,7 @@ impl OmikronConnection { } else { response = response.add_data( DataTypes::online_status, - JsonValue::String(UserStatus::IotaOffline.to_string()), + JsonValue::String(UserStatus::iota_offline.to_string()), ); } response = response.add_data( diff --git a/src/sql/connection_status.rs b/src/sql/connection_status.rs index 1c41491..d5b8603 100644 --- a/src/sql/connection_status.rs +++ b/src/sql/connection_status.rs @@ -2,14 +2,14 @@ use strum::IntoEnumIterator; use strum_macros::EnumIter; #[derive(Debug, Clone, PartialEq, EnumIter, Eq)] -#[allow(unused)] +#[allow(unused, non_camel_case_types)] pub enum UserStatus { - Online, - PhoneOnline, - Away, - DoNotDisturb, - UserOffline, - IotaOffline, + online, + phone_online, + away, + do_not_disturb, + user_offline, + iota_offline, } #[allow(unused)] impl UserStatus {