From 5c11bf1b87fdd150ba4caf3f6276c01014558b71 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Tue, 23 Feb 2021 22:02:50 +0100
Subject: :bug: [Member] list fix to also return user

---
 src/routes/api/v8/guilds/#id/members/index.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/routes/api/v8')

diff --git a/src/routes/api/v8/guilds/#id/members/index.ts b/src/routes/api/v8/guilds/#id/members/index.ts
index 2f0a6850..9446e2da 100644
--- a/src/routes/api/v8/guilds/#id/members/index.ts
+++ b/src/routes/api/v8/guilds/#id/members/index.ts
@@ -3,6 +3,7 @@ import { GuildModel, MemberModel } from "fosscord-server-util";
 import { HTTPError } from "lambert-server";
 import { instanceOf, Length } from "../../../../../../util/instanceOf";
 import { PublicMemberProjection } from "../../../../../../util/Member";
+import { PublicUserProjection } from "../../../../../../util/User";
 
 const router = Router();
 
@@ -30,7 +31,7 @@ router.get("/", async (req: Request, res: Response) => {
 
 	var members = await MemberModel.find({ guild_id, ...query }, PublicMemberProjection)
 		.limit(limit)
-		.populate("user")
+		.populate({ path: "user", select: PublicUserProjection })
 		.exec();
 
 	return res.json(members);
@@ -40,9 +41,10 @@ router.get("/:member", async (req: Request, res: Response) => {
 	const guild_id = BigInt(req.params.id);
 	const user_id = BigInt(req.params.member);
 
-	const member = await MemberModel.findOne({ id: user_id, guild_id }).populate("user").exec();
+	const member = await MemberModel.findOne({ id: user_id, guild_id })
+		.populate({ path: "user", select: PublicUserProjection })
+		.exec();
 	if (!member) throw new HTTPError("Member not found", 404);
-	console.log(member.user);
 
 	return res.json(member);
 });
-- 
cgit 1.5.1