From 8432436fcf7007bdf8284082f06d7175a1a028e3 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Fri, 27 Jun 2025 23:16:28 +0800
Subject: [PATCH] :bug: Fix circular dependency in service injection

---
 DysonNetwork.Sphere/Chat/ChatController.cs                  | 2 +-
 .../Connection/Handlers/MessageTypingHandler.cs             | 2 +-
 .../Connection/Handlers/MessagesSubscribeHandler.cs         | 6 +++---
 .../Connection/Handlers/MessagesUnsubscribeHandler.cs       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/DysonNetwork.Sphere/Chat/ChatController.cs b/DysonNetwork.Sphere/Chat/ChatController.cs
index 2f78c81..822f812 100644
--- a/DysonNetwork.Sphere/Chat/ChatController.cs
+++ b/DysonNetwork.Sphere/Chat/ChatController.cs
@@ -17,7 +17,7 @@ public partial class ChatController(AppDatabase db, ChatService cs, ChatRoomServ
         public Guid ChatRoomId { get; set; }
     }
 
-    public class TypingMessageRequest
+    public class ChatRoomWsUniversalRequest
     {
         public Guid ChatRoomId { get; set; }
     }
diff --git a/DysonNetwork.Sphere/Connection/Handlers/MessageTypingHandler.cs b/DysonNetwork.Sphere/Connection/Handlers/MessageTypingHandler.cs
index 57964aa..b6447db 100644
--- a/DysonNetwork.Sphere/Connection/Handlers/MessageTypingHandler.cs
+++ b/DysonNetwork.Sphere/Connection/Handlers/MessageTypingHandler.cs
@@ -17,7 +17,7 @@ public class MessageTypingHandler(ChatRoomService crs) : IWebSocketPacketHandler
         WebSocketService srv
     )
     {
-        var request = packet.GetData<ChatController.TypingMessageRequest>();
+        var request = packet.GetData<ChatController.ChatRoomWsUniversalRequest>();
         if (request is null)
         {
             await socket.SendAsync(
diff --git a/DysonNetwork.Sphere/Connection/Handlers/MessagesSubscribeHandler.cs b/DysonNetwork.Sphere/Connection/Handlers/MessagesSubscribeHandler.cs
index 549e75f..cf5792b 100644
--- a/DysonNetwork.Sphere/Connection/Handlers/MessagesSubscribeHandler.cs
+++ b/DysonNetwork.Sphere/Connection/Handlers/MessagesSubscribeHandler.cs
@@ -4,7 +4,7 @@ using DysonNetwork.Sphere.Chat;
 
 namespace DysonNetwork.Sphere.Connection.Handlers;
 
-public class MessagesSubscribeHandler(ChatRoomService crs, WebSocketService webSocketService) : IWebSocketPacketHandler
+public class MessagesSubscribeHandler(ChatRoomService crs) : IWebSocketPacketHandler
 {
     public string PacketType => "messages.subscribe";
 
@@ -16,7 +16,7 @@ public class MessagesSubscribeHandler(ChatRoomService crs, WebSocketService webS
         WebSocketService srv
     )
     {
-        var request = packet.GetData<ChatController.TypingMessageRequest>();
+        var request = packet.GetData<ChatController.ChatRoomWsUniversalRequest>();
         if (request is null)
         {
             await socket.SendAsync(
@@ -48,6 +48,6 @@ public class MessagesSubscribeHandler(ChatRoomService crs, WebSocketService webS
             return;
         }
 
-        webSocketService.SubscribeToChatRoom(sender.ChatRoomId.ToString(), deviceId);
+        srv.SubscribeToChatRoom(sender.ChatRoomId.ToString(), deviceId);
     }
 }
diff --git a/DysonNetwork.Sphere/Connection/Handlers/MessagesUnsubscribeHandler.cs b/DysonNetwork.Sphere/Connection/Handlers/MessagesUnsubscribeHandler.cs
index 4b353aa..cc507ac 100644
--- a/DysonNetwork.Sphere/Connection/Handlers/MessagesUnsubscribeHandler.cs
+++ b/DysonNetwork.Sphere/Connection/Handlers/MessagesUnsubscribeHandler.cs
@@ -3,7 +3,7 @@ using DysonNetwork.Sphere.Chat;
 
 namespace DysonNetwork.Sphere.Connection.Handlers;
 
-public class MessagesUnsubscribeHandler(WebSocketService webSocketService) : IWebSocketPacketHandler
+public class MessagesUnsubscribeHandler() : IWebSocketPacketHandler
 {
     public string PacketType => "messages.unsubscribe";
 
@@ -15,7 +15,7 @@ public class MessagesUnsubscribeHandler(WebSocketService webSocketService) : IWe
         WebSocketService srv
     )
     {
-        webSocketService.UnsubscribeFromChatRoom(deviceId);
+        srv.UnsubscribeFromChatRoom(deviceId);
         return Task.CompletedTask;
     }
 }