Format & Data

src/data/communication.rs

@@ -78,6 +78,9 @@ pub enum DataTypes {
     communities,
     rho_connections,
     user,
+    online_status,
+    omikron_id,
+    omikron_connections,
 }
 
 impl DataTypes {
@@ -155,6 +158,9 @@ impl DataTypes {
             "communities" => DataTypes::communities,
             "rhoconnections" => DataTypes::rho_connections,
             "user" => DataTypes::user,
+            "onlinestatus" => DataTypes::online_status,
+            "omikronid" => DataTypes::omikron_id,
+            "omikronconnections" => DataTypes::omikron_connections,
             _ => DataTypes::error_type, // fallback if unknown
         }
     }
@@ -231,6 +237,15 @@ pub enum CommunicationType {
     iota_connected,
     iota_disconnected,
     sync_client_iota_status,
+
+    get_user_data,
+    get_iota_data,
+
+    change_user_data,
+    change_iota_data,
+
+    start_register,
+    complete_register,
 }
 impl CommunicationType {
     pub fn parse(p0: String) -> CommunicationType {
@@ -305,6 +320,15 @@ impl CommunicationType {
             "userdisconnected" => CommunicationType::user_disconnected,
             "syncclientiotastatus" => CommunicationType::sync_client_iota_status,
 
+            "getuserdata" => CommunicationType::get_user_data,
+            "getiotadata" => CommunicationType::get_iota_data,
+
+            "changeuserdata" => CommunicationType::change_user_data,
+            "changeiotadata" => CommunicationType::change_iota_data,
+
+            "startregister" => CommunicationType::start_register,
+            "completeregister" => CommunicationType::complete_register,
+
             _ => CommunicationType::error,
         }
     }

src/omega/omega_connection.rs

@@ -286,7 +286,7 @@ impl OmegaConnection {
                 let mut guard = self.read.write().await;
                 let ws = match guard.as_mut() {
                     Some(ws) => ws,
-                    None => break,
+                    _ => break,
                 };
                 ws.next().await
             };
@@ -315,6 +315,7 @@ impl OmegaConnection {
                         }
                     }
                 }
+                #[allow(non_snake_case)]
                 Some(Ok(Message::Close(_))) | None => break,
                 Some(Err(_)) => break,
                 _ => {}