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",
},
|
