Merge branch 'main' of github.com:Tensamin/Omikron

src/data/user.rs

@@ -4,12 +4,15 @@ use strum_macros::EnumIter;
 #[derive(Debug, Clone, PartialEq, EnumIter, Eq)]
 #[allow(unused, non_camel_case_types)]
 pub enum UserStatus {
-    online,
-    phone_online,
-    away,
-    do_not_disturb,
     user_offline,
+    user_online,
+    user_dnd,
+    user_idle,
+    user_wc,
+    user_borked,
     iota_offline,
+    iota_online,
+    iota_borked,
 }
 #[allow(unused)]
 impl UserStatus {

src/rho/client_connection.rs

@@ -425,7 +425,7 @@ impl ClientConnection {
     async fn handle_client_changed(self: Arc<Self>, cv: CommunicationValue) {
         let user_id = self.get_user_id().await;
         if let Some(_status_str) = cv.get_data(DataTypes::user_state) {
-            let user_status = UserStatus::online;
+            let user_status = UserStatus::user_online;
             if let Some(rho_conn) = self.get_rho_connection().await {
                 OmegaConnection::client_changed(rho_conn.get_iota_id().await, user_id, user_status)
                     .await;

src/rho/rho_connection.rs

@@ -76,7 +76,7 @@ impl RhoConnection {
         OmegaConnection::client_changed(
             self.get_iota_id().await,
             connection.get_user_id().await,
-            UserStatus::online,
+            UserStatus::user_online,
         )
         .await;
     }