diff --git a/src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts b/src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts
index 8846efe4..a85348ae 100644
--- a/src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts
+++ b/src/api/routes/users/@me/connections/#connection_name/#connection_id/access-token.ts
@@ -55,7 +55,18 @@ router.get("/", route({}), async (req: Request, res: Response) => {
external_id: connection_id,
user_id: req.user_id,
},
- select: ["external_id", "type", "name", "verified", "visibility", "show_activity", "revoked", "token_data", "friend_sync", "integrations"],
+ select: {
+ external_id: true,
+ type: true,
+ name: true,
+ verified: true,
+ visibility: true,
+ show_activity: true,
+ revoked: true,
+ token_data: true,
+ friend_sync: true,
+ integrations: true,
+ },
});
if (!connectedAccount) throw DiscordApiErrors.UNKNOWN_CONNECTION;
if (connectedAccount.revoked) throw DiscordApiErrors.CONNECTION_REVOKED;
diff --git a/src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts b/src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts
index 111312ae..718c80c0 100644
--- a/src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts
+++ b/src/api/routes/users/@me/connections/#connection_name/#connection_id/index.ts
@@ -33,7 +33,7 @@ router.patch("/", route({ requestBody: "ConnectionUpdateSchema" }), async (req:
external_id: connection_id,
type: connection_name,
},
- select: ["external_id", "type", "name", "verified", "visibility", "show_activity", "revoked", "friend_sync", "integrations"],
+ select: { external_id: true, type: true, name: true, verified: true, visibility: true, show_activity: true, revoked: true, friend_sync: true, integrations: true },
});
if (!connection) return DiscordApiErrors.UNKNOWN_CONNECTION;
diff --git a/src/api/routes/users/@me/connections/index.ts b/src/api/routes/users/@me/connections/index.ts
index a2d8b82a..fe2fbba0 100644
--- a/src/api/routes/users/@me/connections/index.ts
+++ b/src/api/routes/users/@me/connections/index.ts
@@ -27,7 +27,18 @@ router.get("/", route({}), async (req: Request, res: Response) => {
where: {
user_id: req.user_id,
},
- select: ["external_id", "type", "name", "verified", "visibility", "show_activity", "revoked", "token_data", "friend_sync", "integrations"],
+ select: {
+ external_id: true,
+ type: true,
+ name: true,
+ verified: true,
+ visibility: true,
+ show_activity: true,
+ revoked: true,
+ token_data: true,
+ friend_sync: true,
+ integrations: true,
+ },
});
res.json(connections.map((x) => new ConnectedAccountDTO(x, true)));
diff --git a/src/api/routes/users/@me/delete.ts b/src/api/routes/users/@me/delete.ts
index 668f7c19..749baf70 100644
--- a/src/api/routes/users/@me/delete.ts
+++ b/src/api/routes/users/@me/delete.ts
@@ -40,7 +40,7 @@ router.post(
async (req: Request, res: Response) => {
const user = await User.findOneOrFail({
where: { id: req.user_id },
- select: ["data"],
+ select: { data: true },
}); //User object
let correctpass = true;
diff --git a/src/api/routes/users/@me/disable.ts b/src/api/routes/users/@me/disable.ts
index 95995e4b..e95ec457 100644
--- a/src/api/routes/users/@me/disable.ts
+++ b/src/api/routes/users/@me/disable.ts
@@ -39,7 +39,7 @@ router.post(
async (req: Request, res: Response) => {
const user = await User.findOneOrFail({
where: { id: req.user_id },
- select: ["data"],
+ select: { data: true },
}); //User object
let correctpass = true;
diff --git a/src/api/routes/users/@me/guilds.ts b/src/api/routes/users/@me/guilds.ts
index c06c39c4..89086562 100644
--- a/src/api/routes/users/@me/guilds.ts
+++ b/src/api/routes/users/@me/guilds.ts
@@ -67,7 +67,7 @@ router.delete(
const { guild_id } = req.params;
const guild = await Guild.findOneOrFail({
where: { id: guild_id },
- select: ["owner_id"],
+ select: { owner_id: true },
});
if (!guild) throw new HTTPError("Guild doesn't exist", 404);
diff --git a/src/api/routes/users/@me/guilds/#guild_id/settings.ts b/src/api/routes/users/@me/guilds/#guild_id/settings.ts
index 16b64ec5..3aaf723e 100644
--- a/src/api/routes/users/@me/guilds/#guild_id/settings.ts
+++ b/src/api/routes/users/@me/guilds/#guild_id/settings.ts
@@ -35,7 +35,7 @@ router.get(
async (req: Request, res: Response) => {
const user = await Member.findOneOrFail({
where: { id: req.user_id, guild_id: req.params.guild_id },
- select: ["settings"],
+ select: { settings: true },
});
return res.json(user.settings);
},
@@ -66,7 +66,7 @@ router.patch(
const user = await Member.findOneOrFail({
where: { id: req.user_id, guild_id: req.params.guild_id },
- select: ["settings"],
+ select: { settings: true },
});
OrmUtils.mergeDeep(user.settings || {}, body);
Member.update({ id: req.user_id, guild_id: req.params.guild_id }, user);
diff --git a/src/api/routes/users/@me/mfa/codes.ts b/src/api/routes/users/@me/mfa/codes.ts
index 2eb1a3e3..0b1b94da 100644
--- a/src/api/routes/users/@me/mfa/codes.ts
+++ b/src/api/routes/users/@me/mfa/codes.ts
@@ -49,7 +49,7 @@ router.post(
const user = await User.findOneOrFail({
where: { id: req.user_id },
- select: ["data"],
+ select: { data: true },
});
if (!(await bcrypt.compare(password, user.data.hash || ""))) {
diff --git a/src/api/routes/users/@me/mfa/totp/disable.ts b/src/api/routes/users/@me/mfa/totp/disable.ts
index 11c927e4..0b195601 100644
--- a/src/api/routes/users/@me/mfa/totp/disable.ts
+++ b/src/api/routes/users/@me/mfa/totp/disable.ts
@@ -43,7 +43,7 @@ router.post(
const user = await User.findOneOrFail({
where: { id: req.user_id },
- select: ["totp_secret"],
+ select: { totp_secret: true },
});
const backup = await BackupCode.findOne({ where: { code: body.code } });
diff --git a/src/api/routes/users/@me/mfa/totp/enable.ts b/src/api/routes/users/@me/mfa/totp/enable.ts
index a400c628..869f1573 100644
--- a/src/api/routes/users/@me/mfa/totp/enable.ts
+++ b/src/api/routes/users/@me/mfa/totp/enable.ts
@@ -47,7 +47,7 @@ router.post(
const user = await User.findOneOrFail({
where: { id: req.user_id },
- select: ["data", "email"],
+ select: { data: true, email: true },
});
// TODO: Are guests allowed to enable 2fa?
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 7bd29a57..50bf341c 100644
--- a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts
+++ b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts
@@ -80,7 +80,7 @@ router.post(
where: {
id: req.user_id,
},
- select: ["data", "id", "disabled", "deleted", "totp_secret", "mfa_enabled", "username"],
+ select: { data: true, id: true, disabled: true, deleted: true, totp_secret: true, mfa_enabled: true, username: true },
relations: ["settings"],
});
diff --git a/src/api/routes/users/@me/relationships.ts b/src/api/routes/users/@me/relationships.ts
index 3f95daab..b796b29e 100644
--- a/src/api/routes/users/@me/relationships.ts
+++ b/src/api/routes/users/@me/relationships.ts
@@ -42,7 +42,7 @@ router.get(
const user = await User.findOneOrFail({
where: { id: req.user_id },
relations: ["relationships", "relationships.to"],
- select: ["id", "relationships"],
+ select: { id: true, relationships: true },
});
const related_users = user.relationships.map((r) => r.toPublicRelationship());
|
