diff --git a/src/api/routes/users/#user_id/delete.ts b/src/api/routes/users/#user_id/delete.ts
index c2286cea..598be974 100644
--- a/src/api/routes/users/#user_id/delete.ts
+++ b/src/api/routes/users/#user_id/delete.ts
@@ -81,7 +81,7 @@ router.post(
//leave all group channels
const groupChannels = await Channel.find({
where: { type: ChannelType.GROUP_DM },
- relations: ["recipients"],
+ relations: { recipients: true },
select: {
id: true,
owner_id: true,
diff --git a/src/api/routes/users/#user_id/profile.ts b/src/api/routes/users/#user_id/profile.ts
index b100ac35..e4d4d749 100644
--- a/src/api/routes/users/#user_id/profile.ts
+++ b/src/api/routes/users/#user_id/profile.ts
@@ -33,7 +33,7 @@ router.get("/", route({ responses: { 200: { body: "UserProfileResponse" } } }),
where: {
id: req.params.id,
},
- relations: ["connected_accounts"],
+ relations: { connected_accounts: true },
});
const mutual_guilds: object[] = [];
@@ -72,7 +72,7 @@ router.get("/", route({ responses: { 200: { body: "UserProfileResponse" } } }),
guild_id && typeof guild_id == "string"
? await Member.findOneOrFail({
where: { id: req.params.user_id, guild_id: guild_id },
- relations: ["roles"],
+ relations: { roles: true },
})
: undefined;
diff --git a/src/api/routes/users/#user_id/relationships.ts b/src/api/routes/users/#user_id/relationships.ts
index 3272ef7b..93f11296 100644
--- a/src/api/routes/users/#user_id/relationships.ts
+++ b/src/api/routes/users/#user_id/relationships.ts
@@ -38,11 +38,11 @@ router.get(
const requested_relations = await User.findOneOrFail({
where: { id: req.params.user_id },
- relations: ["relationships"],
+ relations: { relationships: true },
});
const self_relations = await User.findOneOrFail({
where: { id: req.user_id },
- relations: ["relationships"],
+ relations: { relationships: true },
});
for (const rmem of requested_relations.relationships) {
diff --git a/src/api/routes/users/@me/channels.ts b/src/api/routes/users/@me/channels.ts
index e13b874a..897630ce 100644
--- a/src/api/routes/users/@me/channels.ts
+++ b/src/api/routes/users/@me/channels.ts
@@ -35,7 +35,7 @@ router.get(
async (req: Request, res: Response) => {
const recipients = await Recipient.find({
where: { user_id: req.user_id, closed: false },
- relations: ["channel", "channel.recipients"],
+ relations: { channel: { recipients: true } },
});
res.json(await Promise.all(recipients.map((r) => DmChannelDTO.from(r.channel, [req.user_id]))));
},
diff --git a/src/api/routes/users/@me/guilds.ts b/src/api/routes/users/@me/guilds.ts
index 89086562..8fcec95a 100644
--- a/src/api/routes/users/@me/guilds.ts
+++ b/src/api/routes/users/@me/guilds.ts
@@ -34,7 +34,7 @@ router.get(
}),
async (req: Request, res: Response) => {
const members = await Member.find({
- relations: ["guild"],
+ relations: { guild: true },
where: { id: req.user_id },
});
diff --git a/src/api/routes/users/@me/mentions.ts b/src/api/routes/users/@me/mentions.ts
index c2985ca4..b63078f0 100644
--- a/src/api/routes/users/@me/mentions.ts
+++ b/src/api/routes/users/@me/mentions.ts
@@ -63,7 +63,7 @@ router.get(
owner_id: true,
},
},
- relations: ["guild", "roles"],
+ relations: { guild: true, roles: true },
});
const channels = await Channel.find({
@@ -115,25 +115,26 @@ router.get(
await Message.find({
where: whereQuery,
order: { timestamp: "DESC" },
- relations: [
- "author",
- "webhook",
- "application",
- "mentions",
- "mention_roles",
- "mention_channels",
- "sticker_items",
- "attachments",
- "referenced_message",
- "referenced_message.author",
- "referenced_message.webhook",
- "referenced_message.application",
- "referenced_message.mentions",
- "referenced_message.mention_roles",
- "referenced_message.mention_channels",
- "referenced_message.sticker_items",
- "referenced_message.attachments",
- ],
+ relations: {
+ author: true,
+ webhook: true,
+ application: true,
+ mentions: true,
+ mention_roles: true,
+ mention_channels: true,
+ sticker_items: true,
+ attachments: true,
+ referenced_message: {
+ author: true,
+ webhook: true,
+ application: true,
+ mentions: true,
+ mention_roles: true,
+ mention_channels: true,
+ sticker_items: true,
+ attachments: true,
+ },
+ },
take: limit,
})
).map((m) => {
diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts
index 50bf341c..f99f7b3d 100644
--- a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts
+++ b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts
@@ -81,7 +81,7 @@ router.post(
id: req.user_id,
},
select: { data: true, id: true, disabled: true, deleted: true, totp_secret: true, mfa_enabled: true, username: true },
- relations: ["settings"],
+ relations: { settings: true },
});
if (isGenerateSchema(req.body)) {
diff --git a/src/api/routes/users/@me/relationships.ts b/src/api/routes/users/@me/relationships.ts
index b796b29e..37d5e222 100644
--- a/src/api/routes/users/@me/relationships.ts
+++ b/src/api/routes/users/@me/relationships.ts
@@ -41,7 +41,7 @@ router.get(
async (req: Request, res: Response) => {
const user = await User.findOneOrFail({
where: { id: req.user_id },
- relations: ["relationships", "relationships.to"],
+ relations: { relationships: { to: true } },
select: { id: true, relationships: true },
});
@@ -70,7 +70,7 @@ router.put(
res,
await User.findOneOrFail({
where: { id: req.params.user_id },
- relations: ["relationships", "relationships.to"],
+ relations: { relationships: { to: true } },
select: userProjection,
}),
req.body.type ?? RelationshipType.friends,
@@ -135,7 +135,7 @@ router.post(
req,
res,
await User.findOneOrFail({
- relations: ["relationships", "relationships.to"],
+ relations: { relationships: { to: true } },
select: userProjection,
where: {
discriminator: String(req.body.discriminator).padStart(4, "0"), //Discord send the discriminator as integer, we need to add leading zeroes
@@ -167,12 +167,12 @@ router.delete(
const user = await User.findOneOrFail({
where: { id: req.user_id },
select: userProjection,
- relations: ["relationships"],
+ relations: { relationships: true },
});
const friend = await User.findOneOrFail({
where: { id: user_id },
select: userProjection,
- relations: ["relationships"],
+ relations: { relationships: true },
});
const relationship = user.relationships.find((x) => x.to_id === user_id);
@@ -224,7 +224,7 @@ async function updateRelationship(req: Request, res: Response, friend: User, typ
const user = await User.findOneOrFail({
where: { id: req.user_id },
- relations: ["relationships", "relationships.to"],
+ relations: { relationships: { to: true } },
select: userProjection,
});
diff --git a/src/api/routes/users/@me/settings.ts b/src/api/routes/users/@me/settings.ts
index 57ffba14..47c206c9 100644
--- a/src/api/routes/users/@me/settings.ts
+++ b/src/api/routes/users/@me/settings.ts
@@ -64,7 +64,7 @@ router.patch(
const user = await User.findOneOrFail({
where: { id: req.user_id, bot: false },
- relations: ["settings"],
+ relations: { settings: true },
});
if (!user.settings) user.settings = UserSettings.create<UserSettings>(body);
|
