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

🐛 Fix list members of chat and realm didn't show invite

Browse Source
This commit is contained in:
LittleSheep
2025-12-24 21:38:55 +08:00
parent 885b895a3a
commit bca6a2ffde
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DysonNetwork.Pass/Realm/RealmController.cs
View File

@@ -242,9 +242,10 @@ public class RealmController(
return StatusCode(403, "You must be a member to view this realm's members.");
}
// The query should include the unjoined ones, to show the invites.
var query = db.RealmMembers
.Where(m => m.RealmId == realm.Id)
.Where(m => m.JoinedAt != null && m.LeaveAt == null);
.Where(m => m.LeaveAt == null);
if (withStatus)
{

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

@@ -525,13 +525,15 @@ public class ChatRoomController(
}
[HttpGet("{roomId:guid}/members")]
public async Task<ActionResult<List<SnChatMember>>> ListMembers(Guid roomId,
public async Task<ActionResult<List<SnChatMember>>> ListMembers(
Guid roomId,
[FromQuery] int take = 20,
[FromQuery] int offset = 0,
[FromQuery] bool withStatus = false
)
{
var currentUser = HttpContext.Items["CurrentUser"] as Account;
Guid? accountId = currentUser is not null ? Guid.Parse(currentUser.Id) : null;
var room = await db.ChatRooms
.FirstOrDefaultAsync(r => r.Id == roomId);
@@ -539,16 +541,17 @@ public class ChatRoomController(
if (!room.IsPublic)
{
if (currentUser is null) return Unauthorized();
if (accountId is null) return Unauthorized();
var member = await db.ChatMembers
.Where(m => m.ChatRoomId == roomId && m.AccountId == Guid.Parse(currentUser.Id) && m.LeaveAt == null)
.Where(m => m.ChatRoomId == roomId && m.AccountId == accountId && m.LeaveAt == null)
.FirstOrDefaultAsync();
if (member is null) return StatusCode(403, "You need to be a member to see members of private chat room.");
}
// The query should include the unjoined ones, to show the invites.
var query = db.ChatMembers
.Where(m => m.ChatRoomId == roomId)
.Where(m => m.JoinedAt != null && m.LeaveAt == null);
.Where(m => m.LeaveAt == null);
if (withStatus)
{