diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-09-04 13:33:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-04 13:33:38 +0900 |
| commit | 1f7a81aae71f85a47393491a7795b953e2427041 (patch) | |
| tree | 5da5ed9d86ca7e536b789da26a350796e9a7a3dd /packages/frontend/src/components | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | misskey-1f7a81aae71f85a47393491a7795b953e2427041.tar.gz misskey-1f7a81aae71f85a47393491a7795b953e2427041.tar.bz2 misskey-1f7a81aae71f85a47393491a7795b953e2427041.zip | |
update deps (#11764)
* update deps
* node16
* wip
* wip
* wip
* Update test-utils.ts
* wip
* Update tsconfig.json
* wip
* Update package.json
* wip
* Update following.vue
* Update followers.vue
* Update index.vue
* Update share.vue
* Update MkUserPopup.vue
* Update MkPostForm.vue
* wip
* Update MkTokenGenerateWindow.vue
* Update MkPagination.vue
* refactor
* update deps
* update deps
* Update sw.ts
* wip
* wip
* wip
* Update FetchInstanceMetadataService.ts
* Update FetchInstanceMetadataService.ts
* update node
* update deps
* :art:
Diffstat (limited to 'packages/frontend/src/components')
45 files changed, 133 insertions, 135 deletions
diff --git a/packages/frontend/src/components/MkAccountMoved.vue b/packages/frontend/src/components/MkAccountMoved.vue index 7d39063580..e68efb1a3b 100644 --- a/packages/frontend/src/components/MkAccountMoved.vue +++ b/packages/frontend/src/components/MkAccountMoved.vue @@ -13,13 +13,13 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { ref } from 'vue'; -import { UserLite } from 'misskey-js/built/entities'; +import * as Misskey from 'misskey-js'; import MkMention from './MkMention.vue'; import { i18n } from '@/i18n'; import { host as localHost } from '@/config'; import { api } from '@/os'; -const user = ref<UserLite>(); +const user = ref<Misskey.entities.UserLite>(); const props = defineProps<{ movedTo: string; // user id diff --git a/packages/frontend/src/components/MkAchievements.vue b/packages/frontend/src/components/MkAchievements.vue index 2f82f9a64b..f9d62773f5 100644 --- a/packages/frontend/src/components/MkAchievements.vue +++ b/packages/frontend/src/components/MkAchievements.vue @@ -52,14 +52,14 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { onMounted } from 'vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { ACHIEVEMENT_TYPES, ACHIEVEMENT_BADGES, claimAchievement } from '@/scripts/achievements'; const props = withDefaults(defineProps<{ - user: misskey.entities.User; + user: Misskey.entities.User; withLocked: boolean; withDescription: boolean; }>(), { diff --git a/packages/frontend/src/components/MkAnnouncementDialog.vue b/packages/frontend/src/components/MkAnnouncementDialog.vue index 8e11053813..0b97911e18 100644 --- a/packages/frontend/src/components/MkAnnouncementDialog.vue +++ b/packages/frontend/src/components/MkAnnouncementDialog.vue @@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { onMounted, shallowRef } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import * as os from '@/os'; import MkModal from '@/components/MkModal.vue'; import MkButton from '@/components/MkButton.vue'; @@ -31,7 +31,7 @@ import { i18n } from '@/i18n'; import { $i, updateAccount } from '@/account'; const props = withDefaults(defineProps<{ - announcement: misskey.entities.Announcement; + announcement: Misskey.entities.Announcement; }>(), { }); diff --git a/packages/frontend/src/components/MkAvatars.vue b/packages/frontend/src/components/MkAvatars.vue index 3c482f1661..b52ba5b7cd 100644 --- a/packages/frontend/src/components/MkAvatars.vue +++ b/packages/frontend/src/components/MkAvatars.vue @@ -14,8 +14,8 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { onMounted, ref } from 'vue'; +import * as Misskey from 'misskey-js'; import * as os from '@/os'; -import { UserLite } from 'misskey-js/built/entities'; const props = withDefaults(defineProps<{ userIds: string[]; @@ -24,11 +24,11 @@ const props = withDefaults(defineProps<{ limit: Infinity, }); -const users = ref<UserLite[]>([]); +const users = ref<Misskey.entities.UserLite[]>([]); onMounted(async () => { users.value = await os.api('users/show', { userIds: props.userIds, - }) as unknown as UserLite[]; + }) as unknown as Misskey.entities.UserLite[]; }); </script> diff --git a/packages/frontend/src/components/MkCropperDialog.vue b/packages/frontend/src/components/MkCropperDialog.vue index 7511dbf243..eef2d10bf2 100644 --- a/packages/frontend/src/components/MkCropperDialog.vue +++ b/packages/frontend/src/components/MkCropperDialog.vue @@ -32,7 +32,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { onMounted } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import Cropper from 'cropperjs'; import tinycolor from 'tinycolor2'; import MkModalWindow from '@/components/MkModalWindow.vue'; @@ -44,13 +44,13 @@ import { i18n } from '@/i18n'; import { getProxiedImageUrl } from '@/scripts/media-proxy'; const emit = defineEmits<{ - (ev: 'ok', cropped: misskey.entities.DriveFile): void; + (ev: 'ok', cropped: Misskey.entities.DriveFile): void; (ev: 'cancel'): void; (ev: 'closed'): void; }>(); const props = defineProps<{ - file: misskey.entities.DriveFile; + file: Misskey.entities.DriveFile; aspectRatio: number; uploadFolder?: string | null; }>(); @@ -62,7 +62,7 @@ let cropper: Cropper | null = null; let loading = $ref(true); const ok = async () => { - const promise = new Promise<misskey.entities.DriveFile>(async (res) => { + const promise = new Promise<Misskey.entities.DriveFile>(async (res) => { const croppedCanvas = await cropper?.getCropperSelection()?.$toCanvas(); croppedCanvas?.toBlob(blob => { if (!blob) return; diff --git a/packages/frontend/src/components/MkCwButton.vue b/packages/frontend/src/components/MkCwButton.vue index ddf38b6556..813498206b 100644 --- a/packages/frontend/src/components/MkCwButton.vue +++ b/packages/frontend/src/components/MkCwButton.vue @@ -12,13 +12,13 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { computed } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { concat } from '@/scripts/array'; import { i18n } from '@/i18n'; const props = defineProps<{ modelValue: boolean; - note: misskey.entities.Note; + note: Misskey.entities.Note; }>(); const emit = defineEmits<{ diff --git a/packages/frontend/src/components/MkFileListForAdmin.vue b/packages/frontend/src/components/MkFileListForAdmin.vue index 0534bd3ae4..400da420f0 100644 --- a/packages/frontend/src/components/MkFileListForAdmin.vue +++ b/packages/frontend/src/components/MkFileListForAdmin.vue @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only <MkA v-for="file in items" :key="file.id" - v-tooltip.mfm="`${file.type}\n${bytes(file.size)}\n${dateString(file.createdAt)}\nby ${file.user ? '@' + Acct.toString(file.user) : 'system'}`" + v-tooltip.mfm="`${file.type}\n${bytes(file.size)}\n${dateString(file.createdAt)}\nby ${file.user ? '@' + Misskey.acct.toString(file.user) : 'system'}`" :to="`/admin/file/${file.id}`" class="file _button" > @@ -37,7 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import * as Acct from 'misskey-js/built/acct'; +import * as Misskey from 'misskey-js'; import MkPagination from '@/components/MkPagination.vue'; import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue'; import bytes from '@/filters/bytes'; diff --git a/packages/frontend/src/components/MkFlashPreview.vue b/packages/frontend/src/components/MkFlashPreview.vue index ebfff422a9..f99f91d89a 100644 --- a/packages/frontend/src/components/MkFlashPreview.vue +++ b/packages/frontend/src/components/MkFlashPreview.vue @@ -23,7 +23,7 @@ import { } from 'vue'; import { userName } from '@/filters/user'; const props = defineProps<{ - //flash: misskey.entities.Flash; + //flash: Misskey.entities.Flash; flash: any; }>(); </script> diff --git a/packages/frontend/src/components/MkGalleryPostPreview.vue b/packages/frontend/src/components/MkGalleryPostPreview.vue index ffbb201b52..5ac64aae31 100644 --- a/packages/frontend/src/components/MkGalleryPostPreview.vue +++ b/packages/frontend/src/components/MkGalleryPostPreview.vue @@ -32,13 +32,13 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { computed, ref } from 'vue'; import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue'; import { defaultStore } from '@/store'; const props = defineProps<{ - post: misskey.entities.GalleryPost; + post: Misskey.entities.GalleryPost; }>(); const hover = ref(false); diff --git a/packages/frontend/src/components/MkInstanceCardMini.vue b/packages/frontend/src/components/MkInstanceCardMini.vue index e755c7b6e9..ed8d466c07 100644 --- a/packages/frontend/src/components/MkInstanceCardMini.vue +++ b/packages/frontend/src/components/MkInstanceCardMini.vue @@ -15,13 +15,13 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkMiniChart from '@/components/MkMiniChart.vue'; import * as os from '@/os'; import { getProxiedImageUrlNullable } from '@/scripts/media-proxy'; const props = defineProps<{ - instance: misskey.entities.Instance; + instance: Misskey.entities.Instance; }>(); let chartValues = $ref<number[] | null>(null); diff --git a/packages/frontend/src/components/MkInviteCode.vue b/packages/frontend/src/components/MkInviteCode.vue index 1b780dfee4..e529ff4f91 100644 --- a/packages/frontend/src/components/MkInviteCode.vue +++ b/packages/frontend/src/components/MkInviteCode.vue @@ -59,7 +59,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { computed } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkFolder from '@/components/MkFolder.vue'; import MkButton from '@/components/MkButton.vue'; import copyToClipboard from '@/scripts/copy-to-clipboard'; @@ -67,7 +67,7 @@ import { i18n } from '@/i18n'; import * as os from '@/os'; const props = defineProps<{ - invite: misskey.entities.Invite; + invite: Misskey.entities.Invite; moderator?: boolean; }>(); diff --git a/packages/frontend/src/components/MkMediaBanner.vue b/packages/frontend/src/components/MkMediaBanner.vue index eb6a6215a2..e0761a9dfe 100644 --- a/packages/frontend/src/components/MkMediaBanner.vue +++ b/packages/frontend/src/components/MkMediaBanner.vue @@ -34,12 +34,12 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { onMounted } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { soundConfigStore } from '@/scripts/sound'; import { i18n } from '@/i18n'; const props = withDefaults(defineProps<{ - media: misskey.entities.DriveFile; + media: Misskey.entities.DriveFile; }>(), { }); diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue index bcaabb820a..edfd6a72e8 100644 --- a/packages/frontend/src/components/MkMediaImage.vue +++ b/packages/frontend/src/components/MkMediaImage.vue @@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { watch } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { getStaticImageUrl } from '@/scripts/media-proxy'; import bytes from '@/filters/bytes'; import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue'; @@ -55,7 +55,7 @@ import * as os from '@/os'; import { iAmModerator } from '@/account'; const props = defineProps<{ - image: misskey.entities.DriveFile; + image: Misskey.entities.DriveFile; raw?: boolean; }>(); diff --git a/packages/frontend/src/components/MkMediaList.vue b/packages/frontend/src/components/MkMediaList.vue index 3efccd2e94..4c1017ea8f 100644 --- a/packages/frontend/src/components/MkMediaList.vue +++ b/packages/frontend/src/components/MkMediaList.vue @@ -64,7 +64,7 @@ async function getClientWidthWithCache(targetEl: HTMLElement, containerEl: HTMLE <script lang="ts" setup> import { onMounted, onUnmounted, shallowRef } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import PhotoSwipeLightbox from 'photoswipe/lightbox'; import PhotoSwipe from 'photoswipe'; import 'photoswipe/style.css'; @@ -77,7 +77,7 @@ import { defaultStore } from '@/store'; import { getScrollContainer, getBodyScrollHeight } from '@/scripts/scroll'; const props = defineProps<{ - mediaList: misskey.entities.DriveFile[]; + mediaList: Misskey.entities.DriveFile[]; raw?: boolean; }>(); @@ -252,7 +252,7 @@ onUnmounted(() => { lightbox = null; }); -const previewable = (file: misskey.entities.DriveFile): boolean => { +const previewable = (file: Misskey.entities.DriveFile): boolean => { if (file.type === 'image/svg+xml') return true; // svgのwebpublic/thumbnailはpngなのでtrue // FILE_TYPE_BROWSERSAFEに適合しないものはブラウザで表示するのに不適切 return (file.type.startsWith('video') || file.type.startsWith('image')) && FILE_TYPE_BROWSERSAFE.includes(file.type); diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue index d5d7ea9597..28a957436c 100644 --- a/packages/frontend/src/components/MkMediaVideo.vue +++ b/packages/frontend/src/components/MkMediaVideo.vue @@ -32,13 +32,13 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { ref } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import bytes from '@/filters/bytes'; import { defaultStore } from '@/store'; import { i18n } from '@/i18n'; const props = defineProps<{ - video: misskey.entities.DriveFile; + video: Misskey.entities.DriveFile; }>(); const hide = ref((defaultStore.state.nsfw === 'force' || defaultStore.state.enableDataSaverMode) ? true : (props.video.isSensitive && defaultStore.state.nsfw !== 'ignore')); diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 6cd1a4c4b5..22610b2253 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -140,7 +140,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { computed, inject, onMounted, ref, shallowRef, Ref, defineAsyncComponent } from 'vue'; import * as mfm from 'mfm-js'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkNoteSub from '@/components/MkNoteSub.vue'; import MkNoteHeader from '@/components/MkNoteHeader.vue'; import MkNoteSimple from '@/components/MkNoteSimple.vue'; @@ -173,12 +173,12 @@ import { showMovedDialog } from '@/scripts/show-moved-dialog'; import { shouldCollapsed } from '@/scripts/collapsed'; const props = defineProps<{ - note: misskey.entities.Note; + note: Misskey.entities.Note; pinned?: boolean; }>(); const inChannel = inject('inChannel', null); -const currentClip = inject<Ref<misskey.entities.Clip> | null>('currentClip', null); +const currentClip = inject<Ref<Misskey.entities.Clip> | null>('currentClip', null); let note = $ref(deepClone(props.note)); @@ -206,7 +206,7 @@ const renoteButton = shallowRef<HTMLElement>(); const renoteTime = shallowRef<HTMLElement>(); const reactButton = shallowRef<HTMLElement>(); const clipButton = shallowRef<HTMLElement>(); -let appearNote = $computed(() => isRenote ? note.renote as misskey.entities.Note : note); +let appearNote = $computed(() => isRenote ? note.renote as Misskey.entities.Note : note); const isMyRenote = $i && ($i.id === note.userId); const showContent = ref(false); const urls = appearNote.text ? extractUrlFromMfm(mfm.parse(appearNote.text)) : null; diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index 2a00b8db8e..f7578dd390 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -141,7 +141,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { computed, inject, onMounted, ref, shallowRef } from 'vue'; import * as mfm from 'mfm-js'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkNoteSub from '@/components/MkNoteSub.vue'; import MkNoteSimple from '@/components/MkNoteSimple.vue'; import MkReactionsViewer from '@/components/MkReactionsViewer.vue'; @@ -171,7 +171,7 @@ import MkRippleEffect from '@/components/MkRippleEffect.vue'; import { showMovedDialog } from '@/scripts/show-moved-dialog'; const props = defineProps<{ - note: misskey.entities.Note; + note: Misskey.entities.Note; }>(); const inChannel = inject('inChannel', null); @@ -202,7 +202,7 @@ const renoteButton = shallowRef<HTMLElement>(); const renoteTime = shallowRef<HTMLElement>(); const reactButton = shallowRef<HTMLElement>(); const clipButton = shallowRef<HTMLElement>(); -let appearNote = $computed(() => isRenote ? note.renote as misskey.entities.Note : note); +let appearNote = $computed(() => isRenote ? note.renote as Misskey.entities.Note : note); const isMyRenote = $i && ($i.id === note.userId); const showContent = ref(false); const isDeleted = ref(false); @@ -211,8 +211,8 @@ const translation = ref(null); const translating = ref(false); const urls = appearNote.text ? extractUrlFromMfm(mfm.parse(appearNote.text)) : null; const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance); -const conversation = ref<misskey.entities.Note[]>([]); -const replies = ref<misskey.entities.Note[]>([]); +const conversation = ref<Misskey.entities.Note[]>([]); +const replies = ref<Misskey.entities.Note[]>([]); const canRenote = computed(() => ['public', 'home'].includes(appearNote.visibility) || appearNote.userId === $i.id); const keymap = { diff --git a/packages/frontend/src/components/MkNoteHeader.vue b/packages/frontend/src/components/MkNoteHeader.vue index fcde45405e..81d0c1f9c2 100644 --- a/packages/frontend/src/components/MkNoteHeader.vue +++ b/packages/frontend/src/components/MkNoteHeader.vue @@ -30,13 +30,13 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { i18n } from '@/i18n'; import { notePage } from '@/filters/note'; import { userPage } from '@/filters/user'; defineProps<{ - note: misskey.entities.Note; + note: Misskey.entities.Note; }>(); </script> diff --git a/packages/frontend/src/components/MkNoteSimple.vue b/packages/frontend/src/components/MkNoteSimple.vue index e3c9e2bd5f..a27f6bbf64 100644 --- a/packages/frontend/src/components/MkNoteSimple.vue +++ b/packages/frontend/src/components/MkNoteSimple.vue @@ -23,14 +23,14 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkNoteHeader from '@/components/MkNoteHeader.vue'; import MkSubNoteContent from '@/components/MkSubNoteContent.vue'; import MkCwButton from '@/components/MkCwButton.vue'; import { $i } from '@/account'; const props = defineProps<{ - note: misskey.entities.Note; + note: Misskey.entities.Note; }>(); const showContent = $ref(false); diff --git a/packages/frontend/src/components/MkNoteSub.vue b/packages/frontend/src/components/MkNoteSub.vue index 64cf476545..cdf2d70c3e 100644 --- a/packages/frontend/src/components/MkNoteSub.vue +++ b/packages/frontend/src/components/MkNoteSub.vue @@ -41,7 +41,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { ref } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkNoteHeader from '@/components/MkNoteHeader.vue'; import MkSubNoteContent from '@/components/MkSubNoteContent.vue'; import MkCwButton from '@/components/MkCwButton.vue'; @@ -54,7 +54,7 @@ import { checkWordMute } from "@/scripts/check-word-mute"; import { defaultStore } from "@/store"; const props = withDefaults(defineProps<{ - note: misskey.entities.Note; + note: Misskey.entities.Note; detail?: boolean; // how many notes are in between this one and the note being viewed in detail @@ -66,7 +66,7 @@ const props = withDefaults(defineProps<{ const muted = ref(checkWordMute(props.note, $i, defaultStore.state.mutedWords)); let showContent = $ref(false); -let replies: misskey.entities.Note[] = $ref([]); +let replies: Misskey.entities.Note[] = $ref([]); if (props.detail) { os.api('notes/children', { diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue index 98fd1734df..d46e8de553 100644 --- a/packages/frontend/src/components/MkNotification.vue +++ b/packages/frontend/src/components/MkNotification.vue @@ -101,7 +101,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { ref, shallowRef } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkReactionIcon from '@/components/MkReactionIcon.vue'; import MkFollowButton from '@/components/MkFollowButton.vue'; import XReactionTooltip from '@/components/MkReactionTooltip.vue'; @@ -115,7 +115,7 @@ import { useTooltip } from '@/scripts/use-tooltip'; import { $i } from '@/account'; const props = withDefaults(defineProps<{ - notification: misskey.entities.Notification; + notification: Misskey.entities.Notification; withTime?: boolean; full?: boolean; }>(), { diff --git a/packages/frontend/src/components/MkPagePreview.vue b/packages/frontend/src/components/MkPagePreview.vue index c1ee67e767..53920da50d 100644 --- a/packages/frontend/src/components/MkPagePreview.vue +++ b/packages/frontend/src/components/MkPagePreview.vue @@ -21,11 +21,11 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { userName } from '@/filters/user'; const props = defineProps<{ - page: misskey.entities.Page; + page: Misskey.entities.Page; }>(); </script> diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue index 7618832171..1a770fbd19 100644 --- a/packages/frontend/src/components/MkPagination.vue +++ b/packages/frontend/src/components/MkPagination.vue @@ -44,7 +44,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts"> import { computed, ComputedRef, isRef, nextTick, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, watch } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import * as os from '@/os'; import { onScrollTop, isTopVisible, getBodyScrollHeight, getScrollContainer, onScrollBottom, scrollToBottom, scroll, isBottomVisible } from '@/scripts/scroll'; import { useDocumentVisibility } from '@/scripts/use-document-visibility'; @@ -57,10 +57,10 @@ const SECOND_FETCH_LIMIT = 30; const TOLERANCE = 16; const APPEAR_MINIMUM_INTERVAL = 600; -export type Paging<E extends keyof misskey.Endpoints = keyof misskey.Endpoints> = { +export type Paging<E extends keyof Misskey.Endpoints = keyof Misskey.Endpoints> = { endpoint: E; limit: number; - params?: misskey.Endpoints[E]['req'] | ComputedRef<misskey.Endpoints[E]['req']>; + params?: Misskey.Endpoints[E]['req'] | ComputedRef<Misskey.Endpoints[E]['req']>; /** * 検索APIのような、ページング不可なエンドポイントを利用する場合 diff --git a/packages/frontend/src/components/MkPoll.vue b/packages/frontend/src/components/MkPoll.vue index 6fb920dd02..2889644247 100644 --- a/packages/frontend/src/components/MkPoll.vue +++ b/packages/frontend/src/components/MkPoll.vue @@ -28,7 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { computed, ref } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { sum } from '@/scripts/array'; import { pleaseLogin } from '@/scripts/please-login'; import * as os from '@/os'; @@ -36,7 +36,7 @@ import { i18n } from '@/i18n'; import { useInterval } from '@/scripts/use-interval'; const props = defineProps<{ - note: misskey.entities.Note; + note: Misskey.entities.Note; readOnly?: boolean; }>(); diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index cbf0d8d871..f29995d849 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -100,10 +100,9 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { inject, watch, nextTick, onMounted, defineAsyncComponent } from 'vue'; import * as mfm from 'mfm-js'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import insertTextAtCursor from 'insert-text-at-cursor'; import { toASCII } from 'punycode/'; -import * as Acct from 'misskey-js/built/acct'; import MkNoteSimple from '@/components/MkNoteSimple.vue'; import MkNotePreview from '@/components/MkNotePreview.vue'; import XPostFormAttaches from '@/components/MkPostFormAttaches.vue'; @@ -129,17 +128,17 @@ import { claimAchievement } from '@/scripts/achievements'; const modal = inject('modal'); const props = withDefaults(defineProps<{ - reply?: misskey.entities.Note; - renote?: misskey.entities.Note; - channel?: misskey.entities.Channel; // TODO - mention?: misskey.entities.User; - specified?: misskey.entities.User; + reply?: Misskey.entities.Note; + renote?: Misskey.entities.Note; + channel?: Misskey.entities.Channel; // TODO + mention?: Misskey.entities.User; + specified?: Misskey.entities.User; initialText?: string; - initialVisibility?: (typeof misskey.noteVisibilities)[number]; - initialFiles?: misskey.entities.DriveFile[]; + initialVisibility?: (typeof Misskey.noteVisibilities)[number]; + initialFiles?: Misskey.entities.DriveFile[]; initialLocalOnly?: boolean; - initialVisibleUsers?: misskey.entities.User[]; - initialNote?: misskey.entities.Note; + initialVisibleUsers?: Misskey.entities.User[]; + initialNote?: Misskey.entities.Note; instant?: boolean; fixed?: boolean; autofocus?: boolean; @@ -175,7 +174,7 @@ let showPreview = $ref(defaultStore.state.showPreview); watch($$(showPreview), () => defaultStore.set('showPreview', showPreview)); let cw = $ref<string | null>(null); let localOnly = $ref<boolean>(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); @@ -416,7 +415,7 @@ function updateFileName(file, name) { files[files.findIndex(x => x.id === file.id)].name = name; } -function replaceFile(file: misskey.entities.DriveFile, newFile: misskey.entities.DriveFile): void { +function replaceFile(file: Misskey.entities.DriveFile, newFile: Misskey.entities.DriveFile): void { files[files.findIndex(x => x.id === file.id)] = newFile; } @@ -516,7 +515,7 @@ function addVisibleUser() { pushVisibleUser(user); if (!text.toLowerCase().includes(`@${user.username.toLowerCase()}`)) { - text = `@${Acct.toString(user)} ${text}`; + text = `@${Misskey.acct.toString(user)} ${text}`; } }); } @@ -761,7 +760,7 @@ async function post(ev?: MouseEvent) { 'https://youtu.be/Efrlqw8ytg4', 'https://www.youtube.com/watch?v=Efrlqw8ytg4', 'https://m.youtube.com/watch?v=Efrlqw8ytg4', - + 'https://youtu.be/XVCwzwxdHuA', 'https://www.youtube.com/watch?v=XVCwzwxdHuA', 'https://m.youtube.com/watch?v=XVCwzwxdHuA', @@ -804,7 +803,7 @@ function cancel() { function insertMention() { os.selectUser().then(user => { - insertTextAtCursor(textareaEl, '@' + Acct.toString(user) + ' '); + insertTextAtCursor(textareaEl, '@' + Misskey.acct.toString(user) + ' '); }); } @@ -825,7 +824,7 @@ function showActions(ev) { })), ev.currentTarget ?? ev.target); } -let postAccount = $ref<misskey.entities.UserDetailed | null>(null); +let postAccount = $ref<Misskey.entities.UserDetailed | null>(null); function openAccountMenu(ev: MouseEvent) { openAccountMenu_({ diff --git a/packages/frontend/src/components/MkPostFormAttaches.vue b/packages/frontend/src/components/MkPostFormAttaches.vue index fa47130c01..8fee0d80f0 100644 --- a/packages/frontend/src/components/MkPostFormAttaches.vue +++ b/packages/frontend/src/components/MkPostFormAttaches.vue @@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { defineAsyncComponent } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; @@ -36,9 +36,9 @@ const props = defineProps<{ const emit = defineEmits<{ (ev: 'update:modelValue', value: any[]): void; (ev: 'detach', id: string): void; - (ev: 'changeSensitive', file: misskey.entities.DriveFile, isSensitive: boolean): void; - (ev: 'changeName', file: misskey.entities.DriveFile, newName: string): void; - (ev: 'replaceFile', file: misskey.entities.DriveFile, newFile: misskey.entities.DriveFile): void; + (ev: 'changeSensitive', file: Misskey.entities.DriveFile, isSensitive: boolean): void; + (ev: 'changeName', file: Misskey.entities.DriveFile, newName: string): void; + (ev: 'replaceFile', file: Misskey.entities.DriveFile, newFile: Misskey.entities.DriveFile): void; }>(); let menuShowing = false; @@ -92,12 +92,12 @@ async function describe(file) { }, 'closed'); } -async function crop(file: misskey.entities.DriveFile): Promise<void> { +async function crop(file: Misskey.entities.DriveFile): Promise<void> { const newFile = await os.cropImage(file, { aspectRatio: NaN }); emit('replaceFile', file, newFile); } -function showFileMenu(file: misskey.entities.DriveFile, ev: MouseEvent): void { +function showFileMenu(file: Misskey.entities.DriveFile, ev: MouseEvent): void { if (menuShowing) return; const isImage = file.type.startsWith('image/'); diff --git a/packages/frontend/src/components/MkPostFormDialog.vue b/packages/frontend/src/components/MkPostFormDialog.vue index e1af0799e1..c07a166a83 100644 --- a/packages/frontend/src/components/MkPostFormDialog.vue +++ b/packages/frontend/src/components/MkPostFormDialog.vue @@ -11,22 +11,22 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkModal from '@/components/MkModal.vue'; import MkPostForm from '@/components/MkPostForm.vue'; const props = defineProps<{ - reply?: misskey.entities.Note; - renote?: misskey.entities.Note; + reply?: Misskey.entities.Note; + renote?: Misskey.entities.Note; channel?: any; // TODO - mention?: misskey.entities.User; - specified?: misskey.entities.User; + mention?: Misskey.entities.User; + specified?: Misskey.entities.User; initialText?: string; - initialVisibility?: typeof misskey.noteVisibilities; - initialFiles?: misskey.entities.DriveFile[]; + initialVisibility?: typeof Misskey.noteVisibilities; + initialFiles?: Misskey.entities.DriveFile[]; initialLocalOnly?: boolean; - initialVisibleUsers?: misskey.entities.User[]; - initialNote?: misskey.entities.Note; + initialVisibleUsers?: Misskey.entities.User[]; + initialNote?: Misskey.entities.Note; instant?: boolean; fixed?: boolean; autofocus?: boolean; diff --git a/packages/frontend/src/components/MkReactedUsersDialog.vue b/packages/frontend/src/components/MkReactedUsersDialog.vue index 38fa1085fc..b5f3a634a3 100644 --- a/packages/frontend/src/components/MkReactedUsersDialog.vue +++ b/packages/frontend/src/components/MkReactedUsersDialog.vue @@ -40,7 +40,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { onMounted, watch } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkModalWindow from '@/components/MkModalWindow.vue'; import MkReactionIcon from '@/components/MkReactionIcon.vue'; import MkUserCardMini from '@/components/MkUserCardMini.vue'; @@ -54,12 +54,12 @@ const emit = defineEmits<{ }>(); const props = defineProps<{ - noteId: misskey.entities.Note['id']; + noteId: Misskey.entities.Note['id']; }>(); const dialog = $shallowRef<InstanceType<typeof MkModalWindow>>(); -let note = $ref<misskey.entities.Note>(); +let note = $ref<Misskey.entities.Note>(); let tab = $ref<string>(); let reactions = $ref<string[]>(); let users = $ref(); diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue index baf4796d2f..2bc88907a8 100644 --- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue +++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue @@ -18,7 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { computed, onMounted, shallowRef, watch } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import XDetails from '@/components/MkReactionsViewer.details.vue'; import MkReactionIcon from '@/components/MkReactionIcon.vue'; import * as os from '@/os'; @@ -33,7 +33,7 @@ const props = defineProps<{ reaction: string; count: number; isInitial: boolean; - note: misskey.entities.Note; + note: Misskey.entities.Note; }>(); const buttonEl = shallowRef<HTMLElement>(); diff --git a/packages/frontend/src/components/MkReactionsViewer.vue b/packages/frontend/src/components/MkReactionsViewer.vue index 74ec69b036..c0e7171ca6 100644 --- a/packages/frontend/src/components/MkReactionsViewer.vue +++ b/packages/frontend/src/components/MkReactionsViewer.vue @@ -18,13 +18,13 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { watch } from 'vue'; import XReaction from '@/components/MkReactionsViewer.reaction.vue'; import { defaultStore } from '@/store'; const props = withDefaults(defineProps<{ - note: misskey.entities.Note; + note: Misskey.entities.Note; maxNumber?: number; }>(), { maxNumber: Infinity, diff --git a/packages/frontend/src/components/MkRenotedUsersDialog.vue b/packages/frontend/src/components/MkRenotedUsersDialog.vue index 47a71629a3..5e6784bb9c 100644 --- a/packages/frontend/src/components/MkRenotedUsersDialog.vue +++ b/packages/frontend/src/components/MkRenotedUsersDialog.vue @@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { onMounted } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkModalWindow from '@/components/MkModalWindow.vue'; import MkUserCardMini from '@/components/MkUserCardMini.vue'; import { userPage } from '@/filters/user'; @@ -47,12 +47,12 @@ const emit = defineEmits<{ }>(); const props = defineProps<{ - noteId: misskey.entities.Note['id']; + noteId: Misskey.entities.Note['id']; }>(); const dialog = $shallowRef<InstanceType<typeof MkModalWindow>>(); -let note = $ref<misskey.entities.Note>(); +let note = $ref<Misskey.entities.Note>(); let renotes = $ref(); let users = $ref(); diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue index d1f6d284f3..b823ed4373 100644 --- a/packages/frontend/src/components/MkSubNoteContent.vue +++ b/packages/frontend/src/components/MkSubNoteContent.vue @@ -31,7 +31,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkMediaList from '@/components/MkMediaList.vue'; import MkPoll from '@/components/MkPoll.vue'; import { i18n } from '@/i18n'; @@ -39,7 +39,7 @@ import { $i } from '@/account'; import { shouldCollapsed } from '@/scripts/collapsed'; const props = defineProps<{ - note: misskey.entities.Note; + note: Misskey.entities.Note; }>(); const isLong = shouldCollapsed(props.note); diff --git a/packages/frontend/src/components/MkTokenGenerateWindow.vue b/packages/frontend/src/components/MkTokenGenerateWindow.vue index 265b8adc60..0c731f402c 100644 --- a/packages/frontend/src/components/MkTokenGenerateWindow.vue +++ b/packages/frontend/src/components/MkTokenGenerateWindow.vue @@ -40,7 +40,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { } from 'vue'; -import { permissions as kinds } from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkInput from './MkInput.vue'; import MkSwitch from './MkSwitch.vue'; import MkButton from './MkButton.vue'; @@ -74,7 +74,7 @@ if (props.initialPermissions) { permissions[kind] = true; } } else { - for (const kind of kinds) { + for (const kind of Misskey.permissions) { permissions[kind] = false; } } diff --git a/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue b/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue index ce41b3116d..7099d203c9 100644 --- a/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue +++ b/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue @@ -51,7 +51,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkModalWindow from '@/components/MkModalWindow.vue'; import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/MkInput.vue'; @@ -62,7 +62,7 @@ import MkSwitch from '@/components/MkSwitch.vue'; import MkRadios from '@/components/MkRadios.vue'; const props = defineProps<{ - user: misskey.entities.User, + user: Misskey.entities.User, announcement?: any, }>(); diff --git a/packages/frontend/src/components/MkUserCardMini.vue b/packages/frontend/src/components/MkUserCardMini.vue index 03539ccf18..416ffe833a 100644 --- a/packages/frontend/src/components/MkUserCardMini.vue +++ b/packages/frontend/src/components/MkUserCardMini.vue @@ -15,14 +15,14 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { onMounted } from 'vue'; import MkMiniChart from '@/components/MkMiniChart.vue'; import * as os from '@/os'; import { acct } from '@/filters/user'; const props = withDefaults(defineProps<{ - user: misskey.entities.User; + user: Misskey.entities.User; withChart: boolean; }>(), { withChart: true, diff --git a/packages/frontend/src/components/MkUserInfo.vue b/packages/frontend/src/components/MkUserInfo.vue index 8e89b672a0..f8384b31c5 100644 --- a/packages/frontend/src/components/MkUserInfo.vue +++ b/packages/frontend/src/components/MkUserInfo.vue @@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkFollowButton from '@/components/MkFollowButton.vue'; import number from '@/filters/number'; import { userPage } from '@/filters/user'; @@ -43,7 +43,7 @@ import { $i } from '@/account'; import { isFfVisibleForMe } from '@/scripts/isFfVisibleForMe'; defineProps<{ - user: misskey.entities.UserDetailed; + user: Misskey.entities.UserDetailed; }>(); </script> diff --git a/packages/frontend/src/components/MkUserOnlineIndicator.vue b/packages/frontend/src/components/MkUserOnlineIndicator.vue index 4d6df36106..217887e63c 100644 --- a/packages/frontend/src/components/MkUserOnlineIndicator.vue +++ b/packages/frontend/src/components/MkUserOnlineIndicator.vue @@ -17,11 +17,11 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { i18n } from '@/i18n'; const props = defineProps<{ - user: misskey.entities.User; + user: Misskey.entities.User; }>(); const text = $computed(() => { diff --git a/packages/frontend/src/components/MkUserPopup.vue b/packages/frontend/src/components/MkUserPopup.vue index be32af4cfc..8c173ffa70 100644 --- a/packages/frontend/src/components/MkUserPopup.vue +++ b/packages/frontend/src/components/MkUserPopup.vue @@ -56,8 +56,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { onMounted } from 'vue'; -import * as Acct from 'misskey-js/built/acct'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkFollowButton from '@/components/MkFollowButton.vue'; import { userPage } from '@/filters/user'; import * as os from '@/os'; @@ -81,7 +80,7 @@ const emit = defineEmits<{ }>(); const zIndex = os.claimZIndex('middle'); -let user = $ref<misskey.entities.UserDetailed | null>(null); +let user = $ref<Misskey.entities.UserDetailed | null>(null); let top = $ref(0); let left = $ref(0); @@ -95,7 +94,7 @@ onMounted(() => { user = props.q; } else { const query = props.q.startsWith('@') ? - Acct.parse(props.q.substring(1)) : + Misskey.acct.parse(props.q.substring(1)) : { userId: props.q }; os.api('users/show', query).then(res => { diff --git a/packages/frontend/src/components/MkUserSelectDialog.vue b/packages/frontend/src/components/MkUserSelectDialog.vue index 93409aad19..0d886c08a5 100644 --- a/packages/frontend/src/components/MkUserSelectDialog.vue +++ b/packages/frontend/src/components/MkUserSelectDialog.vue @@ -58,7 +58,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { onMounted } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkInput from '@/components/MkInput.vue'; import FormSplit from '@/components/form/split.vue'; import MkModalWindow from '@/components/MkModalWindow.vue'; @@ -69,7 +69,7 @@ import { $i } from '@/account'; import { hostname } from '@/config'; const emit = defineEmits<{ - (ev: 'ok', selected: misskey.entities.UserDetailed): void; + (ev: 'ok', selected: Misskey.entities.UserDetailed): void; (ev: 'cancel'): void; (ev: 'closed'): void; }>(); @@ -80,9 +80,9 @@ const props = defineProps<{ let username = $ref(''); let host = $ref(''); -let users: misskey.entities.UserDetailed[] = $ref([]); -let recentUsers: misskey.entities.UserDetailed[] = $ref([]); -let selected: misskey.entities.UserDetailed | null = $ref(null); +let users: Misskey.entities.UserDetailed[] = $ref([]); +let recentUsers: Misskey.entities.UserDetailed[] = $ref([]); +let selected: Misskey.entities.UserDetailed | null = $ref(null); let dialogEl = $ref(); const search = () => { diff --git a/packages/frontend/src/components/MkUserSetupDialog.User.vue b/packages/frontend/src/components/MkUserSetupDialog.User.vue index c14e44f053..d09890a4ca 100644 --- a/packages/frontend/src/components/MkUserSetupDialog.User.vue +++ b/packages/frontend/src/components/MkUserSetupDialog.User.vue @@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { ref } from 'vue'; import MkButton from '@/components/MkButton.vue'; import { i18n } from '@/i18n'; @@ -33,7 +33,7 @@ import { $i } from '@/account'; import * as os from '@/os'; const props = defineProps<{ - user: misskey.entities.UserDetailed; + user: Misskey.entities.UserDetailed; }>(); const isFollowing = ref(false); diff --git a/packages/frontend/src/components/MkVisibilityPicker.vue b/packages/frontend/src/components/MkVisibilityPicker.vue index 3b2de388b2..f3107f6d11 100644 --- a/packages/frontend/src/components/MkVisibilityPicker.vue +++ b/packages/frontend/src/components/MkVisibilityPicker.vue @@ -43,27 +43,27 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { nextTick } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkModal from '@/components/MkModal.vue'; import { i18n } from '@/i18n'; const modal = $shallowRef<InstanceType<typeof MkModal>>(); 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/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue index 902bdf3330..865ebe2ef9 100644 --- a/packages/frontend/src/components/MkVisitorDashboard.vue +++ b/packages/frontend/src/components/MkVisitorDashboard.vue @@ -52,7 +52,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { } from 'vue'; -import { Instance } from 'misskey-js/built/entities'; +import * as Misskey from 'misskey-js'; import XTimeline from './welcome.timeline.vue'; import XSigninDialog from '@/components/MkSigninDialog.vue'; import XSignupDialog from '@/components/MkSignupDialog.vue'; @@ -67,7 +67,7 @@ import number from '@/filters/number'; import MkNumber from '@/components/MkNumber.vue'; import XActiveUsersChart from '@/components/MkVisitorDashboard.ActiveUsersChart.vue'; -let meta = $ref<Instance>(); +let meta = $ref<Misskey.entities.Instance>(); let stats = $ref(null); os.api('meta', { detail: true }).then(_meta => { diff --git a/packages/frontend/src/components/global/MkAcct.vue b/packages/frontend/src/components/global/MkAcct.vue index 4ae6290a57..878986402d 100644 --- a/packages/frontend/src/components/global/MkAcct.vue +++ b/packages/frontend/src/components/global/MkAcct.vue @@ -15,14 +15,14 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts" setup> -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import { toUnicode } from 'punycode/'; import MkCondensedLine from './MkCondensedLine.vue'; import { host as hostRaw } from '@/config'; import { defaultStore } from '@/store'; defineProps<{ - user: misskey.entities.UserDetailed; + user: Misskey.entities.UserDetailed; detail?: boolean; }>(); diff --git a/packages/frontend/src/components/global/MkAvatar.vue b/packages/frontend/src/components/global/MkAvatar.vue index 86bdec2274..7c344ccf7c 100644 --- a/packages/frontend/src/components/global/MkAvatar.vue +++ b/packages/frontend/src/components/global/MkAvatar.vue @@ -28,7 +28,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { watch } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; import MkImgWithBlurhash from '../MkImgWithBlurhash.vue'; import MkA from './MkA.vue'; import { getStaticImageUrl } from '@/scripts/media-proxy'; @@ -42,7 +42,7 @@ const squareAvatars = $ref(defaultStore.state.squareAvatars); const useBlurEffect = $ref(defaultStore.state.useBlurEffect); const props = withDefaults(defineProps<{ - user: misskey.entities.User; + user: Misskey.entities.User; target?: string | null; link?: boolean; preview?: boolean; diff --git a/packages/frontend/src/components/global/MkUserName.vue b/packages/frontend/src/components/global/MkUserName.vue index 6cabb8e681..be283ea922 100644 --- a/packages/frontend/src/components/global/MkUserName.vue +++ b/packages/frontend/src/components/global/MkUserName.vue @@ -9,10 +9,10 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { } from 'vue'; -import * as misskey from 'misskey-js'; +import * as Misskey from 'misskey-js'; const props = withDefaults(defineProps<{ - user: misskey.entities.User; + user: Misskey.entities.User; nowrap?: boolean; }>(), { nowrap: true, |