♻️ A more robust and simpler chat system

DysonNetwork.Shared/Models/ChatRoom.cs

@@ -38,13 +38,6 @@ public class SnChatRoom : ModelBase, IIdentifiedResource
     public string ResourceIdentifier => $"chatroom:{Id}";
 }
 
-public abstract class ChatMemberRole
-{
-    public const int Owner = 100;
-    public const int Moderator = 50;
-    public const int Member = 0;
-}
-
 public enum ChatMemberNotify
 {
     All,
@@ -75,12 +68,16 @@ public class SnChatMember : ModelBase
 
     [MaxLength(1024)] public string? Nick { get; set; }
 
-    public int Role { get; set; } = ChatMemberRole.Member;
     public ChatMemberNotify Notify { get; set; } = ChatMemberNotify.All;
     public Instant? LastReadAt { get; set; }
     public Instant? JoinedAt { get; set; }
     public Instant? LeaveAt { get; set; }
-    public bool IsBot { get; set; } = false;
+    
+    public Guid? InvitedById { get; set; }
+    public SnChatMember? InvitedBy { get; set; }
+
+    // Backwards support field
+    [NotMapped] public int Role = 0;
 
     /// <summary>
     /// The break time is the user doesn't receive any message from this member for a while.
@@ -107,16 +104,20 @@ public class ChatMemberTransmissionObject : ModelBase
 
     [MaxLength(1024)] public string? Nick { get; set; }
 
-    public int Role { get; set; } = ChatMemberRole.Member;
     public ChatMemberNotify Notify { get; set; } = ChatMemberNotify.All;
     public Instant? JoinedAt { get; set; }
     public Instant? LeaveAt { get; set; }
-    public bool IsBot { get; set; } = false;
+    
+    public Guid? InvitedById { get; set; }
+    public SnChatMember? InvitedBy { get; set; }
 
     public Instant? BreakUntil { get; set; }
     public Instant? TimeoutUntil { get; set; }
     public ChatTimeoutCause? TimeoutCause { get; set; }
     
+    // Backwards support field
+    [NotMapped] public int Role = 0;
+
     public static ChatMemberTransmissionObject FromEntity(SnChatMember member)
     {
         return new ChatMemberTransmissionObject
@@ -126,14 +127,14 @@ public class ChatMemberTransmissionObject : ModelBase
             AccountId = member.AccountId,
             Account = member.Account!,
             Nick = member.Nick,
-            Role = member.Role,
             Notify = member.Notify,
             JoinedAt = member.JoinedAt,
             LeaveAt = member.LeaveAt,
-            IsBot = member.IsBot,
             BreakUntil = member.BreakUntil,
             TimeoutUntil = member.TimeoutUntil,
             TimeoutCause = member.TimeoutCause,
+            InvitedById = member.InvitedById,
+            InvitedBy = member.InvitedBy,
             CreatedAt = member.CreatedAt,
             UpdatedAt = member.UpdatedAt,
             DeletedAt = member.DeletedAt

DysonNetwork.Sphere/Chat/ChatController.cs

@@ -112,7 +112,7 @@ public partial class ChatController(
                 .Where(m => m.AccountId == accountId && m.ChatRoomId == roomId && m.JoinedAt != null &&
                             m.LeaveAt == null)
                 .FirstOrDefaultAsync();
-            if (member == null || member.Role < ChatMemberRole.Member)
+            if (member == null)
                 return StatusCode(403, "You are not a member of this chat room.");
         }
 
@@ -155,7 +155,7 @@ public partial class ChatController(
                 .Where(m => m.AccountId == accountId && m.ChatRoomId == roomId && m.JoinedAt != null &&
                             m.LeaveAt == null)
                 .FirstOrDefaultAsync();
-            if (member == null || member.Role < ChatMemberRole.Member)
+            if (member == null)
                 return StatusCode(403, "You are not a member of this chat room.");
         }
 
@@ -255,8 +255,8 @@ public partial class ChatController(
             return BadRequest("You cannot send an empty message.");
 
         var member = await crs.GetRoomMember(Guid.Parse(currentUser.Id), roomId);
-        if (member == null || member.Role < ChatMemberRole.Member)
+        if (member == null)
-            return StatusCode(403, "You need to be a normal member to send messages here.");
+            return StatusCode(403, "You need to be a member to send messages here.");
 
         // Validate fund if provided
         if (request.FundId.HasValue)

DysonNetwork.Sphere/Chat/ChatRoomController.cs

@@ -6,7 +6,6 @@ using DysonNetwork.Shared.Auth;
 using DysonNetwork.Shared.Proto;
 using DysonNetwork.Shared.Registry;
 using DysonNetwork.Sphere.Localization;
-
 using Grpc.Core;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Localization;
@@ -80,6 +79,7 @@ public class ChatRoomController(
     {
         if (HttpContext.Items["CurrentUser"] is not Account currentUser)
             return Unauthorized();
+        var accountId = Guid.Parse(currentUser.Id);
 
         var relatedUser = await accounts.GetAccountAsync(
             new GetAccountRequest { Id = request.RelatedUserId.ToString() }
@@ -112,18 +112,17 @@ public class ChatRoomController(
         {
             Type = ChatRoomType.DirectMessage,
             IsPublic = false,
+            AccountId = accountId,
             Members = new List<SnChatMember>
             {
                 new()
                 {
-                    AccountId = Guid.Parse(currentUser.Id),
+                    AccountId = accountId,
-                    Role = ChatMemberRole.Owner,
+                    JoinedAt = SystemClock.Instance.GetCurrentInstant()
-                    JoinedAt = Instant.FromDateTimeUtc(DateTime.UtcNow)
                 },
                 new()
                 {
                     AccountId = request.RelatedUserId,
-                    Role = ChatMemberRole.Member,
                     JoinedAt = null, // Pending status
                 }
             }
@@ -154,11 +153,12 @@ public class ChatRoomController(
     {
         if (HttpContext.Items["CurrentUser"] is not Account currentUser)
             return Unauthorized();
+        var currentId = Guid.Parse(currentUser.Id);
 
         var room = await db.ChatRooms
             .Include(c => c.Members)
             .Where(c => c.Type == ChatRoomType.DirectMessage && c.Members.Count == 2)
-            .Where(c => c.Members.Any(m => m.AccountId == Guid.Parse(currentUser.Id)))
+            .Where(c => c.Members.Any(m => m.AccountId == currentId))
             .Where(c => c.Members.Any(m => m.AccountId == accountId))
             .FirstOrDefaultAsync();
         if (room is null) return NotFound();
@@ -198,7 +198,6 @@ public class ChatRoomController(
             {
                 new()
                 {
-                    Role = ChatMemberRole.Owner,
                     AccountId = accountId,
                     JoinedAt = SystemClock.Instance.GetCurrentInstant()
                 }
@@ -297,6 +296,7 @@ public class ChatRoomController(
     public async Task<ActionResult<SnChatRoom>> UpdateChatRoom(Guid id, [FromBody] ChatRoomRequest request)
     {
         if (HttpContext.Items["CurrentUser"] is not Account currentUser) return Unauthorized();
+        var accountId = Guid.Parse(currentUser.Id);
 
         var chatRoom = await db.ChatRooms
             .Where(e => e.Id == id)
@@ -305,16 +305,18 @@ public class ChatRoomController(
 
         if (chatRoom.RealmId is not null)
         {
-            if (!await rs.IsMemberWithRole(chatRoom.RealmId.Value, Guid.Parse(currentUser.Id),
+            if (!await rs.IsMemberWithRole(chatRoom.RealmId.Value, accountId, [RealmMemberRole.Moderator]))
-                    [RealmMemberRole.Moderator]))
                 return StatusCode(403, "You need at least be a realm moderator to update the chat.");
         }
-        else if (!await crs.IsMemberWithRole(chatRoom.Id, Guid.Parse(currentUser.Id), ChatMemberRole.Moderator))
+        else if (chatRoom.Type == ChatRoomType.DirectMessage && await crs.IsChatMember(chatRoom.Id, accountId))
-            return StatusCode(403, "You need at least be a moderator to update the chat.");
+            return StatusCode(403, "You need be part of the DM to update the chat.");
+        else if (chatRoom.AccountId != accountId)
+            return StatusCode(403, "You need be the owner to update the chat.");
 
         if (request.RealmId is not null)
         {
-            if (!await rs.IsMemberWithRole(request.RealmId.Value, Guid.Parse(currentUser.Id), [RealmMemberRole.Moderator]))
+            if (!await rs.IsMemberWithRole(request.RealmId.Value, Guid.Parse(currentUser.Id),
+                    [RealmMemberRole.Moderator]))
                 return StatusCode(403, "You need at least be a moderator to transfer the chat linked to the realm.");
             chatRoom.RealmId = request.RealmId;
         }
@@ -406,7 +408,8 @@ public class ChatRoomController(
     [HttpDelete("{id:guid}")]
     public async Task<ActionResult> DeleteChatRoom(Guid id)
     {
-        if (HttpContext.Items["CurrentUser"] is not Shared.Proto.Account currentUser) return Unauthorized();
+        if (HttpContext.Items["CurrentUser"] is not Account currentUser) return Unauthorized();
+        var accountId = Guid.Parse(currentUser.Id);
 
         var chatRoom = await db.ChatRooms
             .Where(e => e.Id == id)
@@ -415,12 +418,13 @@ public class ChatRoomController(
 
         if (chatRoom.RealmId is not null)
         {
-            if (!await rs.IsMemberWithRole(chatRoom.RealmId.Value, Guid.Parse(currentUser.Id),
+            if (!await rs.IsMemberWithRole(chatRoom.RealmId.Value, accountId, [RealmMemberRole.Moderator]))
-                    [RealmMemberRole.Moderator]))
                 return StatusCode(403, "You need at least be a realm moderator to delete the chat.");
         }
-        else if (!await crs.IsMemberWithRole(chatRoom.Id, Guid.Parse(currentUser.Id), ChatMemberRole.Owner))
+        else if (chatRoom.Type == ChatRoomType.DirectMessage && await crs.IsChatMember(chatRoom.Id, accountId))
-            return StatusCode(403, "You need at least be the owner to delete the chat.");
+            return StatusCode(403, "You need be part of the DM to update the chat.");
+        else if (chatRoom.AccountId != accountId)
+            return StatusCode(403, "You need be the owner to update the chat.");
 
         var chatRoomResourceId = $"chatroom:{chatRoom.Id}";
 
@@ -497,9 +501,11 @@ public class ChatRoomController(
         {
             if (currentUser is null) return Unauthorized();
             var member = await db.ChatMembers
-                .Where(m => m.ChatRoomId == roomId && m.AccountId == Guid.Parse(currentUser.Id) && m.JoinedAt != null && m.LeaveAt == null)
+                .Where(m => m.ChatRoomId == roomId && m.AccountId == Guid.Parse(currentUser.Id) && m.JoinedAt != null &&
+                            m.LeaveAt == null)
                 .FirstOrDefaultAsync();
-            if (member is null) return StatusCode(403, "You need to be a member to see online count of private chat room.");
+            if (member is null)
+                return StatusCode(403, "You need to be a member to see online count of private chat room.");
         }
 
         var members = await db.ChatMembers
@@ -532,7 +538,8 @@ public class ChatRoomController(
         {
             if (currentUser is null) return Unauthorized();
             var member = await db.ChatMembers
-                .Where(m => m.ChatRoomId == roomId && m.AccountId == Guid.Parse(currentUser.Id) && m.JoinedAt != null && m.LeaveAt == null)
+                .Where(m => m.ChatRoomId == roomId && m.AccountId == Guid.Parse(currentUser.Id) && m.JoinedAt != null &&
+                            m.LeaveAt == null)
                 .FirstOrDefaultAsync();
             if (member is null) return StatusCode(403, "You need to be a member to see members of private chat room.");
         }
@@ -594,8 +601,7 @@ public class ChatRoomController(
 
     [HttpPost("invites/{roomId:guid}")]
     [Authorize]
-    public async Task<ActionResult<SnChatMember>> InviteMember(Guid roomId,
+    public async Task<ActionResult<SnChatMember>> InviteMember(Guid roomId, [FromBody] ChatMemberRequest request)
-        [FromBody] ChatMemberRequest request)
     {
         if (HttpContext.Items["CurrentUser"] is not Account currentUser) return Unauthorized();
         var accountId = Guid.Parse(currentUser.Id);
@@ -613,7 +619,7 @@ public class ChatRoomController(
             Status = -100
         });
 
-        if (relationship?.Relationship != null && relationship.Relationship.Status == -100)
+        if (relationship?.Relationship is { Status: -100 })
             return StatusCode(403, "You cannot invite a user that blocked you.");
 
         var chatRoom = await db.ChatRooms
@@ -621,26 +627,21 @@ public class ChatRoomController(
             .FirstOrDefaultAsync();
         if (chatRoom is null) return NotFound();
 
+        var operatorMember = await db.ChatMembers
+            .Where(p => p.AccountId == accountId && p.ChatRoomId == chatRoom.Id)
+            .FirstOrDefaultAsync();
+        if (operatorMember is null) return StatusCode(403, "You need to be a part of chat to invite member to the chat.");
+
         // Handle realm-owned chat rooms
         if (chatRoom.RealmId is not null)
         {
             if (!await rs.IsMemberWithRole(chatRoom.RealmId.Value, accountId, [RealmMemberRole.Moderator]))
                 return StatusCode(403, "You need at least be a realm moderator to invite members to this chat.");
         }
-        else
+        else if (chatRoom.Type == ChatRoomType.DirectMessage && await crs.IsChatMember(chatRoom.Id, accountId))
-        {
+            return StatusCode(403, "You need be part of the DM to invite member to the chat.");
-            var chatMember = await db.ChatMembers
+        else if (chatRoom.AccountId != accountId)
-                .Where(m => m.AccountId == accountId)
+            return StatusCode(403, "You need be the owner to invite member to this chat.");
-                .Where(m => m.ChatRoomId == roomId)
-                .Where(m => m.JoinedAt != null && m.LeaveAt == null)
-                .FirstOrDefaultAsync();
-            if (chatMember is null) return StatusCode(403, "You are not even a member of the targeted chat room.");
-            if (chatMember.Role < ChatMemberRole.Moderator)
-                return StatusCode(403,
-                    "You need at least be a moderator to invite other members to this chat room.");
-            if (chatMember.Role < request.Role)
-                return StatusCode(403, "You cannot invite member with higher permission than yours.");
-        }
 
         var existingMember = await db.ChatMembers
             .Where(m => m.AccountId == request.RelatedUserId)
@@ -648,9 +649,7 @@ public class ChatRoomController(
             .FirstOrDefaultAsync();
         if (existingMember != null)
         {
-            if (existingMember.LeaveAt == null)
+            existingMember.InvitedById = operatorMember.Id;
-                return BadRequest("This user has been joined the chat cannot be invited again.");
-
             existingMember.LeaveAt = null;
             existingMember.JoinedAt = null;
             db.ChatMembers.Update(existingMember);
@@ -675,9 +674,9 @@ public class ChatRoomController(
 
         var newMember = new SnChatMember
         {
+            InvitedById = operatorMember.Id,
             AccountId = Guid.Parse(relatedUser.Id),
             ChatRoomId = roomId,
-            Role = request.Role,
         };
 
         db.ChatMembers.Add(newMember);
@@ -770,7 +769,7 @@ public class ChatRoomController(
             .FirstOrDefaultAsync();
         if (member is null) return NotFound();
 
-        member.LeaveAt = SystemClock.Instance.GetCurrentInstant();
+        db.ChatMembers.Remove(member);
         await db.SaveChangesAsync();
 
         return NoContent();
@@ -814,74 +813,12 @@ public class ChatRoomController(
         return Ok(targetMember);
     }
 
-    [HttpPatch("{roomId:guid}/members/{memberId:guid}/role")]
-    [Authorize]
-    public async Task<ActionResult<SnChatMember>> UpdateChatMemberRole(Guid roomId, Guid memberId, [FromBody] int newRole)
-    {
-        if (newRole >= ChatMemberRole.Owner) return BadRequest("Unable to set chat member to owner or greater role.");
-        if (HttpContext.Items["CurrentUser"] is not Account currentUser) return Unauthorized();
-
-        var chatRoom = await db.ChatRooms
-            .Where(r => r.Id == roomId)
-            .FirstOrDefaultAsync();
-        if (chatRoom is null) return NotFound();
-
-        // Check if the chat room is owned by a realm
-        if (chatRoom.RealmId is not null)
-        {
-            if (!await rs.IsMemberWithRole(chatRoom.RealmId.Value, Guid.Parse(currentUser.Id), [RealmMemberRole.Moderator]))
-                return StatusCode(403, "You need at least be a realm moderator to change member roles.");
-        }
-        else
-        {
-            var targetMember = await db.ChatMembers
-                .Where(m => m.AccountId == memberId && m.ChatRoomId == roomId && m.JoinedAt != null && m.LeaveAt == null)
-                .FirstOrDefaultAsync();
-            if (targetMember is null) return NotFound();
-
-            // Check if the current user has permission to change roles
-            if (
-                !await crs.IsMemberWithRole(
-                    chatRoom.Id,
-                    Guid.Parse(currentUser.Id),
-                    ChatMemberRole.Moderator,
-                    targetMember.Role,
-                    newRole
-                )
-            )
-                return StatusCode(403, "You don't have enough permission to edit the roles of members.");
-
-            targetMember.Role = newRole;
-            db.ChatMembers.Update(targetMember);
-            await db.SaveChangesAsync();
-
-            await crs.PurgeRoomMembersCache(roomId);
-
-            _ = als.CreateActionLogAsync(new CreateActionLogRequest
-            {
-                Action = "chatrooms.role.edit",
-                Meta =
-                {
-                    { "chatroom_id", Google.Protobuf.WellKnownTypes.Value.ForString(roomId.ToString()) },
-                    { "account_id", Google.Protobuf.WellKnownTypes.Value.ForString(memberId.ToString()) },
-                    { "new_role", Google.Protobuf.WellKnownTypes.Value.ForNumber(newRole) }
-                },
-                AccountId = currentUser.Id,
-                UserAgent = Request.Headers.UserAgent,
-                IpAddress = Request.HttpContext.Connection.RemoteIpAddress?.ToString()
-            });
-
-            return Ok(targetMember);
-        }
-
-        return BadRequest();
-    }
-
     [HttpDelete("{roomId:guid}/members/{memberId:guid}")]
     [Authorize]
     public async Task<ActionResult> RemoveChatMember(Guid roomId, Guid memberId)
     {
         if (HttpContext.Items["CurrentUser"] is not Account currentUser) return Unauthorized();
+        var accountId = Guid.Parse(currentUser.Id);
 
         var chatRoom = await db.ChatRooms
             .Where(r => r.Id == roomId)
@@ -891,15 +828,13 @@ public class ChatRoomController(
         // Check if the chat room is owned by a realm
         if (chatRoom.RealmId is not null)
         {
-        if (!await rs.IsMemberWithRole(chatRoom.RealmId.Value, Guid.Parse(currentUser.Id),
+            if (!await rs.IsMemberWithRole(chatRoom.RealmId.Value, accountId, [RealmMemberRole.Moderator]))
-                [RealmMemberRole.Moderator]))
                 return StatusCode(403, "You need at least be a realm moderator to remove members.");
         }
-        else
+        else if (chatRoom.Type == ChatRoomType.DirectMessage && await crs.IsChatMember(chatRoom.Id, accountId))
-        {
+            return StatusCode(403, "You need be part of the DM to update the chat.");
-            if (!await crs.IsMemberWithRole(chatRoom.Id, Guid.Parse(currentUser.Id), [ChatMemberRole.Moderator]))
+        else if (chatRoom.AccountId != accountId)
-                return StatusCode(403, "You need at least be a moderator to remove members.");
+            return StatusCode(403, "You need be the owner to update the chat.");
-        }
 
         // Find the target member
         var member = await db.ChatMembers
@@ -907,10 +842,6 @@ public class ChatRoomController(
             .FirstOrDefaultAsync();
         if (member is null) return NotFound();
 
-        // Check if the current user has sufficient permissions
-        if (!await crs.IsMemberWithRole(chatRoom.Id, memberId, member.Role))
-            return StatusCode(403, "You cannot remove members with equal or higher roles.");
-
         member.LeaveAt = SystemClock.Instance.GetCurrentInstant();
         await db.SaveChangesAsync();
         _ = crs.PurgeRoomMembersCache(roomId);
@@ -964,8 +895,7 @@ public class ChatRoomController(
         {
             AccountId = Guid.Parse(currentUser.Id),
             ChatRoomId = roomId,
-            Role = ChatMemberRole.Member,
+            JoinedAt = SystemClock.Instance.GetCurrentInstant()
-            JoinedAt = NodaTime.Instant.FromDateTimeUtc(DateTime.UtcNow)
         };
 
         db.ChatMembers.Add(newMember);
@@ -989,6 +919,12 @@ public class ChatRoomController(
     public async Task<ActionResult> LeaveChat(Guid roomId)
     {
         if (HttpContext.Items["CurrentUser"] is not Account currentUser) return Unauthorized();
+        var accountId = Guid.Parse(currentUser.Id);
+
+        var chat = await db.ChatRooms.FirstOrDefaultAsync(c => c.Id == roomId);
+        if (chat is null) return NotFound();
+        if (chat.AccountId == accountId)
+            return BadRequest("You cannot leave you own chat room");
 
         var member = await db.ChatMembers
             .Where(m => m.JoinedAt != null && m.LeaveAt == null)
@@ -997,20 +933,7 @@ public class ChatRoomController(
             .FirstOrDefaultAsync();
         if (member is null) return NotFound();
 
-        if (member.Role == ChatMemberRole.Owner)
+        member.LeaveAt = SystemClock.Instance.GetCurrentInstant();
-        {
-            // Check if this is the only owner
-            var otherOwners = await db.ChatMembers
-                .Where(m => m.ChatRoomId == roomId)
-                .Where(m => m.Role == ChatMemberRole.Owner)
-                .Where(m => m.AccountId != Guid.Parse(currentUser.Id))
-                .AnyAsync();
-
-            if (!otherOwners)
-                return BadRequest("The last owner cannot leave the chat. Transfer ownership first or delete the chat.");
-        }
-
-        member.LeaveAt = Instant.FromDateTimeUtc(DateTime.UtcNow);
         db.Update(member);
         await db.SaveChangesAsync();
         await crs.PurgeRoomMembersCache(roomId);

DysonNetwork.Sphere/Chat/ChatRoomService.cs

@@ -133,16 +133,11 @@ public class ChatRoomService(
         return room;
     }
 
-    public async Task<bool> IsMemberWithRole(Guid roomId, Guid accountId, params int[] requiredRoles)
+    public async Task<bool> IsChatMember(Guid roomId, Guid accountId)
     {
-        if (requiredRoles.Length == 0)
+        return await db.ChatMembers
-            return false;
-
-        var maxRequiredRole = requiredRoles.Max();
-        var member = await db.ChatMembers
             .Where(m => m.ChatRoomId == roomId && m.AccountId == accountId && m.JoinedAt != null && m.LeaveAt == null)
-            .FirstOrDefaultAsync();
+            .AnyAsync();
-        return member?.Role >= maxRequiredRole;
     }
 
     public async Task<SnChatMember> LoadMemberAccount(SnChatMember member)

DysonNetwork.Sphere/Chat/ChatService.cs

@@ -580,7 +580,7 @@ public partial class ChatService(
     {
         var call = await GetCallOngoingAsync(roomId);
         if (call is null) throw new InvalidOperationException("No ongoing call was not found.");
-        if (sender.Role < ChatMemberRole.Moderator && call.SenderId != sender.Id)
+        if (sender.AccountId != call.Room.AccountId && call.SenderId != sender.Id)
             throw new InvalidOperationException("You are not the call initiator either the chat room moderator.");
 
         // End the realtime session if it exists

DysonNetwork.Sphere/Chat/RealtimeCallController.cs

@@ -55,7 +55,7 @@ public class RealtimeCallController(
             .Where(m => m.AccountId == accountId && m.ChatRoomId == roomId && m.JoinedAt != null && m.LeaveAt == null)
             .FirstOrDefaultAsync();
 
-        if (member == null || member.Role < ChatMemberRole.Member)
+        if (member == null)
             return StatusCode(403, "You need to be a member to view call status.");
 
         var ongoingCall = await db.ChatRealtimeCall
@@ -81,7 +81,7 @@ public class RealtimeCallController(
             .Where(m => m.AccountId == accountId && m.ChatRoomId == roomId && m.JoinedAt != null && m.LeaveAt == null)
             .FirstOrDefaultAsync();
 
-        if (member == null || member.Role < ChatMemberRole.Member)
+        if (member == null)
             return StatusCode(403, "You need to be a member to join a call.");
 
         // Get ongoing call
@@ -93,7 +93,7 @@ public class RealtimeCallController(
         if (string.IsNullOrEmpty(ongoingCall.SessionId))
             return BadRequest("Call session is not properly configured.");
 
-        var isAdmin = member.Role >= ChatMemberRole.Moderator;
+        var isAdmin = member.AccountId == ongoingCall.Room.AccountId || ongoingCall.Room.Type == ChatRoomType.DirectMessage;
         var userToken = realtime.GetUserToken(currentUser, ongoingCall.SessionId, isAdmin);
 
         // Get LiveKit endpoint from configuration
@@ -154,8 +154,8 @@ public class RealtimeCallController(
             .Where(m => m.AccountId == accountId && m.ChatRoomId == roomId && m.JoinedAt != null && m.LeaveAt == null)
             .Include(m => m.ChatRoom)
             .FirstOrDefaultAsync();
-        if (member == null || member.Role < ChatMemberRole.Member)
+        if (member == null)
-            return StatusCode(403, "You need to be a normal member to start a call.");
+            return StatusCode(403, "You need to be a member to start a call.");
 
         var ongoingCall = await cs.GetCallOngoingAsync(roomId);
         if (ongoingCall is not null) return StatusCode(423, "There is already an ongoing call inside the chatroom.");
@@ -173,8 +173,8 @@ public class RealtimeCallController(
         var member = await db.ChatMembers
             .Where(m => m.AccountId == accountId && m.ChatRoomId == roomId && m.JoinedAt != null && m.LeaveAt == null)
             .FirstOrDefaultAsync();
-        if (member == null || member.Role < ChatMemberRole.Member)
+        if (member == null)
-            return StatusCode(403, "You need to be a normal member to end a call.");
+            return StatusCode(403, "You need to be a member to end a call.");
 
         try
         {

DysonNetwork.Sphere/Migrations/20251130125717_SimplerChatRoom.cs

@@ -0,0 +1,71 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DysonNetwork.Sphere.Migrations
+{
+    /// <inheritdoc />
+    public partial class SimplerChatRoom : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "is_bot",
+                table: "chat_members");
+
+            migrationBuilder.DropColumn(
+                name: "role",
+                table: "chat_members");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "invited_by_id",
+                table: "chat_members",
+                type: "uuid",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "ix_chat_members_invited_by_id",
+                table: "chat_members",
+                column: "invited_by_id");
+
+            migrationBuilder.AddForeignKey(
+                name: "fk_chat_members_chat_members_invited_by_id",
+                table: "chat_members",
+                column: "invited_by_id",
+                principalTable: "chat_members",
+                principalColumn: "id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "fk_chat_members_chat_members_invited_by_id",
+                table: "chat_members");
+
+            migrationBuilder.DropIndex(
+                name: "ix_chat_members_invited_by_id",
+                table: "chat_members");
+
+            migrationBuilder.DropColumn(
+                name: "invited_by_id",
+                table: "chat_members");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "is_bot",
+                table: "chat_members",
+                type: "boolean",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<int>(
+                name: "role",
+                table: "chat_members",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+        }
+    }
+}

DysonNetwork.Sphere/Migrations/AppDatabaseModelSnapshot.cs

@@ -54,9 +54,9 @@ namespace DysonNetwork.Sphere.Migrations
                         .HasColumnType("timestamp with time zone")
                         .HasColumnName("deleted_at");
 
-                    b.Property<bool>("IsBot")
+                    b.Property<Guid?>("InvitedById")
-                        .HasColumnType("boolean")
+                        .HasColumnType("uuid")
-                        .HasColumnName("is_bot");
+                        .HasColumnName("invited_by_id");
 
                     b.Property<Instant?>("JoinedAt")
                         .HasColumnType("timestamp with time zone")
@@ -79,10 +79,6 @@ namespace DysonNetwork.Sphere.Migrations
                         .HasColumnType("integer")
                         .HasColumnName("notify");
 
-                    b.Property<int>("Role")
-                        .HasColumnType("integer")
-                        .HasColumnName("role");
-
                     b.Property<ChatTimeoutCause>("TimeoutCause")
                         .HasColumnType("jsonb")
                         .HasColumnName("timeout_cause");
@@ -101,6 +97,9 @@ namespace DysonNetwork.Sphere.Migrations
                     b.HasAlternateKey("ChatRoomId", "AccountId")
                         .HasName("ak_chat_members_chat_room_id_account_id");
 
+                    b.HasIndex("InvitedById")
+                        .HasDatabaseName("ix_chat_members_invited_by_id");
+
                     b.ToTable("chat_members", (string)null);
                 });
 
@@ -1505,7 +1504,14 @@ namespace DysonNetwork.Sphere.Migrations
                         .IsRequired()
                         .HasConstraintName("fk_chat_members_chat_rooms_chat_room_id");
 
+                    b.HasOne("DysonNetwork.Shared.Models.SnChatMember", "InvitedBy")
+                        .WithMany()
+                        .HasForeignKey("InvitedById")
+                        .HasConstraintName("fk_chat_members_chat_members_invited_by_id");
+
                     b.Navigation("ChatRoom");
+
+                    b.Navigation("InvitedBy");
                 });
 
             modelBuilder.Entity("DysonNetwork.Shared.Models.SnChatMessage", b =>