summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/messaging/messages.ts
diff options
context:
space:
mode:
authorJohann150 <johann.galle@protonmail.com>2022-04-03 06:57:26 +0200
committerGitHub <noreply@github.com>2022-04-03 13:57:26 +0900
commitc8935b32f889165782844a709c79df4325bbee58 (patch)
tree5c66ec8bb485ec117eff2b2a82b0731deafdae87 /packages/backend/src/server/api/endpoints/messaging/messages.ts
parentUpdate CHANGELOG.md (diff)
downloadmisskey-c8935b32f889165782844a709c79df4325bbee58.tar.gz
misskey-c8935b32f889165782844a709c79df4325bbee58.tar.bz2
misskey-c8935b32f889165782844a709c79df4325bbee58.zip
fix: validation (better #8456) (#8461)
* Revert "revert 484e023c0" This reverts commit c03b70c949923b830a6d0361d1aa4d5f5614b7b7. * also allow pure renote * fix checks for pure renote
Diffstat (limited to 'packages/backend/src/server/api/endpoints/messaging/messages.ts')
-rw-r--r--packages/backend/src/server/api/endpoints/messaging/messages.ts19
1 files changed, 14 insertions, 5 deletions
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages.ts b/packages/backend/src/server/api/endpoints/messaging/messages.ts
index 9760709c29..dbf1f6c868 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages.ts
@@ -47,14 +47,25 @@ export const meta = {
export const paramDef = {
type: 'object',
properties: {
- userId: { type: 'string', format: 'misskey:id' },
- groupId: { type: 'string', format: 'misskey:id' },
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
sinceId: { type: 'string', format: 'misskey:id' },
untilId: { type: 'string', format: 'misskey:id' },
markAsRead: { type: 'boolean', default: true },
},
- required: [],
+ anyOf: [
+ {
+ properties: {
+ userId: { type: 'string', format: 'misskey:id' },
+ },
+ required: ['userId'],
+ },
+ {
+ properties: {
+ groupId: { type: 'string', format: 'misskey:id' },
+ },
+ required: ['groupId'],
+ },
+ ],
} as const;
// eslint-disable-next-line import/no-default-export
@@ -126,7 +137,5 @@ export default define(meta, paramDef, async (ps, user) => {
return await Promise.all(messages.map(message => MessagingMessages.pack(message, user, {
populateGroup: false,
})));
- } else {
- throw new Error();
}
});