From 31aed243e27ae5b15eeb750aac40ef7bb6be27aa Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 1 Sep 2023 19:30:39 +0900 Subject: [PATCH] wip --- packages/frontend/src/components/MkPostForm.vue | 4 ++-- packages/frontend/src/components/MkPostFormDialog.vue | 2 +- packages/frontend/src/components/MkVisibilityPicker.vue | 6 +++--- packages/frontend/src/pages/share.vue | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index e47e7792f1..f29995d849 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -134,7 +134,7 @@ const props = withDefaults(defineProps<{ mention?: Misskey.entities.User; specified?: Misskey.entities.User; initialText?: string; - initialVisibility?: (typeof misskey.noteVisibilities)[number]; + initialVisibility?: (typeof Misskey.noteVisibilities)[number]; initialFiles?: Misskey.entities.DriveFile[]; initialLocalOnly?: boolean; initialVisibleUsers?: Misskey.entities.User[]; @@ -174,7 +174,7 @@ let showPreview = $ref(defaultStore.state.showPreview); watch($$(showPreview), () => defaultStore.set('showPreview', showPreview)); let cw = $ref(null); let localOnly = $ref(props.initialLocalOnly ?? defaultStore.state.rememberNoteVisibility ? defaultStore.state.localOnly : defaultStore.state.defaultNoteLocalOnly); -let visibility = $ref(props.initialVisibility ?? (defaultStore.state.rememberNoteVisibility ? defaultStore.state.visibility : defaultStore.state.defaultNoteVisibility) as typeof misskey.noteVisibilities[number]); +let visibility = $ref(props.initialVisibility ?? (defaultStore.state.rememberNoteVisibility ? defaultStore.state.visibility : defaultStore.state.defaultNoteVisibility) as typeof Misskey.noteVisibilities[number]); let visibleUsers = $ref([]); if (props.initialVisibleUsers) { props.initialVisibleUsers.forEach(pushVisibleUser); diff --git a/packages/frontend/src/components/MkPostFormDialog.vue b/packages/frontend/src/components/MkPostFormDialog.vue index f776ff93c0..c07a166a83 100644 --- a/packages/frontend/src/components/MkPostFormDialog.vue +++ b/packages/frontend/src/components/MkPostFormDialog.vue @@ -22,7 +22,7 @@ const props = defineProps<{ mention?: Misskey.entities.User; specified?: Misskey.entities.User; initialText?: string; - initialVisibility?: typeof misskey.noteVisibilities; + initialVisibility?: typeof Misskey.noteVisibilities; initialFiles?: Misskey.entities.DriveFile[]; initialLocalOnly?: boolean; initialVisibleUsers?: Misskey.entities.User[]; diff --git a/packages/frontend/src/components/MkVisibilityPicker.vue b/packages/frontend/src/components/MkVisibilityPicker.vue index d125ce0f1b..f3107f6d11 100644 --- a/packages/frontend/src/components/MkVisibilityPicker.vue +++ b/packages/frontend/src/components/MkVisibilityPicker.vue @@ -50,20 +50,20 @@ import { i18n } from '@/i18n'; const modal = $shallowRef>(); const props = withDefaults(defineProps<{ - currentVisibility: typeof misskey.noteVisibilities[number]; + currentVisibility: typeof Misskey.noteVisibilities[number]; localOnly: boolean; src?: HTMLElement; }>(), { }); const emit = defineEmits<{ - (ev: 'changeVisibility', v: typeof misskey.noteVisibilities[number]): void; + (ev: 'changeVisibility', v: typeof Misskey.noteVisibilities[number]): void; (ev: 'closed'): void; }>(); let v = $ref(props.currentVisibility); -function choose(visibility: typeof misskey.noteVisibilities[number]): void { +function choose(visibility: typeof Misskey.noteVisibilities[number]): void { v = visibility; emit('changeVisibility', visibility); nextTick(() => { diff --git a/packages/frontend/src/pages/share.vue b/packages/frontend/src/pages/share.vue index 9a3686e3fa..4845fa7979 100644 --- a/packages/frontend/src/pages/share.vue +++ b/packages/frontend/src/pages/share.vue @@ -33,7 +33,6 @@ SPDX-License-Identifier: AGPL-3.0-only // SPECIFICATION: https://misskey-hub.net/docs/features/share-form.html import { } from 'vue'; -import { noteVisibilities } from 'misskey-js'; import * as Misskey from 'misskey-js'; import MkButton from '@/components/MkButton.vue'; import MkPostForm from '@/components/MkPostForm.vue'; @@ -44,7 +43,7 @@ import { i18n } from '@/i18n'; const urlParams = new URLSearchParams(window.location.search); const localOnlyQuery = urlParams.get('localOnly'); -const visibilityQuery = urlParams.get('visibility') as typeof noteVisibilities[number]; +const visibilityQuery = urlParams.get('visibility') as typeof Misskey.noteVisibilities[number]; let state = $ref('fetching' as 'fetching' | 'writing' | 'posted'); let title = $ref(urlParams.get('title')); @@ -53,7 +52,7 @@ const url = urlParams.get('url'); let initialText = $ref(); let reply = $ref(); let renote = $ref(); -let visibility = $ref(noteVisibilities.includes(visibilityQuery) ? visibilityQuery : undefined); +let visibility = $ref(Misskey.noteVisibilities.includes(visibilityQuery) ? visibilityQuery : undefined); let localOnly = $ref(localOnlyQuery === '0' ? false : localOnlyQuery === '1' ? true : undefined); let files = $ref([] as Misskey.entities.DriveFile[]); let visibleUsers = $ref([] as Misskey.entities.User[]);