From 2e45d6aa1036c06298f80186c321c60ee043825a Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Sat, 16 Jul 2022 22:27:03 +1000
Subject: [PATCH] Forgot to send roles in guild_member

---
 api/src/routes/users/#id/profile.ts | 58 ++++++++++++++++-------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/api/src/routes/users/#id/profile.ts b/api/src/routes/users/#id/profile.ts
index eca90a83..4480d8ed 100644
--- a/api/src/routes/users/#id/profile.ts
+++ b/api/src/routes/users/#id/profile.ts
@@ -47,36 +47,44 @@ router.get("/", route({ test: { response: { body: "UserProfileResponse" } } }),
 		? await Member.findOneOrFail({ id: req.params.id, guild_id: guild_id }, { relations: ["roles"] })
 		: undefined;
 
+	// TODO: make proper DTO's in util?
+
+	const userDto = {
+		username: user.username,
+		discriminator: user.discriminator,
+		id: user.id,
+		public_flags: user.public_flags,
+		avatar: user.avatar,
+		accent_color: user.accent_color,
+		banner: user.banner,
+		bio: req.user_bot ? null : user.bio,
+		bot: user.bot
+	};
+
+	const guildMemberDto = guild_member ? {
+		avatar: user.avatar,	// TODO
+		banner: user.banner,	// TODO
+		bio: req.user_bot ? null : user.bio, // TODO
+		communication_disabled_until: null,	// TODO
+		deaf: guild_member.deaf,
+		flags: user.flags,
+		is_pending: guild_member.pending,
+		pending: guild_member.pending,	// why is this here twice, discord?
+		joined_at: guild_member.joined_at,
+		mute: guild_member.mute,
+		nick: guild_member.nick,
+		premium_since: guild_member.premium_since,
+		roles: guild_member.roles.map(x => x.id),
+		user: 
+	} : undefined;
+
 	res.json({
 		connected_accounts: user.connected_accounts,
 		premium_guild_since: premium_guild_since, // TODO
 		premium_since: user.premium_since, // TODO
 		mutual_guilds: mutual_guilds, // TODO {id: "", nick: null} when ?with_mutual_guilds=true
-		user: {
-			username: user.username,
-			discriminator: user.discriminator,
-			id: user.id,
-			public_flags: user.public_flags,
-			avatar: user.avatar,
-			accent_color: user.accent_color,
-			banner: user.banner,
-			bio: req.user_bot ? null : user.bio,
-			bot: user.bot
-		},
-		guild_member: guild_member ? {
-			avatar: user.avatar,	// TODO
-			banner: user.banner,	// TODO
-			bio: req.user_bot ? null : user.bio, // TODO
-			communication_disabled_until: null,	// TODO
-			deaf: guild_member.deaf,
-			flags: user.flags,
-			is_pending: guild_member.pending,
-			pending: guild_member.pending,	// why is this here twice, discord?
-			joined_at: guild_member.joined_at,
-			mute: guild_member.mute,
-			nick: guild_member.nick,
-			premium_since: guild_member.premium_since,
-		} : undefined,
+		user: userDto,
+		guild_member: guildMemberDto,
 	});
 });