make irc update handler a separate function

src/projections/irc/mod.rs

@@ -221,13 +221,34 @@ async fn handle_registered_socket<'a>(
                 } else {
                     len
                 };
-                handle_incoming_message(&buffer[0..len], &config, &user, &mut connection, &player_id, writer).await?;
+                handle_incoming_message(&buffer[0..len], &config, &user, &mut connection, writer).await?;
                 buffer.clear();
             },
             update = connection.receiver.recv() => {
-                match update.unwrap() {
+                if let Some(update) = update {
+                    handle_update(&config, &user, &player_id, writer, &rooms, update).await?;
+                } else {
+                    log::warn!("Player is terminated, must terminate the connection");
+                    break;
+                }
+            }
+        }
+    }
+    connection.terminate().await;
+    Ok(())
+}
+
+async fn handle_update(
+    config: &ServerConfig,
+    user: &RegisteredUser,
+    player_id: &PlayerId,
+    writer: &mut (impl AsyncWrite + Unpin),
+    rooms: &RoomRegistry,
+    update: Updates
+) -> Result<()> {
+    match update {
         Updates::RoomJoined { new_member_id, room_id } => {
-                        if player_id == new_member_id {
+            if player_id == &new_member_id {
                 if let Some(room) = rooms.get_room(&room_id) {
                     let room_info = room.get_room_info().await;
                     let chan = Chan::Global(room_id.as_bytes().clone());
@@ -274,10 +295,6 @@ async fn handle_registered_socket<'a>(
             writer.flush().await?
         },
     }
-            }
-        }
-    }
-    connection.terminate().await;
     Ok(())
 }
 
@@ -286,7 +303,6 @@ async fn handle_incoming_message(
     config: &ServerConfig,
     user: &RegisteredUser,
     user_handle: &mut PlayerConnection,
-    player_id: &PlayerId,
     writer: &mut (impl AsyncWrite + Unpin),
 ) -> Result<()> {
     let parsed = client_message(buffer);