crates/oxidetalis/src/extensions.rs

@@ -19,7 +19,7 @@ use std::sync::Arc;
 use chrono::Utc;
 use oxidetalis_config::Config;
 use rayon::iter::{IntoParallelRefMutIterator, ParallelIterator};
-use salvo::{websocket::Message, Depot};
+use salvo::Depot;
 use sea_orm::DatabaseConnection;
 use uuid::Uuid;
 
@@ -87,9 +87,10 @@ impl OnlineUsersExt for OnlineUsers {
         let now = Utc::now();
         self.write().await.par_iter_mut().for_each(|(_, u)| {
             u.pinged_at = now;
-            let _ = u.sender.unbounded_send(Ok(Message::from(
+            let _ = u.sender.unbounded_send(Ok(ServerEvent::ping()
-                &ServerEvent::ping().sign(&u.shared_secret),
+                .sign(&u.shared_secret)
-            )));
+                .as_ref()
+                .into()));
         });
     }
 

crates/oxidetalis/src/websocket/events/server.rs

@@ -101,6 +101,12 @@ impl ServerEvent<Unsigned> {
     }
 }
 
+impl<S> AsRef<Self> for ServerEvent<S> {
+    fn as_ref(&self) -> &Self {
+        self
+    }
+}
+
 impl From<&ServerEvent<Signed>> for Message {
     fn from(value: &ServerEvent<Signed>) -> Self {
         Message::text(serde_json::to_string(value).expect("This can't fail"))

crates/oxidetalis/src/websocket/mod.rs

@@ -132,18 +132,22 @@ async fn handle_socket(
             match handle_ws_msg(msg, &nonce_cache, &user_shared_secret).await {
                 Ok(event) => {
                     if let Some(server_event) = handle_events(event, &conn_id).await {
-                        if let Err(err) = sender.unbounded_send(Ok(Message::from(
+                        if let Err(err) = sender.unbounded_send(Ok(server_event
-                            &server_event.sign(&user_shared_secret),
+                            .sign(&user_shared_secret)
-                        ))) {
+                            .as_ref()
+                            .into()))
+                        {
                             log::error!("Websocket Error: {err}");
                             break;
                         }
                     };
                 }
                 Err(err) => {
-                    if let Err(err) = sender.unbounded_send(Ok(Message::from(
+                    if let Err(err) = sender.unbounded_send(Ok(ServerEvent::from(err)
-                        &ServerEvent::from(err).sign(&user_shared_secret),
+                        .sign(&user_shared_secret)
-                    ))) {
+                        .as_ref()
+                        .into()))
+                    {
                         log::error!("Websocket Error: {err}");
                         break;
                     };