diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-04-02 16:47:53 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-04-02 16:47:53 +0900 |
| commit | c03b70c949923b830a6d0361d1aa4d5f5614b7b7 (patch) | |
| tree | 6cf6995e808969e845f71b15cbd504e0dbf9e8ed /packages/backend/src/server/api/endpoints/messaging | |
| parent | 12.109.0 (diff) | |
| download | misskey-c03b70c949923b830a6d0361d1aa4d5f5614b7b7.tar.gz misskey-c03b70c949923b830a6d0361d1aa4d5f5614b7b7.tar.bz2 misskey-c03b70c949923b830a6d0361d1aa4d5f5614b7b7.zip | |
revert 484e023c0
Diffstat (limited to 'packages/backend/src/server/api/endpoints/messaging')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/messaging/messages.ts | 19 | ||||
| -rw-r--r-- | packages/backend/src/server/api/endpoints/messaging/messages/create.ts | 17 |
2 files changed, 8 insertions, 28 deletions
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages.ts b/packages/backend/src/server/api/endpoints/messaging/messages.ts index dbf1f6c868..9760709c29 100644 --- a/packages/backend/src/server/api/endpoints/messaging/messages.ts +++ b/packages/backend/src/server/api/endpoints/messaging/messages.ts @@ -47,25 +47,14 @@ 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 }, }, - anyOf: [ - { - properties: { - userId: { type: 'string', format: 'misskey:id' }, - }, - required: ['userId'], - }, - { - properties: { - groupId: { type: 'string', format: 'misskey:id' }, - }, - required: ['groupId'], - }, - ], + required: [], } as const; // eslint-disable-next-line import/no-default-export @@ -137,5 +126,7 @@ 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(); } }); diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts index 405af5ec17..8c1226b0f4 100644 --- a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts +++ b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts @@ -67,23 +67,12 @@ export const meta = { export const paramDef = { type: 'object', properties: { + userId: { type: 'string', format: 'misskey:id' }, + groupId: { type: 'string', format: 'misskey:id' }, text: { type: 'string', nullable: true, maxLength: 3000 }, fileId: { type: 'string', format: 'misskey:id' }, }, - anyOf: [ - { - properties: { - userId: { type: 'string', format: 'misskey:id' }, - }, - required: ['userId'], - }, - { - properties: { - groupId: { type: 'string', format: 'misskey:id' }, - }, - required: ['groupId'], - }, - ], + required: [], } as const; // eslint-disable-next-line import/no-default-export |