diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-11-19 20:39:59 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-11-19 20:39:59 +0900 |
| commit | 88cdbc2ad656baea238d4af24215f20677665a55 (patch) | |
| tree | 4057db5c1a6aae7650b87532ddc6be2bbbe32dd8 /packages/backend/src/server/api/endpoints | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.97.0 (diff) | |
| download | misskey-88cdbc2ad656baea238d4af24215f20677665a55.tar.gz misskey-88cdbc2ad656baea238d4af24215f20677665a55.tar.bz2 misskey-88cdbc2ad656baea238d4af24215f20677665a55.zip | |
Merge branch 'develop'
Diffstat (limited to 'packages/backend/src/server/api/endpoints')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/notes/create.ts | 3 | ||||
| -rw-r--r-- | packages/backend/src/server/api/endpoints/notes/polls/vote.ts | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts index e9584e7b8b..d2d1ede3c8 100644 --- a/packages/backend/src/server/api/endpoints/notes/create.ts +++ b/packages/backend/src/server/api/endpoints/notes/create.ts @@ -244,8 +244,9 @@ export default define(meta, async (ps, user) => { if (ps.poll) { if (typeof ps.poll.expiresAt === 'number') { - if (ps.poll.expiresAt < Date.now()) + if (ps.poll.expiresAt < Date.now()) { throw new ApiError(meta.errors.cannotCreateAlreadyExpiredPoll); + } } else if (typeof ps.poll.expiredAfter === 'number') { ps.poll.expiresAt = Date.now() + ps.poll.expiredAfter; } diff --git a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts index f670501385..e7a6537025 100644 --- a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts +++ b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts @@ -112,8 +112,9 @@ export default define(meta, async (ps, user) => { if (exist.length) { if (poll.multiple) { - if (exist.some(x => x.choice == ps.choice)) + if (exist.some(x => x.choice == ps.choice)) { throw new ApiError(meta.errors.alreadyVoted); + } } else { throw new ApiError(meta.errors.alreadyVoted); } |