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

🐛 Fixes and optimize deliver message

Browse Source
This commit is contained in:
LittleSheep
2025-08-16 23:38:47 +08:00
parent 614c77d7ce
commit d3752caf1d
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DysonNetwork.Pusher/Connection/WebSocketController.cs
View File

@@ -7,7 +7,6 @@ using Swashbuckle.AspNetCore.Annotations;
namespace DysonNetwork.Pusher.Connection; namespace DysonNetwork.Pusher.Connection;
[ApiController] [ApiController]
[Route("/ws")]
public class WebSocketController(WebSocketService ws, ILogger<WebSocketContext> logger) : ControllerBase public class WebSocketController(WebSocketService ws, ILogger<WebSocketContext> logger) : ControllerBase
{ {
[Route("/ws")] [Route("/ws")]

39
DysonNetwork.Sphere/Chat/ChatService.cs
View File

@@ -254,14 +254,36 @@ public partial class ChatService(
notification.Body = "Call begun"; notification.Body = "Call begun";
break; break;
default: default:
var attachmentWord = message.Attachments.Count == 1 ? "attachment" : "attachments";
notification.Body = !string.IsNullOrEmpty(message.Content) notification.Body = !string.IsNullOrEmpty(message.Content)
? message.Content[..Math.Min(message.Content.Length, 100)] ? message.Content[..Math.Min(message.Content.Length, 100)]
: $"<{message.Attachments.Count} attachments>"; : $"<{message.Attachments.Count} {attachmentWord}>";
break;
}
switch (type)
{
case WebSocketPacketType.MessageUpdate:
notification.Body += " (edited)";
break;
case WebSocketPacketType.MessageDelete:
notification.Body = "Deleted a message";
break; break;
} }
var now = SystemClock.Instance.GetCurrentInstant(); var now = SystemClock.Instance.GetCurrentInstant();
var request = new PushWebSocketPacketToUsersRequest
{
Packet = new WebSocketPacket
{
Type = type,
Data = GrpcTypeHelper.ConvertObjectToByteString(message),
},
};
request.UserIds.AddRange(members.Select(a => a.Account).Where(a => a is not null).Select(a => a!.Id.ToString()));
await scopedNty.PushWebSocketPacketToUsersAsync(request);
List<Account> accountsToNotify = []; List<Account> accountsToNotify = [];
foreach ( foreach (
var member in members var member in members
@@ -279,17 +301,6 @@ public partial class ChatService(
accountsToNotify.Add(member.Account.ToProtoValue()); accountsToNotify.Add(member.Account.ToProtoValue());
} }
var request = new PushWebSocketPacketToUsersRequest
{
Packet = new WebSocketPacket
{
Type = type,
Data = GrpcTypeHelper.ConvertObjectToByteString(message),
},
};
request.UserIds.AddRange(accountsToNotify.Select(a => a.Id.ToString()));
await scopedNty.PushWebSocketPacketToUsersAsync(request);
accountsToNotify = accountsToNotify accountsToNotify = accountsToNotify
.Where(a => a.Id != sender.AccountId.ToString()).ToList(); .Where(a => a.Id != sender.AccountId.ToString()).ToList();
@@ -389,15 +400,11 @@ public partial class ChatService(
// Remove messages with no sender // Remove messages with no sender
foreach (var key in messagesToRemove) foreach (var key in messagesToRemove)
{
messages.Remove(key); messages.Remove(key);
}
// Update remaining messages with their senders // Update remaining messages with their senders
foreach (var message in messages) foreach (var message in messages)
{
message.Value!.Sender = messageSenders.First(x => x.Id == message.Value.SenderId); message.Value!.Sender = messageSenders.First(x => x.Id == message.Value.SenderId);
}
return messages; return messages;
} }