From 50fa6cc6d85424a95bfee276c6121c50d88148aa Mon Sep 17 00:00:00 2001 From: Rory& Date: Wed, 15 Jul 2026 12:28:39 +0200 Subject: [PATCH] Remove APIPublicMember, APIMessage --- assets/openapi.json | Bin 999965 -> 996760 bytes assets/schemas.json | Bin 444442 -> 442044 bytes src/api/routes/channels/#channel_id/greet.ts | 4 +-- .../messages/#message_id/crosspost.ts | 2 +- .../#channel_id/messages/#message_id/index.ts | 29 +++--------------- .../channels/#channel_id/messages/index.ts | 4 +-- .../#channel_id/messages/pins/index.ts | 2 +- src/api/routes/channels/#channel_id/pins.ts | 2 +- .../#guild_id/members/#member_id/index.ts | 2 +- .../#guild_id/members/#member_id/nick.ts | 2 +- .../#webhook_id/#webhook_token/index.ts | 4 +-- src/schemas/responses/TypedResponses.ts | 6 ++-- 12 files changed, 17 insertions(+), 40 deletions(-) diff --git a/assets/openapi.json b/assets/openapi.json index 34fff09fe7d827a0a2a6b07194e1271d6201ff6c..b13eba95546dbdbb8ec245a750db89eb089cf456 100644 GIT binary patch delta 661 zcmZ{gO=wd=6or|YByaNGoBSx)L~BD9LK_;Ig$W83BSI~ONYo-|Ek?ywiHpz_bYsmT zkQ)3+d627!#f=NKU_|MyAZd_N6l#bYDI)q@s!)Q0-3U5)N+tiwBaT-S%1|5G z0gqBFY-DUs<4$oa)D|5cXe5A;gasjWOx+3bDYnIEyb4($ zjYf zItEJ(t)Iw!O9aij*v48-?gh_7k;ZxIa#PCzGWG)GB0SxS))+qHuJ@g5!-5o3EBY8M MgkvrY$J|Zr7em+SEC2ui delta 696 zcmbR7+GcKxZ9@y=7AAuoY`&?*#fj$WphPEV*~WS@Tj4y(}QhGl${9p(#c*WJP7 z#Wk&kiEX=hGy8q6_L4(PK+FupEI`bNS%jt>}8TF=Lc+IReZ7-Ys_BW2~ z(c+BelLHT$O+OIK9y*{HAjWZ?X>x!*|Mm+U9NQT2Dw}R#%6VaX!%{9Y zrtJZG9DkW0Mg$z;6#{C!#O*wNf+2_I^aZat#HOG8%dWQlwo1 zx6Gf+EdVwztNp-w?(GNG^O%`|H41j}@&aAW%n{DGJ>eyfT`5ddiDmn-BwklF7~jSZ zJq%2lw=dYq8_P7^z@0Z|`htCY8q@ijIYqW_zsp<1j8`!zT&DxWRdRd5YTj!Yfs1M| zQs64Q;Z0_qzMzfQbo%KzVY%iq1d$jLKp98M&$5+FqwDVcEdls_cTxyZn({% X%Cx=UE{_XS`wC6I?JG3-KX3y8A_@lD diff --git a/assets/schemas.json b/assets/schemas.json index 06555dbf0b3da15924908071d401f22da2c8ffe0..9a21b5bf5483c32694bb9105edc6169c33366b1b 100644 GIT binary patch delta 121 zcmbO=L3+<$sfHHDElf`2zImVL}{zy%q(9R?_Jzzbv>huO~W~J%< Q{%it3McWtpvsG3A0Aisjwg3PC delta 163 zcmdn4p}@ElfbOfwdo0L%u16lgd0u2pu)(yJ=Tz| zS(wp$`bQ_W;^}7$*aU#eK%9`t3V);~Cwvo~tk9%3o!^bk2&|t|V!E#p8~gM`PG-IB J6WrKzDgYA0Gx7ic diff --git a/src/api/routes/channels/#channel_id/greet.ts b/src/api/routes/channels/#channel_id/greet.ts index c9c3c9b0b..51ff35837 100644 --- a/src/api/routes/channels/#channel_id/greet.ts +++ b/src/api/routes/channels/#channel_id/greet.ts @@ -32,7 +32,7 @@ router.post( permission: "SEND_MESSAGES", responses: { 200: { - body: "Message", + body: "PublicMessage", }, 404: {}, 400: { @@ -102,7 +102,7 @@ router.post( channel.save(), ]); - res.send(message); + res.json(publicMsg); }, ); diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts index 0db480a67..7ee337ffb 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts @@ -27,7 +27,7 @@ router.post( permission: "MANAGE_MESSAGES", responses: { 200: { - body: "Message", + body: "PublicMessage", }, }, }), diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts index 8285dc047..a4d5a8522 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts @@ -56,7 +56,7 @@ router.patch( right: "SEND_MESSAGES", responses: { 200: { - body: "Message", + body: "PublicMessage", }, 400: { body: "APIErrorResponse", @@ -115,26 +115,7 @@ router.patch( postHandleMessage(new_message).catch((e) => console.error("[Message] post-message handler failed", e)); - // TODO: a DTO? - return res.json({ - ...new_message.toJSON(), - id: new_message.id, - type: new_message.type, - channel_id: new_message.channel_id, - member: new_message.member?.toPublicMember(), - author: new_message.author?.toPublicUser(), - attachments: new_message.attachments, - embeds: new_message.embeds, - mentions: new_message.embeds, - mention_roles: new_message.mention_roles, - mention_everyone: new_message.mention_everyone, - pinned: new_message.pinned, - timestamp: new_message.timestamp, - edited_timestamp: new_message.edited_timestamp, - - // these are not in the Discord.com response - mention_channels: new_message.mention_channels, - }); + return res.json(new_message.toJSON()); }, ); @@ -155,7 +136,7 @@ router.put( right: "SEND_BACKDATED_EVENTS", responses: { 200: { - body: "Message", + body: "PublicMessage", }, 400: { body: "APIErrorResponse", @@ -252,7 +233,7 @@ router.get( permission: "VIEW_CHANNEL", responses: { 200: { - body: "Message", + body: "PublicMessage", }, 400: { body: "APIErrorResponse", @@ -276,7 +257,7 @@ router.get( if (message.author_id !== req.user_id) permissions.hasThrow("READ_MESSAGE_HISTORY"); - return res.json(message); + return res.json(message.toJSON()); }, ); diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts index 6a453f6fa..83b5bd0c2 100644 --- a/src/api/routes/channels/#channel_id/messages/index.ts +++ b/src/api/routes/channels/#channel_id/messages/index.ts @@ -77,7 +77,7 @@ router.get( }, responses: { 200: { - body: "APIMessageArray", + body: "PublicMessageArray", }, 400: { body: "APIErrorResponse", @@ -291,7 +291,7 @@ router.post( right: "SEND_MESSAGES", responses: { 200: { - body: "Message", + body: "PublicMessage", }, 400: { body: "APIErrorResponse", diff --git a/src/api/routes/channels/#channel_id/messages/pins/index.ts b/src/api/routes/channels/#channel_id/messages/pins/index.ts index 443112b9e..50d533c35 100644 --- a/src/api/routes/channels/#channel_id/messages/pins/index.ts +++ b/src/api/routes/channels/#channel_id/messages/pins/index.ts @@ -165,7 +165,7 @@ router.get( permission: ["READ_MESSAGE_HISTORY"], responses: { 200: { - body: "APIMessageArray", + body: "PublicMessageArray", }, 400: { body: "APIErrorResponse", diff --git a/src/api/routes/channels/#channel_id/pins.ts b/src/api/routes/channels/#channel_id/pins.ts index 136ac34ef..c7aa99847 100644 --- a/src/api/routes/channels/#channel_id/pins.ts +++ b/src/api/routes/channels/#channel_id/pins.ts @@ -166,7 +166,7 @@ router.get( permission: ["READ_MESSAGE_HISTORY"], responses: { 200: { - body: "APIMessageArray", + body: "PublicMessageArray", }, 400: { body: "APIErrorResponse", diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts index bfe8bb2e9..929ae7529 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts @@ -29,7 +29,7 @@ router.get( route({ responses: { 200: { - body: "APIPublicMember", + body: "PublicMember", }, 403: { body: "APIErrorResponse", diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts b/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts index b8b6d3648..4d48aa2d3 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts @@ -29,7 +29,7 @@ router.patch( requestBody: "MemberNickChangeSchema", responses: { 200: { - body: "APIPublicMember", + body: "PublicMember", }, 400: { body: "APIErrorResponse", diff --git a/src/api/routes/webhooks/#webhook_id/#webhook_token/index.ts b/src/api/routes/webhooks/#webhook_id/#webhook_token/index.ts index 886236ea5..902bde024 100644 --- a/src/api/routes/webhooks/#webhook_id/#webhook_token/index.ts +++ b/src/api/routes/webhooks/#webhook_id/#webhook_token/index.ts @@ -156,9 +156,7 @@ router.patch( route({ requestBody: "WebhookUpdateSchema", responses: { - 200: { - body: "Message", - }, + 200: {}, 400: { body: "APIErrorResponse", }, diff --git a/src/schemas/responses/TypedResponses.ts b/src/schemas/responses/TypedResponses.ts index e0413a72e..afc147cf3 100644 --- a/src/schemas/responses/TypedResponses.ts +++ b/src/schemas/responses/TypedResponses.ts @@ -20,8 +20,8 @@ import { GeneralConfiguration, LimitsConfiguration } from "../../util/config/types"; import { DmChannelDTO } from "../../util/dtos"; // TODO: remove entity imports -import { Application, BackupCode, Categories, Channel, Guild, Invite, Member, Message, Template, Webhook } from "@spacebar/database"; -import { GuildCreateResponse, PrivateUser, PublicMember, PublicUser } from "@spacebar/schemas"; +import { Application, BackupCode, Categories, Channel, Guild, Invite, Member, Template, Webhook } from "@spacebar/database"; +import { GuildCreateResponse, PrivateUser, PublicUser } from "@spacebar/schemas"; // TODO: remove this entire file! // removes internal properties from the guild class @@ -41,13 +41,11 @@ export type ApplicationEntitlementsResponse = unknown[]; export type ApplicationSkusResponse = unknown[]; export type APIApplicationArray = Application[]; export type APIInviteArray = Invite[]; -export type APIMessageArray = Message[]; export type APIWebhookArray = Webhook[]; export type APIDiscoveryCategoryArray = Categories[]; export type APIGeneralConfiguration = GeneralConfiguration; export type APIChannelArray = Channel[]; export type APIMemberArray = Member[]; -export type APIPublicMember = PublicMember; export interface APIGuildWithJoinedAt extends GuildCreateResponse { joined_at: string;