diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2019-03-06 22:55:47 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-03-06 22:55:47 +0900 |
| commit | 725600da8f92a223f10a4a9a1ff874c5eff1534f (patch) | |
| tree | 1797d5561f71fb2a67b31fb4f79611f8f4ab04dd /src/server/api/endpoints/notes/create.ts | |
| parent | [Client] Fix bug (diff) | |
| download | sharkey-725600da8f92a223f10a4a9a1ff874c5eff1534f.tar.gz sharkey-725600da8f92a223f10a4a9a1ff874c5eff1534f.tar.bz2 sharkey-725600da8f92a223f10a4a9a1ff874c5eff1534f.zip | |
Enhance poll (#4409)
* Start working
* WIP: Enhance poll
* Fix bug
* Use `name` in voting note
refs: https://github.com/syuilo/misskey/issues/4407#issuecomment-469057296
* Fix style
* Refactor
Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
* WIP: Update poll editor
* Fix bug
* Fix bug
refs: https://github.com/syuilo/misskey/pull/4409#discussion_r
* Fix typo
* Better design
* Beautify poll editor
* Fix UI
* Fix bug
refs: https://github.com/syuilo/misskey/pull/4409#discussion_r262217524
* Add debug logging
* Fix bug
* Log deliver
* fix vote
* Update ap/show
refs: https://github.com/syuilo/misskey/pull/4409#issuecomment-469652386
* Update poll view
* Maybe done
* Add tests
* Fix path
* Fix test
* Fix test
* Fix test
* Fix expired check on AP
* Update note.ts
* Squashed commit of the following:
commit d9a4beabf851893b8992a0f4568265eb9d4f0b8e
Author: mei23 <m@m544.net>
Date: Wed Mar 6 05:16:14 2019 +0900
tune
commit 83ff421a6e978243f80ba9ec820189bc897e6e3b
Author: mei23 <m@m544.net>
Date: Wed Mar 6 05:01:14 2019 +0900
fallback
commit 0b566af973b115ade9e75ea4b8094ee2b329dabc
Author: mei23 <m@m544.net>
Date: Wed Mar 6 04:40:12 2019 +0900
Note
commit cc0296dd6127580ac584c40398db3f762a311f8b
Author: mei23 <m@m544.net>
Date: Wed Mar 6 04:33:58 2019 +0900
createで送る
* Squashed commit of the following:
commit ae696b1ed12568b27c27367ac5a77035c97c9a1f
Author: mei23 <m@m544.net>
Date: Wed Mar 6 06:11:17 2019 +0900
fix
commit b735e354e7a9e64534c4f17d04ecbc65fb735c21
Author: mei23 <m@m544.net>
Date: Wed Mar 6 06:08:33 2019 +0900
messge
commit d9a4beabf851893b8992a0f4568265eb9d4f0b8e
Author: mei23 <m@m544.net>
Date: Wed Mar 6 05:16:14 2019 +0900
tune
commit 83ff421a6e978243f80ba9ec820189bc897e6e3b
Author: mei23 <m@m544.net>
Date: Wed Mar 6 05:01:14 2019 +0900
fallback
commit 0b566af973b115ade9e75ea4b8094ee2b329dabc
Author: mei23 <m@m544.net>
Date: Wed Mar 6 04:40:12 2019 +0900
Note
commit cc0296dd6127580ac584c40398db3f762a311f8b
Author: mei23 <m@m544.net>
Date: Wed Mar 6 04:33:58 2019 +0900
createで送る
* Fix typo
* Update vote.ts
* Update vote.ts
* Update poll-editor.vue
* Update tslint.json
* Fix layout
* Add note
* Fix bug
* Rename text key
* 投票するときに投稿として扱わないように (#4425)
* wip
* 形式をMastodonと合わせた
* Bye something
* Use - instead of ~
* Redundancy
* Yes!
* Refactor
* Use moment instead of Date
* Fix indent
* Refactor
if (votes.length)
は必要なさそう
* Clean up
* Bye Date
* Clean
* Fix timer is not displayed
* Fix リモートから無期限pollにvoteできない
* Fix vote actor
Diffstat (limited to 'src/server/api/endpoints/notes/create.ts')
| -rw-r--r-- | src/server/api/endpoints/notes/create.ts | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts index bb0d8f94f5..8cc5e4b815 100644 --- a/src/server/api/endpoints/notes/create.ts +++ b/src/server/api/endpoints/notes/create.ts @@ -165,7 +165,10 @@ export const meta = { choices: $.arr($.str) .unique() .range(2, 10) - .each(c => c.length > 0 && c.length < 50) + .each(c => c.length > 0 && c.length < 50), + multiple: $.optional.bool, + expiresAt: $.optional.nullable.num.int(), + expiredAfter: $.optional.nullable.num.int().min(1) }).strict(), desc: { 'ja-JP': 'アンケート' @@ -214,6 +217,12 @@ export const meta = { code: 'CONTENT_REQUIRED', id: '6f57e42b-c348-439b-bc45-993995cc515a' }, + + cannotCreateAlreadyExpiredPoll: { + message: 'Poll is already expired.', + code: 'CANNOT_CREATE_ALREADY_EXPIRED_POLL', + id: '04da457d-b083-4055-9082-955525eda5a5' + } } }; @@ -275,6 +284,13 @@ export default define(meta, async (ps, user, app) => { text: choice.trim(), votes: 0 })); + + if (typeof ps.poll.expiresAt === 'number') { + 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; + } } // テキストが無いかつ添付ファイルが無いかつRenoteも無いかつ投票も無かったらエラー @@ -291,7 +307,11 @@ export default define(meta, async (ps, user, app) => { const note = await create(user, { createdAt: new Date(), files: files, - poll: ps.poll, + poll: ps.poll ? { + choices: ps.poll.choices, + multiple: ps.poll.multiple || false, + expiresAt: ps.poll.expiresAt ? new Date(ps.poll.expiresAt) : null + } : undefined, text: ps.text, reply, renote, |