diff --git a/assets/openapi.json b/assets/openapi.json index 7407a75a..faf286c9 100644 Binary files a/assets/openapi.json and b/assets/openapi.json differ diff --git a/src/api/middlewares/RateLimit.ts b/src/api/middlewares/RateLimit.ts index f5bfbb4f..81ccbc51 100644 --- a/src/api/middlewares/RateLimit.ts +++ b/src/api/middlewares/RateLimit.ts @@ -209,9 +209,9 @@ export async function initRateLimits(app: Router) { ...error, }), ); - app.use("/guilds/:id", rateLimit(routes.guild)); - app.use("/webhooks/:id", rateLimit(routes.webhook)); - app.use("/channels/:id", rateLimit(routes.channel)); + app.use("/guilds/:guild_id", rateLimit(routes.guild)); + app.use("/webhooks/:webhook_id", rateLimit(routes.webhook)); + app.use("/channels/:channel_id", rateLimit(routes.channel)); app.use("/auth/login", rateLimit(routes.auth.login)); app.use( "/auth/register", diff --git a/src/api/routes/oauth2/applications/@me.ts b/src/api/routes/oauth2/applications/@me.ts index 254a835e..82491e33 100644 --- a/src/api/routes/oauth2/applications/@me.ts +++ b/src/api/routes/oauth2/applications/@me.ts @@ -37,7 +37,7 @@ router.get( }), async (req: Request, res: Response) => { const app = await Application.findOneOrFail({ - where: { id: req.params.id }, + where: { id: req.params.id }, // ...huh? there's no ID in the path... relations: ["bot", "owner"], select: { owner: Object.fromEntries( diff --git a/src/api/routes/users/@me/notes.ts b/src/api/routes/users/@me/notes.ts index 64d0032f..e468c36f 100644 --- a/src/api/routes/users/@me/notes.ts +++ b/src/api/routes/users/@me/notes.ts @@ -23,7 +23,7 @@ import { Request, Response, Router } from "express"; const router: Router = Router({ mergeParams: true }); router.get( - "/:id", + "/:user_id", route({ responses: { 200: { @@ -35,25 +35,25 @@ router.get( }, }), async (req: Request, res: Response) => { - const { id } = req.params; + const { user_id } = req.params; const note = await Note.findOneOrFail({ where: { owner: { id: req.user_id }, - target: { id: id }, + target: { id: user_id }, }, }); return res.json({ note: note?.content, - note_user_id: id, + note_user_id: user_id, user_id: req.user_id, }); }, ); router.put( - "/:id", + "/:user_id", route({ requestBody: "UserNoteUpdateSchema", responses: { @@ -64,9 +64,9 @@ router.put( }, }), async (req: Request, res: Response) => { - const { id } = req.params; + const { user_id } = req.params; const owner = await User.findOneOrFail({ where: { id: req.user_id } }); - const target = await User.findOneOrFail({ where: { id: id } }); //if noted user does not exist throw + const target = await User.findOneOrFail({ where: { id: user_id } }); //if noted user does not exist throw const { note } = req.body; if (note && note.length) { diff --git a/src/api/routes/users/@me/relationships.ts b/src/api/routes/users/@me/relationships.ts index e8064615..76746e3f 100644 --- a/src/api/routes/users/@me/relationships.ts +++ b/src/api/routes/users/@me/relationships.ts @@ -72,7 +72,7 @@ router.get( ); router.put( - "/:id", + "/:user_id", route({ requestBody: "RelationshipPutSchema", responses: { @@ -90,7 +90,7 @@ router.put( req, res, await User.findOneOrFail({ - where: { id: req.params.id }, + where: { id: req.params.user_id }, relations: ["relationships", "relationships.to"], select: userProjection, }), @@ -134,7 +134,7 @@ router.post( ); router.delete( - "/:id", + "/:user_id", route({ responses: { 204: {},