Respect with_mutual_guilds and guild_id in /users/:id/profile
This commit is contained in:
parent
6699afde77
commit
53aeaab6b7
@ -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,12 +13,17 @@ 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, })
|
||||
|
||||
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) {
|
||||
@ -32,10 +37,16 @@ router.get("/", route({ test: { response: { body: "UserProfileResponse" } } }),
|
||||
}
|
||||
for (const smem of self_member) {
|
||||
if (smem.guild_id === rmem.guild_id) {
|
||||
mutual_guilds.push({id: rmem.guild_id, nick: rmem.nick})
|
||||
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,
|
||||
});
|
||||
});
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user