diff --git a/api/api/v1/accounts/:id/roles/:role_id/index.ts b/api/api/v1/accounts/:id/roles/:role_id/index.ts index 6e348dfb..e9a9e2df 100644 --- a/api/api/v1/accounts/:id/roles/:role_id/index.ts +++ b/api/api/v1/accounts/:id/roles/:role_id/index.ts @@ -146,7 +146,7 @@ export default apiRoute((app) => { await role.linkUser(targetUser.id); - return context.newResponse(null, 204); + return context.body(null, 204); }); app.openapi(routeDelete, async (context) => { @@ -186,6 +186,6 @@ export default apiRoute((app) => { await role.unlinkUser(targetUser.id); - return context.newResponse(null, 204); + return context.body(null, 204); }); }); diff --git a/api/api/v1/accounts/index.ts b/api/api/v1/accounts/index.ts index 50fe9e59..5b10adfa 100644 --- a/api/api/v1/accounts/index.ts +++ b/api/api/v1/accounts/index.ts @@ -337,6 +337,6 @@ export default apiRoute((app) => email: email ?? "", }); - return context.newResponse(null, 200); + return context.body(null, 200); }), ); diff --git a/api/api/v1/emojis/:id/index.ts b/api/api/v1/emojis/:id/index.ts index 6d117447..9ce64288 100644 --- a/api/api/v1/emojis/:id/index.ts +++ b/api/api/v1/emojis/:id/index.ts @@ -352,6 +352,6 @@ export default apiRoute((app) => { await db.delete(Emojis).where(eq(Emojis.id, id)); - return context.newResponse(null, 204); + return context.body(null, 204); }); }); diff --git a/api/api/v1/notifications/:id/dismiss.ts b/api/api/v1/notifications/:id/dismiss.ts index bf63b486..76691fba 100644 --- a/api/api/v1/notifications/:id/dismiss.ts +++ b/api/api/v1/notifications/:id/dismiss.ts @@ -68,6 +68,6 @@ export default apiRoute((app) => dismissed: true, }); - return context.newResponse(null, 200); + return context.body(null, 200); }), ); diff --git a/api/api/v1/notifications/clear/index.ts b/api/api/v1/notifications/clear/index.ts index 08d492e7..1d3b5792 100644 --- a/api/api/v1/notifications/clear/index.ts +++ b/api/api/v1/notifications/clear/index.ts @@ -47,6 +47,6 @@ export default apiRoute((app) => await user.clearAllNotifications(); - return context.newResponse(null, 200); + return context.body(null, 200); }), ); diff --git a/api/api/v1/notifications/destroy_multiple/index.ts b/api/api/v1/notifications/destroy_multiple/index.ts index 07761614..6766f9c1 100644 --- a/api/api/v1/notifications/destroy_multiple/index.ts +++ b/api/api/v1/notifications/destroy_multiple/index.ts @@ -60,6 +60,6 @@ export default apiRoute((app) => await user.clearSomeNotifications(ids); - return context.newResponse(null, 200); + return context.body(null, 200); }), ); diff --git a/api/api/v1/roles/:id/index.ts b/api/api/v1/roles/:id/index.ts index 4522fc9a..2627f8ea 100644 --- a/api/api/v1/roles/:id/index.ts +++ b/api/api/v1/roles/:id/index.ts @@ -226,7 +226,7 @@ export default apiRoute((app) => { visible, }); - return context.newResponse(null, 204); + return context.body(null, 204); }); app.openapi(routeDelete, async (context) => { @@ -261,6 +261,6 @@ export default apiRoute((app) => { await role.delete(); - return context.newResponse(null, 204); + return context.body(null, 204); }); }); diff --git a/api/api/v2/filters/:id/index.ts b/api/api/v2/filters/:id/index.ts index d8ab0e58..f39f418f 100644 --- a/api/api/v2/filters/:id/index.ts +++ b/api/api/v2/filters/:id/index.ts @@ -343,6 +343,6 @@ export default apiRoute((app) => { .delete(Filters) .where(and(eq(Filters.userId, user.id), eq(Filters.id, id))); - return context.newResponse(null, 204); + return context.body(null, 204); }); }); diff --git a/api/inbox/index.ts b/api/inbox/index.ts index 7abbd16a..750f4d7a 100644 --- a/api/inbox/index.ts +++ b/api/inbox/index.ts @@ -65,7 +65,7 @@ export default apiRoute((app) => ip: context.env.ip ?? null, }); - return context.newResponse( + return context.body( "Request processing initiated.\nImplement the Instance Messaging Extension to receive any eventual feedback (errors, etc.)", 200, ); diff --git a/api/media/:hash/:name/index.ts b/api/media/:hash/:name/index.ts index f9a11edb..2d8acc3f 100644 --- a/api/media/:hash/:name/index.ts +++ b/api/media/:hash/:name/index.ts @@ -76,7 +76,7 @@ export default apiRoute((app) => } // Can't directly copy file into Response because this crashes Bun for now - return context.newResponse(buffer, 200, { + return context.body(buffer, 200, { "Content-Type": file.type || "application/octet-stream", "Content-Length": `${file.size - start}`, "Content-Range": `bytes ${start}-${end}/${file.size}`, diff --git a/api/media/proxy/:id.ts b/api/media/proxy/:id.ts index 6d86bc19..a3e4ba93 100644 --- a/api/media/proxy/:id.ts +++ b/api/media/proxy/:id.ts @@ -85,7 +85,7 @@ export default apiRoute((app) => .get("Content-Disposition") ?.match(/filename="(.+)"/)?.[1] || id.split("/").pop(); - return context.newResponse(media.body, media.status as StatusCode, { + return context.body(media.body, media.status as StatusCode, { "Content-Type": media.headers.get("Content-Type") || "application/octet-stream", "Content-Length": media.headers.get("Content-Length") || "0", diff --git a/api/messaging/index.ts b/api/messaging/index.ts index efc5f07d..dca713d8 100644 --- a/api/messaging/index.ts +++ b/api/messaging/index.ts @@ -43,6 +43,6 @@ export default apiRoute((app) => getLogger(["federation", "messaging"]) .info`Received message via ${chalk.bold("Instance Messaging")}:\n${content}`; - return context.newResponse(null, 200); + return context.body(null, 200); }), ); diff --git a/api/users/:uuid/inbox/index.ts b/api/users/:uuid/inbox/index.ts index 0a591130..f346870d 100644 --- a/api/users/:uuid/inbox/index.ts +++ b/api/users/:uuid/inbox/index.ts @@ -116,7 +116,7 @@ export default apiRoute((app) => ip: context.env.ip ?? null, }); - return context.newResponse( + return context.body( "Request processing initiated.\nImplement the Instance Messaging Extension to receive any eventual feedback (errors, etc.)", 200, ); diff --git a/middlewares/bait.ts b/middlewares/bait.ts index e8b0c92f..c292e64a 100644 --- a/middlewares/bait.ts +++ b/middlewares/bait.ts @@ -33,7 +33,7 @@ export const bait = createMiddleware(async (context, next) => { if (requestIp?.address) { for (const ip of config.http.bait.bait_ips) { if (matches(ip, requestIp.address)) { - return context.newResponse(file.stream()); + return context.body(file.stream()); } } } @@ -43,7 +43,7 @@ export const bait = createMiddleware(async (context, next) => { for (const agent of config.http.bait.bait_user_agents) { if (new RegExp(agent).test(ua)) { - return context.newResponse(file.stream()); + return context.body(file.stream()); } } diff --git a/plugins/openid/routes/sso/:id/index.ts b/plugins/openid/routes/sso/:id/index.ts index 03d71cff..4d3dbbe8 100644 --- a/plugins/openid/routes/sso/:id/index.ts +++ b/plugins/openid/routes/sso/:id/index.ts @@ -201,7 +201,7 @@ export default (plugin: PluginType): void => { .delete(OpenIdAccounts) .where(eq(OpenIdAccounts.id, account.id)); - return context.newResponse(null, 204); + return context.body(null, 204); }, ); });