From ae185c2e399e2f34f8672d26b2561c17ce4afd67 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sat, 16 Jul 2022 22:22:48 +1000 Subject: Respect with_mutual_guilds and guild_id in /users/:id/profile --- api/src/routes/users/#id/profile.ts | 53 +++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/api/src/routes/users/#id/profile.ts b/api/src/routes/users/#id/profile.ts index 4dbb84cf..eca90a83 100644 --- a/api/src/routes/users/#id/profile.ts +++ b/api/src/routes/users/#id/profile.ts @@ -1,5 +1,5 @@ import { Router, Request, Response } from "express"; -import { PublicConnectedAccount, PublicUser, User, UserPublic, Member } from "@fosscord/util"; +import { PublicConnectedAccount, PublicUser, User, UserPublic, Member, Guild } from "@fosscord/util"; import { route } from "@fosscord/api"; const router: Router = Router(); @@ -13,29 +13,40 @@ export interface UserProfileResponse { router.get("/", route({ test: { response: { body: "UserProfileResponse" } } }), async (req: Request, res: Response) => { if (req.params.id === "@me") req.params.id = req.user_id; + + const { guild_id, with_mutual_guilds } = req.query; + const user = await User.getPublicUser(req.params.id, { relations: ["connected_accounts"] }); var mutual_guilds: object[] = []; var premium_guild_since; - const requested_member = await Member.find( { id: req.params.id, }) - const self_member = await Member.find( { id: req.user_id, }) - for(const rmem of requested_member) { - if(rmem.premium_since) { - if(premium_guild_since){ - if(premium_guild_since > rmem.premium_since) { + if (with_mutual_guilds) { + const requested_member = await Member.find({ id: req.params.id, }); + const self_member = await Member.find({ id: req.user_id, }); + + for (const rmem of requested_member) { + if (rmem.premium_since) { + if (premium_guild_since) { + if (premium_guild_since > rmem.premium_since) { + premium_guild_since = rmem.premium_since; + } + } else { premium_guild_since = rmem.premium_since; } - } else { - premium_guild_since = rmem.premium_since; } - } - for(const smem of self_member) { - if (smem.guild_id === rmem.guild_id) { - mutual_guilds.push({id: rmem.guild_id, nick: rmem.nick}) + for (const smem of self_member) { + if (smem.guild_id === rmem.guild_id) { + mutual_guilds.push({ id: rmem.guild_id, nick: rmem.nick }); + } } } } + + const guild_member = guild_id && typeof guild_id == "string" + ? await Member.findOneOrFail({ id: req.params.id, guild_id: guild_id }, { relations: ["roles"] }) + : undefined; + res.json({ connected_accounts: user.connected_accounts, premium_guild_since: premium_guild_since, // TODO @@ -51,7 +62,21 @@ router.get("/", route({ test: { response: { body: "UserProfileResponse" } } }), 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, }); }); -- cgit 1.5.1 From a704c84ed81a63740e3ef3504d7e567b22be4424 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sat, 16 Jul 2022 22:27:39 +1000 Subject: 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..e0d89ef3 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: userDto + } : 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, }); }); -- cgit 1.5.1 From cd8abe68a74bcee38dc7d0e9a420c35ccd52491f Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sat, 16 Jul 2022 22:34:03 +1000 Subject: Don't send @everyone role --- api/src/routes/users/#id/profile.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/routes/users/#id/profile.ts b/api/src/routes/users/#id/profile.ts index e0d89ef3..f8eee876 100644 --- a/api/src/routes/users/#id/profile.ts +++ b/api/src/routes/users/#id/profile.ts @@ -74,7 +74,7 @@ router.get("/", route({ test: { response: { body: "UserProfileResponse" } } }), mute: guild_member.mute, nick: guild_member.nick, premium_since: guild_member.premium_since, - roles: guild_member.roles.map(x => x.id), + roles: guild_member.roles.map(x => x.id).filter(id => id != guild_id), user: userDto } : undefined; -- cgit 1.5.1 From 7f3b1572d7171d9e3d15c2cffaaebd8830a02500 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sat, 16 Jul 2022 22:36:05 +1000 Subject: Actually respect with_mutual_guilds --- api/src/routes/users/#id/profile.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/routes/users/#id/profile.ts b/api/src/routes/users/#id/profile.ts index f8eee876..a77fbdb5 100644 --- a/api/src/routes/users/#id/profile.ts +++ b/api/src/routes/users/#id/profile.ts @@ -21,7 +21,7 @@ router.get("/", route({ test: { response: { body: "UserProfileResponse" } } }), var mutual_guilds: object[] = []; var premium_guild_since; - if (with_mutual_guilds) { + if (with_mutual_guilds == "true") { const requested_member = await Member.find({ id: req.params.id, }); const self_member = await Member.find({ id: req.user_id, }); -- cgit 1.5.1