merge: upstream

This commit is contained in:
Marie 2024-01-09 02:57:57 +01:00
commit 7552cea69a
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
413 changed files with 5517 additions and 2309 deletions

View file

@ -35,11 +35,13 @@ 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';
import { WithNonNullable } from '@/type.js';
const props = defineProps<{
note: Misskey.entities.Note;
note: WithNonNullable<Misskey.entities.Note, 'poll'>;
readOnly?: boolean;
}>();
@ -94,7 +96,7 @@ const vote = async (id) => {
if (canceled) return;
}
await os.api('notes/polls/vote', {
await misskeyApi('notes/polls/vote', {
noteId: props.note.id,
choice: id,
});