DysonNetwork/Swarm
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix circular dependency in service injection

Browse Source
This commit is contained in:
LittleSheep 2025-06-27 23:16:28 +08:00
parent 2a28948418
commit 8432436fcf
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DysonNetwork.Sphere/Chat/ChatController.cs
View File

@ -17,7 +17,7 @@ public partial class ChatController(AppDatabase db, ChatService cs, ChatRoomServ
public Guid ChatRoomId { get; set; } public Guid ChatRoomId { get; set; }
} }
public class TypingMessageRequest public class ChatRoomWsUniversalRequest
{ {
public Guid ChatRoomId { get; set; } public Guid ChatRoomId { get; set; }
} }

2
DysonNetwork.Sphere/Connection/Handlers/MessageTypingHandler.cs
View File

@ -17,7 +17,7 @@ public class MessageTypingHandler(ChatRoomService crs) : IWebSocketPacketHandler
WebSocketService srv WebSocketService srv
) )
{ {
var request = packet.GetData<ChatController.TypingMessageRequest>(); var request = packet.GetData<ChatController.ChatRoomWsUniversalRequest>();
if (request is null) if (request is null)
{ {
await socket.SendAsync( await socket.SendAsync(

6
DysonNetwork.Sphere/Connection/Handlers/MessagesSubscribeHandler.cs
View File

@ -4,7 +4,7 @@ using DysonNetwork.Sphere.Chat;
namespace DysonNetwork.Sphere.Connection.Handlers; namespace DysonNetwork.Sphere.Connection.Handlers;
public class MessagesSubscribeHandler(ChatRoomService crs, WebSocketService webSocketService) : IWebSocketPacketHandler public class MessagesSubscribeHandler(ChatRoomService crs) : IWebSocketPacketHandler
{ {
public string PacketType => "messages.subscribe"; public string PacketType => "messages.subscribe";
@ -16,7 +16,7 @@ public class MessagesSubscribeHandler(ChatRoomService crs, WebSocketService webS
WebSocketService srv WebSocketService srv
) )
{ {
var request = packet.GetData<ChatController.TypingMessageRequest>(); var request = packet.GetData<ChatController.ChatRoomWsUniversalRequest>();
if (request is null) if (request is null)
{ {
await socket.SendAsync( await socket.SendAsync(
@ -48,6 +48,6 @@ public class MessagesSubscribeHandler(ChatRoomService crs, WebSocketService webS
return; return;
} }
webSocketService.SubscribeToChatRoom(sender.ChatRoomId.ToString(), deviceId); srv.SubscribeToChatRoom(sender.ChatRoomId.ToString(), deviceId);
} }
} }

4
DysonNetwork.Sphere/Connection/Handlers/MessagesUnsubscribeHandler.cs
View File

@ -3,7 +3,7 @@ using DysonNetwork.Sphere.Chat;
namespace DysonNetwork.Sphere.Connection.Handlers; namespace DysonNetwork.Sphere.Connection.Handlers;
public class MessagesUnsubscribeHandler(WebSocketService webSocketService) : IWebSocketPacketHandler public class MessagesUnsubscribeHandler() : IWebSocketPacketHandler
{ {
public string PacketType => "messages.unsubscribe"; public string PacketType => "messages.unsubscribe";
@ -15,7 +15,7 @@ public class MessagesUnsubscribeHandler(WebSocketService webSocketService) : IWe
WebSocketService srv WebSocketService srv
) )
{ {
webSocketService.UnsubscribeFromChatRoom(deviceId); srv.UnsubscribeFromChatRoom(deviceId);
return Task.CompletedTask; return Task.CompletedTask;
} }
} }