This commit is contained in:
+24
-20
@@ -171,14 +171,14 @@ async fn create_message(
|
||||
.bind(room_id)
|
||||
.bind(&payload.message_type)
|
||||
.bind(&payload.content)
|
||||
.bind(&uuid)
|
||||
.bind(uuid)
|
||||
.fetch_one(&db)
|
||||
.await?;
|
||||
|
||||
let sender_name = username_from_uuid(&db, claims.sub).await?;
|
||||
|
||||
let message = Message {
|
||||
uuid: uuid,
|
||||
uuid,
|
||||
room_uuid,
|
||||
sender: sender_name,
|
||||
sender_uuid: claims.sub,
|
||||
@@ -263,11 +263,11 @@ async fn handle_message_socket(
|
||||
// Receive broadcast messages and send to client (any room)
|
||||
msg = receiver.recv() => {
|
||||
if let Ok(msg) = msg {
|
||||
if let Ok(json) = serde_json::to_string(&msg) {
|
||||
if socket.send(WsMessage::Text(json.into())).await.is_err() {
|
||||
tracing::error!("Failed to send message to {who}, closing connection");
|
||||
break;
|
||||
}
|
||||
if let Ok(json) = serde_json::to_string(&msg)
|
||||
&& socket.send(WsMessage::Text(json.into())).await.is_err()
|
||||
{
|
||||
tracing::error!("Failed to send message to {who}, closing connection");
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
break;
|
||||
@@ -287,19 +287,23 @@ async fn handle_message_socket(
|
||||
// Get incoming messages from client
|
||||
client_msg = socket.recv() => {
|
||||
if let Some(Ok(msg)) = client_msg {
|
||||
match msg {
|
||||
// WsMessage::Pong(_) => {
|
||||
// tracing::debug!("Received Pong from {who}");
|
||||
// }
|
||||
// WsMessage::Ping(_) => {
|
||||
// tracing::info!("Received Ping from client");
|
||||
// }
|
||||
// WsMessage::Text(_) => {}
|
||||
WsMessage::Close(_) => {
|
||||
tracing::debug!("Client disconnected");
|
||||
break;
|
||||
}
|
||||
_ => {}
|
||||
// match msg {
|
||||
// // WsMessage::Pong(_) => {
|
||||
// // tracing::debug!("Received Pong from {who}");
|
||||
// // }
|
||||
// // WsMessage::Ping(_) => {
|
||||
// // tracing::info!("Received Ping from client");
|
||||
// // }
|
||||
// // WsMessage::Text(_) => {}
|
||||
// WsMessage::Close(_) => {
|
||||
// tracing::debug!("Client disconnected");
|
||||
// break;
|
||||
// }
|
||||
// _ => {}
|
||||
// }
|
||||
if let WsMessage::Close(_) = msg {
|
||||
tracing::debug!("Client disconnected");
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
tracing::debug!("Client {who} abruptly disconnected");
|
||||
|
||||
Reference in New Issue
Block a user