diff options
| author | Marie <marie@kaifa.ch> | 2024-02-19 19:06:30 +0000 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-02-19 19:06:30 +0000 |
| commit | e248e412872dc76ec13f4e0258f4af91dc09cafa (patch) | |
| tree | b7a7ef817b62215352cf895aad87c758af833008 /packages/backend/src/server/api/endpoints/bubble-game | |
| parent | rename to get it applied after upstream changes (diff) | |
| parent | merge: Merge upstream from 19th Feburary (!428) (diff) | |
| download | sharkey-e248e412872dc76ec13f4e0258f4af91dc09cafa.tar.gz sharkey-e248e412872dc76ec13f4e0258f4af91dc09cafa.tar.bz2 sharkey-e248e412872dc76ec13f4e0258f4af91dc09cafa.zip | |
fix: merge conflict
Diffstat (limited to 'packages/backend/src/server/api/endpoints/bubble-game')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/bubble-game/ranking.ts | 18 | ||||
| -rw-r--r-- | packages/backend/src/server/api/endpoints/bubble-game/register.ts | 15 |
2 files changed, 24 insertions, 9 deletions
diff --git a/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts b/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts index 731bcc5b65..ab877bbe20 100644 --- a/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts +++ b/packages/backend/src/server/api/endpoints/bubble-game/ranking.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and other misskey contributors + * SPDX-FileCopyrightText: syuilo and misskey-project * SPDX-License-Identifier: AGPL-3.0-only */ @@ -24,9 +24,19 @@ export const meta = { type: 'object', optional: false, nullable: false, properties: { - id: { type: 'string', format: 'misskey:id' }, - score: { type: 'integer' }, - user: { ref: 'UserLite' }, + id: { + type: 'string', format: 'misskey:id', + optional: false, nullable: false, + }, + score: { + type: 'integer', + optional: false, nullable: false, + }, + user: { + type: 'object', + optional: true, nullable: false, + ref: 'UserLite', + }, }, }, }, diff --git a/packages/backend/src/server/api/endpoints/bubble-game/register.ts b/packages/backend/src/server/api/endpoints/bubble-game/register.ts index 8eb90fdbf9..0a999e42cd 100644 --- a/packages/backend/src/server/api/endpoints/bubble-game/register.ts +++ b/packages/backend/src/server/api/endpoints/bubble-game/register.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: syuilo and other misskey contributors + * SPDX-FileCopyrightText: syuilo and misskey-project * SPDX-License-Identifier: AGPL-3.0-only */ @@ -29,9 +29,6 @@ export const meta = { id: 'eb627bc7-574b-4a52-a860-3c3eae772b88', }, }, - - res: { - }, } as const; export const paramDef = { @@ -39,7 +36,15 @@ export const paramDef = { properties: { score: { type: 'integer', minimum: 0 }, seed: { type: 'string', minLength: 1, maxLength: 1024 }, - logs: { type: 'array' }, + logs: { + type: 'array', + items: { + type: 'array', + items: { + type: 'number', + }, + }, + }, gameMode: { type: 'string' }, gameVersion: { type: 'integer' }, }, |