forked from mirror/misskey
a6a91fec3a
* add: safeFloatParserを追加
* fix: 欠けていた型を追加
* refactor: pageBlockTypesをjson-schemaに移植
* refactor: components/global内の型エラーが出ている箇所を修正
* lint: fix null check style
* refactor: fix type error
* refactor: fix some type errors
* fix: 翻訳が抜けていた箇所を修正
* refactor: getJsonSchemaで正しいスキーマが返されるように修正
* fix: MkChartの型エラーとbytesオプションが機能していない問題を修正
* fix(misskey-js): `drive`->`folderUpdated`のpayloadの型が間違っていたのを修正
* refactor: fix some type errors
* change: Captcha読み込み中の文言をLoadingに変更
* refactor(backend/misskey-js): MainEventの型を改善
* refactor: chartjs-plugin-gradientが二重でpluginに登録されていたのを修正
* update: misskey-js.api.md
* refactor: fix some type errors
* fix: backendのtypecheckが落ちていたのを修正
* update: misskey-js.api.md
* add: json-schemaのnoteにpollの型定義を追加
* refactor: noteのjson-schemaの型を改善
* refactor: MkPoll
* refactor: fix some type errors
* change: UserLiteにisLockedを持たせるように
* fix: notificationスキーマにroleが含まれていないのを修正
* Revert "change: UserLiteにisLockedを持たせるように"
This reverts commit 1bb0c8e7a9
.
* fix: フォロー通知から鍵垢へのフォローを行うと処理中のまま止まってしまう問題を修正
* refactor: noteスキーマのvisibilityにenumを追加
* change: deepCloneのCloneableTypeにundefinedを追加
* refactor: fix some type errors
* refactor: `allowEmpty: false`を使用していた箇所を`minLength: 1`に置き換え
* enhance: API 'retension' のresponseの型を追加
* fix: Chart関連のtooltipが正しい位置に表示されない問題を修正
* refactor: fix some type errors
* fix: 型情報が不足していたのを修正
* enhance: announcementスキーマにenumを追加
* enhance: ロールポリシーの型定義をRoleServiceからjson-schemaに移植
* refactor: policiesを`ref: RolePolicies`に統一
* fix: API `meta` のレスポンスの型にpoliciesが含まれていないのを修正
* refactor: fix some type errors
* fix: backendのlintが落ちているのを修正
* fix: MkFoldableSectionの開閉時のanimationが適用されていない問題を修正
* fix: backendのtypecheckが落ちているのを修正
* update: run build-misskey-js-with-types
* fix: MkDialogのmount時に文字数制限の判定が行われない問題を修正
* update: CHANGELOG.md
* refactor: MkUserSelectDialogの型を改善
* fix: deepCloneでundefinedはcloneしないように (#9207)
* change: frontendのcloneをbackend側にも反映
* update: CHANGELOG.md
* fix: RoleServiceからPackを通して型RolePoliciesに依存させないように
* Update packages/frontend/src/scripts/get-note-summary.ts
* revert RoleService.ts changes
* change: optional chaining -> non-null assertion
* remove: unused import
* fix: propsで渡されたuserがUserLiteの場合に意図しない動作になってしまうのを修正
* change: fix null check style
* refactor: fix type error
* change: fix null check style
* Update packages/frontend/src/components/MkDrive.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* refactor: css moduleでglobalを使わないように
* refactor: roleのiconUrlは必ず存在するものとして扱うように
* enhance: MenuButtonのactiveにcomputedを受け付けられるように
* Update packages/frontend/src/components/MkNotePreview.vue
* Update MkWindow.vue
* refactor: notification.noteは必ず存在するものとして扱うように
* Update packages/frontend/src/components/MkNotification.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* fix: MkSignupDialogでdoneのemit時にresを含んでいなかったのを修正
* Update packages/frontend/src/scripts/clone.ts
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* refactor: 不要な返り値の型を削除
* refactor: 不要なnullチェックを削除
* update: misskey-js-autogen
* update: clone.ts
* refactor
* Update MkNotification.vue
* Update MkNotification.vue
* ✌️
* Update MkNotification.vue
* Update MkNotification.vue
* Update MkNotification.vue
* Update MkNotifications.vue
* Update MkUserSetupDialog.Profile.vue
* Update MkUserCardMini.vue
* ✌️
* Update MkMenu.vue
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
145 lines
3.8 KiB
Vue
145 lines
3.8 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<div :class="{ [$style.done]: closed || isVoted }">
|
|
<ul :class="$style.choices">
|
|
<li v-for="(choice, i) in poll.choices" :key="i" :class="$style.choice" @click="vote(i)">
|
|
<div :class="$style.bg" :style="{ 'width': `${showResult ? (choice.votes / total * 100) : 0}%` }"></div>
|
|
<span :class="$style.fg">
|
|
<template v-if="choice.isVoted"><i class="ti ti-check" style="margin-right: 4px; color: var(--accent);"></i></template>
|
|
<Mfm :text="choice.text" :plain="true"/>
|
|
<span v-if="showResult" style="margin-left: 4px; opacity: 0.7;">({{ i18n.tsx._poll.votesCount({ n: choice.votes }) }})</span>
|
|
</span>
|
|
</li>
|
|
</ul>
|
|
<p v-if="!readOnly" :class="$style.info">
|
|
<span>{{ i18n.tsx._poll.totalVotes({ n: total }) }}</span>
|
|
<span> · </span>
|
|
<a v-if="!closed && !isVoted" style="color: inherit;" @click="showResult = !showResult">{{ showResult ? i18n.ts._poll.vote : i18n.ts._poll.showResult }}</a>
|
|
<span v-if="isVoted">{{ i18n.ts._poll.voted }}</span>
|
|
<span v-else-if="closed">{{ i18n.ts._poll.closed }}</span>
|
|
<span v-if="remaining > 0"> · {{ timer }}</span>
|
|
</p>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { computed, ref } from 'vue';
|
|
import * as Misskey from 'misskey-js';
|
|
import { sum } from '@/scripts/array.js';
|
|
import { pleaseLogin } from '@/scripts/please-login.js';
|
|
import * as os from '@/os.js';
|
|
import { misskeyApi } from '@/scripts/misskey-api.js';
|
|
import { i18n } from '@/i18n.js';
|
|
import { useInterval } from '@/scripts/use-interval.js';
|
|
|
|
const props = defineProps<{
|
|
noteId: string;
|
|
poll: NonNullable<Misskey.entities.Note['poll']>;
|
|
readOnly?: boolean;
|
|
}>();
|
|
|
|
const remaining = ref(-1);
|
|
|
|
const total = computed(() => sum(props.poll.choices.map(x => x.votes)));
|
|
const closed = computed(() => remaining.value === 0);
|
|
const isVoted = computed(() => !props.poll.multiple && props.poll.choices.some(c => c.isVoted));
|
|
const timer = computed(() => i18n.tsx._poll[
|
|
remaining.value >= 86400 ? 'remainingDays' :
|
|
remaining.value >= 3600 ? 'remainingHours' :
|
|
remaining.value >= 60 ? 'remainingMinutes' : 'remainingSeconds'
|
|
]({
|
|
s: Math.floor(remaining.value % 60),
|
|
m: Math.floor(remaining.value / 60) % 60,
|
|
h: Math.floor(remaining.value / 3600) % 24,
|
|
d: Math.floor(remaining.value / 86400),
|
|
}));
|
|
|
|
const showResult = ref(props.readOnly || isVoted.value);
|
|
|
|
// 期限付きアンケート
|
|
if (props.poll.expiresAt) {
|
|
const tick = () => {
|
|
remaining.value = Math.floor(Math.max(new Date(props.poll.expiresAt!).getTime() - Date.now(), 0) / 1000);
|
|
if (remaining.value === 0) {
|
|
showResult.value = true;
|
|
}
|
|
};
|
|
|
|
useInterval(tick, 3000, {
|
|
immediate: true,
|
|
afterMounted: false,
|
|
});
|
|
}
|
|
|
|
const vote = async (id) => {
|
|
pleaseLogin();
|
|
|
|
if (props.readOnly || closed.value || isVoted.value) return;
|
|
|
|
const { canceled } = await os.confirm({
|
|
type: 'question',
|
|
text: i18n.tsx.voteConfirm({ choice: props.poll.choices[id].text }),
|
|
});
|
|
if (canceled) return;
|
|
|
|
await misskeyApi('notes/polls/vote', {
|
|
noteId: props.noteId,
|
|
choice: id,
|
|
});
|
|
if (!showResult.value) showResult.value = !props.poll.multiple;
|
|
};
|
|
</script>
|
|
|
|
<style lang="scss" module>
|
|
.choices {
|
|
display: block;
|
|
margin: 0;
|
|
padding: 0;
|
|
list-style: none;
|
|
}
|
|
|
|
.choice {
|
|
display: block;
|
|
position: relative;
|
|
margin: 4px 0;
|
|
padding: 4px;
|
|
//border: solid 0.5px var(--divider);
|
|
background: var(--accentedBg);
|
|
border-radius: 4px;
|
|
overflow: clip;
|
|
cursor: pointer;
|
|
}
|
|
|
|
.bg {
|
|
position: absolute;
|
|
top: 0;
|
|
left: 0;
|
|
height: 100%;
|
|
background: var(--accent);
|
|
background: linear-gradient(90deg,var(--buttonGradateA),var(--buttonGradateB));
|
|
transition: width 1s ease;
|
|
}
|
|
|
|
.fg {
|
|
position: relative;
|
|
display: inline-block;
|
|
padding: 3px 5px;
|
|
background: var(--panel);
|
|
border-radius: 3px;
|
|
}
|
|
|
|
.info {
|
|
color: var(--fg);
|
|
}
|
|
|
|
.done {
|
|
.choice {
|
|
cursor: default;
|
|
}
|
|
}
|
|
</style>
|