diff --git a/src/api/routes/users/#id/delete.ts b/src/api/routes/users/#user_id/delete.ts
index 4c7747c9..53af01eb 100644
--- a/src/api/routes/users/#id/delete.ts
+++ b/src/api/routes/users/#user_id/delete.ts
@@ -44,19 +44,19 @@ router.post(
}),
async (req: Request, res: Response) => {
await User.findOneOrFail({
- where: { id: req.params.id },
+ where: { id: req.params.user_id },
select: [...PrivateUserProjection, "data"],
});
await Promise.all([
- Member.delete({ id: req.params.id }),
- User.delete({ id: req.params.id }),
+ Member.delete({ id: req.params.user_id }),
+ User.delete({ id: req.params.user_id }),
]);
// TODO: respect intents as USER_DELETE has potential to cause privacy issues
await emitEvent({
event: "USER_DELETE",
user_id: req.user_id,
- data: { user_id: req.params.id },
+ data: { user_id: req.params.user_id },
} as UserDeleteEvent);
res.sendStatus(204);
diff --git a/src/api/routes/users/#id/index.ts b/src/api/routes/users/#user_id/index.ts
index 882fa2b7..417f961d 100644
--- a/src/api/routes/users/#id/index.ts
+++ b/src/api/routes/users/#user_id/index.ts
@@ -32,9 +32,9 @@ router.get(
},
}),
async (req: Request, res: Response) => {
- const { id } = req.params;
+ const { user_id } = req.params;
- res.json(await User.getPublicUser(id));
+ res.json(await User.getPublicUser(user_id));
},
);
diff --git a/src/api/routes/users/#id/messages.ts b/src/api/routes/users/#user_id/messages.ts
index 4d724575..04708cfd 100644
--- a/src/api/routes/users/#id/messages.ts
+++ b/src/api/routes/users/#user_id/messages.ts
@@ -34,7 +34,7 @@ router.get(
},
}),
async (req: Request, res: Response) => {
- const user = await User.findOneOrFail({ where: { id: req.params.id } });
+ const user = await User.findOneOrFail({ where: { id: req.params.user_id } });
const channel = await user.getDmChannelWith(req.user_id);
const messages = (
diff --git a/src/api/routes/users/#id/profile.ts b/src/api/routes/users/#user_id/profile.ts
index e2eaa036..30b4fb01 100644
--- a/src/api/routes/users/#id/profile.ts
+++ b/src/api/routes/users/#user_id/profile.ts
@@ -39,11 +39,11 @@ import { In } from "typeorm";
const router: Router = Router({ mergeParams: true });
router.get("/", route({ responses: { 200: { body: "UserProfileResponse" } } }), async (req: Request, res: Response) => {
- if (req.params.id === "@me") req.params.id = req.user_id;
+ if (req.params.user_id === "@me") req.params.user_id = req.user_id;
const { guild_id, with_mutual_guilds, with_mutual_friends, with_mutual_friends_count } = req.query;
- const user = await User.getPublicUser(req.params.id, {
+ const user = await User.getPublicUser(req.params.user_id, {
relations: ["connected_accounts"],
});
@@ -52,7 +52,7 @@ router.get("/", route({ responses: { 200: { body: "UserProfileResponse" } } }),
if (with_mutual_guilds == "true") {
const requested_member = await Member.find({
- where: { id: req.params.id },
+ where: { id: req.params.user_id },
});
const self_member = await Member.find({
where: { id: req.user_id },
@@ -82,7 +82,7 @@ router.get("/", route({ responses: { 200: { body: "UserProfileResponse" } } }),
const guild_member =
guild_id && typeof guild_id == "string"
? await Member.findOneOrFail({
- where: { id: req.params.id, guild_id: guild_id },
+ where: { id: req.params.user_id, guild_id: guild_id },
relations: ["roles"],
})
: undefined;
@@ -111,7 +111,7 @@ router.get("/", route({ responses: { 200: { body: "UserProfileResponse" } } }),
if (with_mutual_friends == "true" || with_mutual_friends_count == "true") {
const relationshipsSelf = await Relationship.find({ where: { from_id: req.user_id, type: RelationshipType.friends } });
- const relationshipsUser = await Relationship.find({ where: { from_id: req.params.id, type: RelationshipType.friends } });
+ const relationshipsUser = await Relationship.find({ where: { from_id: req.params.user_id, type: RelationshipType.friends } });
const relationshipsIntersection = relationshipsSelf.filter((r1) => relationshipsUser.some((r2) => r2.to_id === r1.to_id));
if (with_mutual_friends_count) mutual_friends_count = relationshipsIntersection.length;
if (with_mutual_friends) {
diff --git a/src/api/routes/users/#id/relationships.ts b/src/api/routes/users/#user_id/relationships.ts
index 4c92c789..e4af351f 100644
--- a/src/api/routes/users/#id/relationships.ts
+++ b/src/api/routes/users/#user_id/relationships.ts
@@ -36,7 +36,7 @@ router.get(
const mutual_relations: UserRelationsResponse = [];
const requested_relations = await User.findOneOrFail({
- where: { id: req.params.id },
+ where: { id: req.params.user_id },
relations: ["relationships"],
});
const self_relations = await User.findOneOrFail({
|
