725600da8f
* 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
38 lines
945 B
TypeScript
38 lines
945 B
TypeScript
import { IChoice, IPoll } from '../../../models/note';
|
|
import Resolver from '../resolver';
|
|
import { ICollection } from '../type';
|
|
|
|
interface IQuestionChoice {
|
|
name?: string;
|
|
replies?: ICollection;
|
|
_misskey_votes?: number;
|
|
}
|
|
|
|
interface IQuestion {
|
|
oneOf?: IQuestionChoice[];
|
|
anyOf?: IQuestionChoice[];
|
|
endTime?: Date;
|
|
}
|
|
|
|
export async function extractPollFromQuestion(source: string | IQuestion): Promise<IPoll> {
|
|
const question = typeof source === 'string' ? await new Resolver().resolve(source) as IQuestion : source;
|
|
const multiple = !question.oneOf;
|
|
const expiresAt = question.endTime ? new Date(question.endTime) : null;
|
|
|
|
if (multiple && !question.anyOf) {
|
|
throw 'invalid question';
|
|
}
|
|
|
|
const choices = question[multiple ? 'anyOf' : 'oneOf']
|
|
.map((x, i) => ({
|
|
id: i,
|
|
text: x.name,
|
|
votes: x.replies && x.replies.totalItems || x._misskey_votes || 0,
|
|
} as IChoice));
|
|
|
|
return {
|
|
choices,
|
|
multiple,
|
|
expiresAt
|
|
};
|
|
}
|