Solar/Swarm
2
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,11 @@ public partial class ChatController(AppDatabase db, ChatService cs) : Controller
public Guid MessageId { get; set; }
public Guid ChatRoomId { get; set; }
}
public class TypingMessageRequest
{
public Guid ChatRoomId { get; set; }
}
public class SendMessageRequest
{

65
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,
@ -428,7 +429,7 @@ public class ChatRoomController(
var chatRooms = members.Select(m => m.ChatRoom).ToList();
var directMembers =
(await crs.LoadDirectMessageMembers(chatRooms, userId)).ToDictionary(c => c.Id, c => c.Members);
foreach (var member in members.Where(member => member.ChatRoom.Type == ChatRoomType.DirectMessage))
member.ChatRoom.Members = directMembers[member.ChatRoom.Id];
@ -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; }