🐛 Dozens of bug fixes

This commit is contained in:
2025-07-19 16:41:04 +08:00
parent 921a10f7ab
commit da5b3ac261
6 changed files with 18 additions and 8 deletions

View File

@@ -129,11 +129,11 @@ public partial class ChatController(
var message = await db.ChatMessages
.Where(m => m.Id == messageId && m.ChatRoomId == roomId)
.Include(m => m.Sender)
.Include(m => m.Sender.Account)
.Include(m => m.Sender.Account.Profile)
.FirstOrDefaultAsync();
if (message is null) return NotFound();
message.Sender = await crs.LoadMemberAccount(message.Sender);
return Ok(message);
}

View File

@@ -634,8 +634,6 @@ public class ChatRoomController(
.Where(m => m.AccountId == accountId)
.Where(m => m.JoinedAt == null)
.Include(e => e.ChatRoom)
.Include(e => e.Account)
.Include(e => e.Account.Profile)
.ToListAsync();
var chatRooms = members.Select(m => m.ChatRoom).ToList();
@@ -644,8 +642,8 @@ public class ChatRoomController(
foreach (var member in members.Where(member => member.ChatRoom.Type == ChatRoomType.DirectMessage))
member.ChatRoom.Members = directMembers[member.ChatRoom.Id];
return members.ToList();
return Ok(await crs.LoadMemberAccounts(members));
}
[HttpPost("invites/{roomId:guid}/accept")]

View File

@@ -341,6 +341,15 @@ public partial class ChatService(
m => m!.ChatRoomId,
m => m
);
var messageSenders = messages
.Select(m => m.Value!.Sender)
.DistinctBy(x => x.Id)
.ToList();
messageSenders = await crs.LoadMemberAccounts(messageSenders);
foreach (var message in messages)
message.Value!.Sender = messageSenders.First(x => x.Id == message.Value.SenderId);
return messages;
}