From 725600da8f92a223f10a4a9a1ff874c5eff1534f Mon Sep 17 00:00:00 2001 From: "Acid Chicken (硫酸鶏)" Date: Wed, 6 Mar 2019 22:55:47 +0900 Subject: Enhance poll (#4409) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Date: Wed Mar 6 05:16:14 2019 +0900 tune commit 83ff421a6e978243f80ba9ec820189bc897e6e3b Author: mei23 Date: Wed Mar 6 05:01:14 2019 +0900 fallback commit 0b566af973b115ade9e75ea4b8094ee2b329dabc Author: mei23 Date: Wed Mar 6 04:40:12 2019 +0900 Note commit cc0296dd6127580ac584c40398db3f762a311f8b Author: mei23 Date: Wed Mar 6 04:33:58 2019 +0900 createで送る * Squashed commit of the following: commit ae696b1ed12568b27c27367ac5a77035c97c9a1f Author: mei23 Date: Wed Mar 6 06:11:17 2019 +0900 fix commit b735e354e7a9e64534c4f17d04ecbc65fb735c21 Author: mei23 Date: Wed Mar 6 06:08:33 2019 +0900 messge commit d9a4beabf851893b8992a0f4568265eb9d4f0b8e Author: mei23 Date: Wed Mar 6 05:16:14 2019 +0900 tune commit 83ff421a6e978243f80ba9ec820189bc897e6e3b Author: mei23 Date: Wed Mar 6 05:01:14 2019 +0900 fallback commit 0b566af973b115ade9e75ea4b8094ee2b329dabc Author: mei23 Date: Wed Mar 6 04:40:12 2019 +0900 Note commit cc0296dd6127580ac584c40398db3f762a311f8b Author: mei23 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 --- src/models/note.ts | 26 ++++++++++++++++++++++---- src/models/poll-vote.ts | 3 ++- 2 files changed, 24 insertions(+), 5 deletions(-) (limited to 'src/models') diff --git a/src/models/note.ts b/src/models/note.ts index c3413164be..369838ae74 100644 --- a/src/models/note.ts +++ b/src/models/note.ts @@ -99,7 +99,9 @@ export type INote = { }; export type IPoll = { - choices: IChoice[] + choices: IChoice[]; + multiple?: boolean; + expiresAt?: Date; }; export type IChoice = { @@ -313,15 +315,31 @@ export const pack = async ( // Poll if (meId && _note.poll) { _note.poll = (async poll => { + if (poll.multiple) { + const votes = await PollVote.find({ + userId: meId, + noteId: id + }); + + const myChoices = (poll.choices as IChoice[]).filter(x => votes.some(y => x.id == y.choice)); + for (const myChoice of myChoices) { + (myChoice as any).isVoted = true; + } + + return poll; + } else { + poll.multiple = false; + } + const vote = await PollVote .findOne({ userId: meId, noteId: id }); - if (vote != null) { - const myChoice = poll.choices - .filter((c: any) => c.id == vote.choice)[0]; + if (vote) { + const myChoice = (poll.choices as IChoice[]) + .filter(x => x.id == vote.choice)[0] as any; myChoice.isVoted = true; } diff --git a/src/models/poll-vote.ts b/src/models/poll-vote.ts index b8aceae3b0..e6178cbc26 100644 --- a/src/models/poll-vote.ts +++ b/src/models/poll-vote.ts @@ -2,9 +2,10 @@ import * as mongo from 'mongodb'; import db from '../db/mongodb'; const PollVote = db.get('pollVotes'); +PollVote.dropIndex(['userId', 'noteId'], { unique: true }).catch(() => {}); PollVote.createIndex('userId'); PollVote.createIndex('noteId'); -PollVote.createIndex(['userId', 'noteId'], { unique: true }); +PollVote.createIndex(['userId', 'noteId', 'choice'], { unique: true }); export default PollVote; export interface IPollVote { -- cgit v1.2.3-freya