1
0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-06 10:52:31 +01:00

Forgot to send roles in guild_member

This commit is contained in:
Madeline 2022-07-16 22:27:03 +10:00
parent ac0e03024b
commit 2e45d6aa10
No known key found for this signature in database
GPG Key ID: 1958E017C36F2E47

View File

@ -47,36 +47,44 @@ router.get("/", route({ test: { response: { body: "UserProfileResponse" } } }),
? await Member.findOneOrFail({ id: req.params.id, guild_id: guild_id }, { relations: ["roles"] }) ? await Member.findOneOrFail({ id: req.params.id, guild_id: guild_id }, { relations: ["roles"] })
: undefined; : 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({ res.json({
connected_accounts: user.connected_accounts, connected_accounts: user.connected_accounts,
premium_guild_since: premium_guild_since, // TODO premium_guild_since: premium_guild_since, // TODO
premium_since: user.premium_since, // TODO premium_since: user.premium_since, // TODO
mutual_guilds: mutual_guilds, // TODO {id: "", nick: null} when ?with_mutual_guilds=true mutual_guilds: mutual_guilds, // TODO {id: "", nick: null} when ?with_mutual_guilds=true
user: { user: userDto,
username: user.username, guild_member: guildMemberDto,
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,
}); });
}); });