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

✨ Typing indicator, mark as read server-side

Browse Source
This commit is contained in:
LittleSheep 2025-05-18 05:35:14 +08:00
parent 5951dab6f1
commit c597df3937
13 changed files with 3646 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,11 @@ public partial class ChatController(AppDatabase db, ChatService cs) : Controller
public Guid ChatRoomId { get; set; }
}
public class TypingMessageRequest
{
public Guid ChatRoomId { get; set; }
}
public class SendMessageRequest
{
[MaxLength(4096)] public string? Content { get; set; }

63
DysonNetwork.Sphere/Chat/ChatRoomController.cs
View File

@ -16,7 +16,8 @@ public class ChatRoomController(
FileService fs,
ChatRoomService crs,
RealmService rs,
ActionLogService als
ActionLogService als,
NotificationService nty
) : ControllerBase
{
[HttpGet("{id:guid}")]
@ -113,7 +114,7 @@ public class ChatRoomController(
);
var invitedMember = dmRoom.Members.First(m => m.AccountId == request.RelatedUserId);
await crs.SendInviteNotify(invitedMember);
await _SendInviteNotify(invitedMember);
return Ok(dmRoom);
}
@ -400,7 +401,7 @@ public class ChatRoomController(
db.ChatMembers.Add(newMember);
await db.SaveChangesAsync();
await crs.SendInviteNotify(newMember);
await _SendInviteNotify(newMember);
als.CreateActionLogFromRequest(
ActionLogType.ChatroomInvite,
@ -452,6 +453,7 @@ public class ChatRoomController(
member.JoinedAt = NodaTime.Instant.FromDateTimeUtc(DateTime.UtcNow);
db.Update(member);
await db.SaveChangesAsync();
crs.PurgeRoomMembersCache(roomId);
als.CreateActionLogFromRequest(
ActionLogType.ChatroomJoin,
@ -484,7 +486,7 @@ public class ChatRoomController(
[HttpPatch("{roomId:guid}/members/{memberId:guid}/role")]
[Authorize]
public async Task<ActionResult<ChatMember>> UpdateChatMemberRole(Guid roomId, Guid memberId,
[FromBody] ChatMemberRequest request)
[FromBody] ChatMemberRole newRole)
{
if (HttpContext.Items["CurrentUser"] is not Account.Account currentUser) return Unauthorized();
@ -518,13 +520,13 @@ public class ChatRoomController(
.FirstOrDefaultAsync();
if (targetMember is null) return NotFound();
// Check if current user has sufficient permissions
// Check if the current user has sufficient permissions
if (currentMember.Role <= targetMember.Role)
return StatusCode(403, "You cannot modify the role of members with equal or higher roles.");
if (currentMember.Role <= request.Role)
if (currentMember.Role <= newRole)
return StatusCode(403, "You cannot assign a role equal to or higher than your own.");
targetMember.Role = request.Role;
targetMember.Role = newRole;
db.ChatMembers.Update(targetMember);
await db.SaveChangesAsync();
@ -576,6 +578,7 @@ public class ChatRoomController(
db.ChatMembers.Remove(targetMember);
await db.SaveChangesAsync();
crs.PurgeRoomMembersCache(roomId);
als.CreateActionLogFromRequest(
ActionLogType.ChatroomKick,
@ -588,6 +591,45 @@ public class ChatRoomController(
return BadRequest();
}
[HttpPost("{roomId:guid}/members/me")]
[Authorize]
public async Task<ActionResult<ChatRoom>> JoinChatRoom(Guid roomId)
{
if (HttpContext.Items["CurrentUser"] is not Account.Account currentUser) return Unauthorized();
var chatRoom = await db.ChatRooms
.Where(r => r.Id == roomId)
.FirstOrDefaultAsync();
if (chatRoom is null) return NotFound();
if (!chatRoom.IsPublic)
return StatusCode(403, "This chat room is private. You need an invitation to join.");
var existingMember = await db.ChatMembers
.FirstOrDefaultAsync(m => m.AccountId == currentUser.Id && m.ChatRoomId == roomId);
if (existingMember != null)
return BadRequest("You are already a member of this chat room.");
var newMember = new ChatMember
{
AccountId = currentUser.Id,
ChatRoomId = roomId,
Role = ChatMemberRole.Member,
JoinedAt = NodaTime.Instant.FromDateTimeUtc(DateTime.UtcNow)
};
db.ChatMembers.Add(newMember);
await db.SaveChangesAsync();
crs.PurgeRoomMembersCache(roomId);
als.CreateActionLogFromRequest(
ActionLogType.ChatroomJoin,
new Dictionary<string, object> { { "chatroom_id", roomId } }, Request
);
return Ok(chatRoom);
}
[HttpDelete("{roomId:guid}/members/me")]
[Authorize]
public async Task<ActionResult> LeaveChat(Guid roomId)
@ -615,6 +657,7 @@ public class ChatRoomController(
db.ChatMembers.Remove(member);
await db.SaveChangesAsync();
crs.PurgeRoomMembersCache(roomId);
als.CreateActionLogFromRequest(
ActionLogType.ChatroomLeave,
@ -623,4 +666,10 @@ public class ChatRoomController(
return NoContent();
}
private async Task _SendInviteNotify(ChatMember member)
{
await nty.SendNotification(member.Account, "invites.chats", "New Chat Invitation", null,
$"You just got invited to join {member.ChatRoom.Name}");
}
}

29
DysonNetwork.Sphere/Chat/ChatRoomService.cs
View File

@ -1,14 +1,35 @@
using DysonNetwork.Sphere.Account;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Caching.Memory;
namespace DysonNetwork.Sphere.Chat;
public class ChatRoomService(AppDatabase db, NotificationService nty)
public class ChatRoomService(AppDatabase db, IMemoryCache cache)
{
public async Task SendInviteNotify(ChatMember member)
private const string RoomMembersCacheKey = "ChatRoomMembers_{0}";
public async Task<List<ChatMember>> ListRoomMembers(Guid roomId)
{
await nty.SendNotification(member.Account, "invites.chats", "New Chat Invitation", null,
$"You just got invited to join {member.ChatRoom.Name}");
var cacheKey = string.Format(RoomMembersCacheKey, roomId);
if (cache.TryGetValue(cacheKey, out List<ChatMember>? cachedMembers))
return cachedMembers!;
var members = await db.ChatMembers
.Where(m => m.ChatRoomId == roomId)
.Where(m => m.JoinedAt != null)
.ToListAsync();
var cacheOptions = new MemoryCacheEntryOptions()
.SetAbsoluteExpiration(TimeSpan.FromMinutes(5));
cache.Set(cacheKey, members, cacheOptions);
return members;
}
public void PurgeRoomMembersCache(Guid roomId)
{
var cacheKey = string.Format(RoomMembersCacheKey, roomId);
cache.Remove(cacheKey);
}
public async Task<List<ChatRoom>> LoadDirectMessageMembers(List<ChatRoom> rooms, Guid userId)

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

@ -2,6 +2,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text.Json.Serialization;
using DysonNetwork.Sphere.Storage;
using Microsoft.EntityFrameworkCore;
using NodaTime;
namespace DysonNetwork.Sphere.Chat;
@ -78,6 +79,7 @@ public class MessageReaction : ModelBase
}
/// If the status is exist, means the user has read the message.
[Index(nameof(MessageId), nameof(SenderId), IsUnique = true)]
public class MessageStatus : ModelBase
{
public Guid MessageId { get; set; }

58
DysonNetwork.Sphere/Connection/Handlers/MessageReadHandler.cs
View File

@ -1,16 +1,27 @@
using System.Net.WebSockets;
using DysonNetwork.Sphere.Chat;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Internal;
using SystemClock = NodaTime.SystemClock;
namespace DysonNetwork.Sphere.Connection.Handlers;
public class MessageReadHandler(AppDatabase db) : IWebSocketPacketHandler
public class MessageReadHandler(AppDatabase db, IMemoryCache cache, ChatRoomService crs) : IWebSocketPacketHandler
{
public string PacketType => "message.read";
public string PacketType => "messages.read";
public async Task HandleAsync(Account.Account currentUser, string deviceId, WebSocketPacket packet, WebSocket socket)
public const string ChatMemberCacheKey = "ChatMember_{0}_{1}";
public async Task HandleAsync(
Account.Account currentUser,
string deviceId,
WebSocketPacket packet,
WebSocket socket,
WebSocketService srv
)
{
var request = packet.GetData<Chat.ChatController.MarkMessageReadRequest>();
var request = packet.GetData<ChatController.MarkMessageReadRequest>();
if (request is null)
{
await socket.SendAsync(
@ -26,12 +37,24 @@ public class MessageReadHandler(AppDatabase db) : IWebSocketPacketHandler
return;
}
var existingStatus = await db.ChatStatuses
.FirstOrDefaultAsync(x => x.MessageId == request.MessageId && x.Sender.AccountId == currentUser.Id);
var sender = await db.ChatMembers
ChatMember? sender = null;
var cacheKey = string.Format(ChatMemberCacheKey, currentUser.Id, request.ChatRoomId);
if (cache.TryGetValue(cacheKey, out ChatMember? cachedMember))
sender = cachedMember;
else
{
sender = await db.ChatMembers
.Where(m => m.AccountId == currentUser.Id && m.ChatRoomId == request.ChatRoomId)
.FirstOrDefaultAsync();
if (sender != null)
{
var cacheOptions = new MemoryCacheEntryOptions()
.SetAbsoluteExpiration(TimeSpan.FromMinutes(5));
cache.Set(cacheKey, sender, cacheOptions);
}
}
if (sender is null)
{
await socket.SendAsync(
@ -47,16 +70,25 @@ public class MessageReadHandler(AppDatabase db) : IWebSocketPacketHandler
return;
}
if (existingStatus == null)
{
existingStatus = new MessageStatus
db.ChatStatuses.Add(new MessageStatus
{
MessageId = request.MessageId,
SenderId = sender.Id,
};
db.ChatStatuses.Add(existingStatus);
}
ReadAt = SystemClock.Instance.GetCurrentInstant(),
});
try
{
await db.SaveChangesAsync();
// Broadcast read statuses
var otherMembers = (await crs.ListRoomMembers(request.ChatRoomId)).Select(m => m.AccountId).ToList();
foreach (var member in otherMembers)
srv.SendPacketToAccount(member, packet);
}
catch
{
// ignored
}
}
}

74
DysonNetwork.Sphere/Connection/Handlers/MessageTypingHandler.cs Normal file
View File

@ -0,0 +1,74 @@
using System.Net.WebSockets;
using DysonNetwork.Sphere.Chat;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Caching.Memory;
namespace DysonNetwork.Sphere.Connection.Handlers;
public class MessageTypingHandler(AppDatabase db, ChatRoomService crs, IMemoryCache cache) : IWebSocketPacketHandler
{
public string PacketType => "messages.typing";
public async Task HandleAsync(
Account.Account currentUser,
string deviceId,
WebSocketPacket packet,
WebSocket socket,
WebSocketService srv
)
{
var request = packet.GetData<ChatController.TypingMessageRequest>();
if (request is null)
{
await socket.SendAsync(
new ArraySegment<byte>(new WebSocketPacket
{
Type = WebSocketPacketType.Error,
ErrorMessage = "Mark message as read requires you provide the ChatRoomId"
}.ToBytes()),
WebSocketMessageType.Binary,
true,
CancellationToken.None
);
return;
}
ChatMember? sender = null;
var cacheKey = string.Format(MessageReadHandler.ChatMemberCacheKey, currentUser.Id, request.ChatRoomId);
if (cache.TryGetValue(cacheKey, out ChatMember? cachedMember))
sender = cachedMember;
else
{
sender = await db.ChatMembers
.Where(m => m.AccountId == currentUser.Id && m.ChatRoomId == request.ChatRoomId)
.FirstOrDefaultAsync();
if (sender != null)
{
var cacheOptions = new MemoryCacheEntryOptions()
.SetAbsoluteExpiration(TimeSpan.FromMinutes(5));
cache.Set(cacheKey, sender, cacheOptions);
}
}
if (sender is null)
{
await socket.SendAsync(
new ArraySegment<byte>(new WebSocketPacket
{
Type = WebSocketPacketType.Error,
ErrorMessage = "User is not a member of the chat room."
}.ToBytes()),
WebSocketMessageType.Binary,
true,
CancellationToken.None
);
return;
}
// Broadcast read statuses
var otherMembers = (await crs.ListRoomMembers(request.ChatRoomId)).Select(m => m.AccountId).ToList();
foreach (var member in otherMembers)
srv.SendPacketToAccount(member, packet);
}
}

2
DysonNetwork.Sphere/Connection/IWebSocketPacketHandler.cs
View File

@ -5,5 +5,5 @@ namespace DysonNetwork.Sphere.Connection;
public interface IWebSocketPacketHandler
{
string PacketType { get; }
Task HandleAsync(Account.Account currentUser, string deviceId, WebSocketPacket packet, WebSocket socket);
Task HandleAsync(Account.Account currentUser, string deviceId, WebSocketPacket packet, WebSocket socket, WebSocketService srv);
}

10
DysonNetwork.Sphere/Connection/WebSocketPacket.cs
View File

@ -37,13 +37,17 @@ public class WebSocketPacket
/// <returns>Deserialized data of type T</returns>
public T? GetData<T>()
{
if (Data == null)
return default;
if (Data is T typedData)
return typedData;
var jsonOpts = new JsonSerializerOptions
{
PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
DictionaryKeyPolicy = JsonNamingPolicy.SnakeCaseLower,
};
return JsonSerializer.Deserialize<T>(
JsonSerializer.Serialize(Data)
JsonSerializer.Serialize(Data, jsonOpts),
jsonOpts
);
}

2
DysonNetwork.Sphere/Connection/WebSocketService.cs
View File

@ -85,7 +85,7 @@ public class WebSocketService
{
if (_handlerMap.TryGetValue(packet.Type, out var handler))
{
await handler.HandleAsync(currentUser, deviceId, packet, socket);
await handler.HandleAsync(currentUser, deviceId, packet, socket, this);
return;
}

3390
DysonNetwork.Sphere/Migrations/20250517211759_IndexedMessageStatus.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

28
DysonNetwork.Sphere/Migrations/20250517211759_IndexedMessageStatus.cs Normal file
View File

@ -0,0 +1,28 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace DysonNetwork.Sphere.Migrations
{
/// <inheritdoc />
public partial class IndexedMessageStatus : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateIndex(
name: "ix_chat_statuses_message_id_sender_id",
table: "chat_statuses",
columns: new[] { "message_id", "sender_id" },
unique: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "ix_chat_statuses_message_id_sender_id",
table: "chat_statuses");
}
}
}

4
DysonNetwork.Sphere/Migrations/AppDatabaseModelSnapshot.cs
View File

@ -1175,6 +1175,10 @@ namespace DysonNetwork.Sphere.Migrations
b.HasIndex("SenderId")
.HasDatabaseName("ix_chat_statuses_sender_id");
b.HasIndex("MessageId", "SenderId")
.IsUnique()
.HasDatabaseName("ix_chat_statuses_message_id_sender_id");
b.ToTable("chat_statuses", (string)null);
});

1
DysonNetwork.Sphere/Program.cs
View File

@ -137,6 +137,7 @@ builder.Services.AddSingleton(tusDiskStore);
// The handlers for websocket
builder.Services.AddScoped<IWebSocketPacketHandler, MessageReadHandler>();
builder.Services.AddScoped<IWebSocketPacketHandler, MessageTypingHandler>();
// Services
builder.Services.AddScoped<RazorViewRenderer>();