From 5d06aa5f13a72f6299049ea50a17d07cb81216b8 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 1 Sep 2023 16:27:33 -0700 Subject: [PATCH] chore: :rotating_light: lint --- .gitignore | 3 + packages/client/.eslintrc.json | 1 + packages/client/package.json | 27 +- packages/client/src/account.ts | 10 +- packages/client/src/components/MkDialog.vue | 6 +- .../client/src/components/MkDrive.file.vue | 6 +- .../client/src/components/MkDrive.folder.vue | 12 +- .../src/components/MkDrive.navFolder.vue | 10 +- packages/client/src/components/MkDrive.vue | 16 +- .../src/components/MkDriveFileThumbnail.vue | 2 +- .../src/components/MkDriveSelectDialog.vue | 2 +- .../client/src/components/MkDriveWindow.vue | 2 +- .../src/components/MkEmojiPicker.section.vue | 2 +- .../client/src/components/MkEmojiPicker.vue | 12 +- .../src/components/MkFeaturedPhotos.vue | 2 +- .../client/src/components/MkFollowButton.vue | 14 +- .../src/components/MkForgotPassword.vue | 9 +- packages/client/src/components/MkFormula.vue | 2 +- packages/client/src/components/MkHeatmap.vue | 8 +- .../client/src/components/MkImageViewer.vue | 1 - .../src/components/MkImgWithBlurhash.vue | 2 +- packages/client/src/components/MkInfo.vue | 2 +- .../src/components/MkInstanceCardMini.vue | 4 +- .../src/components/MkInstanceSelectDialog.vue | 10 +- .../client/src/components/MkInstanceStats.vue | 10 +- .../src/components/MkInstanceTicker.vue | 6 +- packages/client/src/components/MkMedia.vue | 6 +- .../client/src/components/MkMediaBanner.vue | 2 +- .../client/src/components/MkMediaList.vue | 6 +- .../client/src/components/MkMenu.child.vue | 2 +- packages/client/src/components/MkMenu.vue | 29 +- .../client/src/components/MkMiniChart.vue | 10 +- packages/client/src/components/MkModal.vue | 33 +- .../src/components/MkModalPageWindow.vue | 20 +- .../client/src/components/MkModalWindow.vue | 8 +- packages/client/src/components/MkNote.vue | 32 +- .../client/src/components/MkNoteDetailed.vue | 56 +- .../client/src/components/MkNoteHeader.vue | 3 +- .../client/src/components/MkNotePreview.vue | 4 +- .../client/src/components/MkNoteSimple.vue | 2 +- packages/client/src/components/MkNoteSub.vue | 28 +- packages/client/src/components/MkNotes.vue | 2 +- .../client/src/components/MkNotification.vue | 9 +- .../MkNotificationSettingWindow.vue | 7 +- .../src/components/MkNotificationToast.vue | 2 +- .../client/src/components/MkNotifications.vue | 9 +- .../client/src/components/MkPageWindow.vue | 12 +- .../client/src/components/MkPagination.vue | 38 +- packages/client/src/components/MkPoll.vue | 2 +- .../client/src/components/MkPollEditor.vue | 2 +- .../client/src/components/MkPopupMenu.vue | 6 +- packages/client/src/components/MkPostForm.vue | 58 +- .../src/components/MkPostFormAttaches.vue | 9 +- .../src/components/MkPostFormDialog.vue | 7 +- .../MkPushNotificationAllowButton.vue | 10 +- .../client/src/components/MkReactedUsers.vue | 12 +- .../components/MkReactionsViewer.reaction.vue | 2 +- .../src/components/MkReactionsViewer.vue | 2 +- .../client/src/components/MkRenoteButton.vue | 10 +- .../src/components/MkShowMoreButton.vue | 2 +- packages/client/src/components/MkSignin.vue | 24 +- .../client/src/components/MkSigninDialog.vue | 1 - packages/client/src/components/MkSignup.vue | 34 +- packages/client/src/components/MkSparkle.vue | 4 +- .../src/components/MkStarButtonNoEmoji.vue | 2 +- .../src/components/MkSubNoteContent.vue | 24 +- packages/client/src/components/MkTagCloud.vue | 14 +- packages/client/src/components/MkTimeline.vue | 16 +- packages/client/src/components/MkToast.vue | 2 +- .../src/components/MkTokenGenerateWindow.vue | 11 +- .../src/components/MkTutorialDialog.vue | 2 +- packages/client/src/components/MkUpdated.vue | 6 +- .../client/src/components/MkUrlPreview.vue | 28 +- .../src/components/MkUrlPreviewPopup.vue | 4 +- .../client/src/components/MkUserCardMini.vue | 4 +- packages/client/src/components/MkUserInfo.vue | 6 +- packages/client/src/components/MkUserList.vue | 3 +- .../src/components/MkUserOnlineIndicator.vue | 2 +- .../client/src/components/MkUserPreview.vue | 8 +- .../src/components/MkUserSelectDialog.vue | 18 +- .../components/MkUserSelectLocalDialog.vue | 16 +- .../client/src/components/MkUsersTooltip.vue | 2 +- .../client/src/components/MkVisibility.vue | 6 +- .../src/components/MkVisibilityPicker.vue | 8 +- .../client/src/components/MkWaitingDialog.vue | 2 +- packages/client/src/components/MkWidgets.vue | 12 +- packages/client/src/components/MkWindow.vue | 22 +- .../client/src/components/form/checkbox.vue | 5 +- .../client/src/components/global/MkAvatar.vue | 4 +- .../src/components/global/MkPageHeader.vue | 4 +- .../components/global/MkStickyContainer.vue | 4 +- .../client/src/components/global/MkTime.vue | 4 +- .../src/components/global/RouterView.vue | 12 +- packages/client/src/components/global/i18n.ts | 2 +- packages/client/src/components/index.ts | 2 +- packages/client/src/components/mfm.ts | 2 +- .../client/src/components/page/page.block.vue | 7 +- .../src/components/page/page.button.vue | 7 +- .../src/components/page/page.canvas.vue | 7 +- .../src/components/page/page.counter.vue | 7 +- .../client/src/components/page/page.if.vue | 7 +- .../client/src/components/page/page.image.vue | 6 +- .../client/src/components/page/page.note.vue | 5 +- .../src/components/page/page.number-input.vue | 7 +- .../client/src/components/page/page.post.vue | 7 +- .../src/components/page/page.radio-button.vue | 9 +- .../src/components/page/page.section.vue | 7 +- .../src/components/page/page.switch.vue | 7 +- .../src/components/page/page.text-input.vue | 7 +- .../client/src/components/page/page.text.vue | 7 +- .../components/page/page.textarea-input.vue | 7 +- .../src/components/page/page.textarea.vue | 8 +- packages/client/src/components/page/page.vue | 19 +- .../client/src/directives/adaptive-border.ts | 2 +- packages/client/src/directives/anim.ts | 4 +- packages/client/src/directives/appear.ts | 2 +- packages/client/src/directives/click-anime.ts | 2 +- .../client/src/directives/follow-append.ts | 2 +- packages/client/src/directives/get-size.ts | 2 +- packages/client/src/directives/hotkey.ts | 2 +- packages/client/src/directives/index.ts | 2 +- packages/client/src/directives/panel.ts | 2 +- packages/client/src/directives/size.ts | 13 +- packages/client/src/directives/tooltip.ts | 5 +- .../client/src/directives/user-preview.ts | 3 +- packages/client/src/filters/user.ts | 2 +- packages/client/src/init.ts | 38 +- packages/client/src/instance.ts | 2 +- packages/client/src/navbar.ts | 2 +- packages/client/src/nirax.ts | 20 +- packages/client/src/os.ts | 37 +- packages/client/src/pages/_error_.vue | 2 +- packages/client/src/pages/about-firefish.vue | 6 +- packages/client/src/pages/about.vue | 10 +- packages/client/src/pages/admin-file.vue | 6 +- packages/client/src/pages/admin/_header_.vue | 6 +- .../client/src/pages/admin/announcements.vue | 3 +- .../client/src/pages/admin/email-settings.vue | 2 +- packages/client/src/pages/admin/emojis.vue | 2 +- .../client/src/pages/admin/experiments.vue | 8 +- packages/client/src/pages/admin/hashtags.vue | 2 +- packages/client/src/pages/admin/index.vue | 6 +- .../client/src/pages/admin/instance-block.vue | 2 +- .../client/src/pages/admin/integrations.vue | 2 +- .../client/src/pages/admin/object-storage.vue | 2 +- .../src/pages/admin/overview.active-users.vue | 4 +- .../src/pages/admin/overview.ap-requests.vue | 2 +- .../src/pages/admin/overview.metrics.vue | 2 +- .../src/pages/admin/overview.moderators.vue | 2 +- .../src/pages/admin/overview.queue-chart.vue | 18 +- .../src/pages/admin/overview.queue.chart.vue | 2 +- .../client/src/pages/admin/overview.user.vue | 2 +- packages/client/src/pages/admin/overview.vue | 6 +- .../client/src/pages/admin/promotions.vue | 4 +- .../client/src/pages/admin/proxy-account.vue | 2 +- .../src/pages/admin/queue.chart.chart.vue | 20 +- .../client/src/pages/admin/queue.chart.vue | 2 +- packages/client/src/pages/admin/queue.vue | 2 +- packages/client/src/pages/admin/relays.vue | 2 +- packages/client/src/pages/admin/security.vue | 2 +- packages/client/src/pages/admin/settings.vue | 2 +- packages/client/src/pages/admin/users.vue | 4 +- packages/client/src/pages/announcements.vue | 2 +- .../client/src/pages/antenna-timeline.vue | 2 +- packages/client/src/pages/api-console.vue | 4 +- packages/client/src/pages/auth.vue | 2 +- packages/client/src/pages/channel-editor.vue | 2 +- packages/client/src/pages/channel.vue | 2 +- packages/client/src/pages/channels.vue | 10 +- packages/client/src/pages/clip.vue | 2 +- packages/client/src/pages/explore.users.vue | 2 +- packages/client/src/pages/explore.vue | 4 +- packages/client/src/pages/follow-requests.vue | 10 +- packages/client/src/pages/gallery/edit.vue | 4 +- packages/client/src/pages/gallery/index.vue | 4 +- packages/client/src/pages/gallery/post.vue | 2 +- packages/client/src/pages/instance-info.vue | 8 +- packages/client/src/pages/messaging/index.vue | 6 +- .../pages/messaging/messaging-room.form.vue | 14 +- .../src/pages/messaging/messaging-room.vue | 15 +- .../client/src/pages/my-antennas/editor.vue | 4 +- .../client/src/pages/my-antennas/index.vue | 6 +- packages/client/src/pages/my-clips/index.vue | 2 +- packages/client/src/pages/my-groups/group.vue | 4 +- packages/client/src/pages/my-groups/index.vue | 2 +- packages/client/src/pages/my-lists/index.vue | 4 +- packages/client/src/pages/my-lists/list.vue | 6 +- packages/client/src/pages/note.vue | 6 +- packages/client/src/pages/notifications.vue | 2 +- .../page-editor/els/page-editor.el.note.vue | 2 +- .../els/page-editor.el.radio-button.vue | 2 +- .../pages/page-editor/page-editor.blocks.vue | 2 +- .../src/pages/page-editor/page-editor.vue | 6 +- packages/client/src/pages/page.vue | 4 +- packages/client/src/pages/pages.vue | 4 +- packages/client/src/pages/registry.keys.vue | 2 +- packages/client/src/pages/registry.value.vue | 2 +- packages/client/src/pages/registry.vue | 2 +- packages/client/src/pages/reset-password.vue | 2 +- packages/client/src/pages/search.vue | 4 +- packages/client/src/pages/settings/2fa.vue | 6 +- .../client/src/pages/settings/accounts.vue | 10 +- packages/client/src/pages/settings/api.vue | 2 +- .../src/pages/settings/custom-katex-macro.vue | 2 +- .../src/pages/settings/delete-account.vue | 2 +- packages/client/src/pages/settings/email.vue | 2 +- packages/client/src/pages/settings/index.vue | 2 +- .../client/src/pages/settings/migration.vue | 2 +- packages/client/src/pages/settings/navbar.vue | 2 +- .../src/pages/settings/notifications.vue | 2 +- .../src/pages/settings/plugin.install.vue | 6 +- .../pages/settings/preferences-backups.vue | 10 +- .../client/src/pages/settings/privacy.vue | 2 +- .../client/src/pages/settings/profile.vue | 2 +- .../client/src/pages/settings/reaction.vue | 4 +- .../client/src/pages/settings/security.vue | 2 +- .../src/pages/settings/theme.manage.vue | 3 +- .../client/src/pages/settings/word-mute.vue | 2 +- packages/client/src/pages/share.vue | 16 +- packages/client/src/pages/tag.vue | 4 +- packages/client/src/pages/theme-editor.vue | 5 +- packages/client/src/pages/timeline.vue | 8 +- packages/client/src/pages/user-info.vue | 8 +- .../client/src/pages/user-list-timeline.vue | 2 +- packages/client/src/pages/user/clips.vue | 2 +- .../client/src/pages/user/follow-list.vue | 2 +- packages/client/src/pages/user/followers.vue | 4 +- packages/client/src/pages/user/following.vue | 4 +- packages/client/src/pages/user/gallery.vue | 2 +- packages/client/src/pages/user/home.vue | 12 +- .../client/src/pages/user/index.activity.vue | 4 +- .../client/src/pages/user/index.photos.vue | 2 +- .../client/src/pages/user/index.timeline.vue | 4 +- packages/client/src/pages/user/index.vue | 2 +- packages/client/src/pages/user/pages.vue | 2 +- packages/client/src/pages/user/reactions.vue | 2 +- .../client/src/pages/welcome.entrance.a.vue | 2 +- .../client/src/pages/welcome.entrance.b.vue | 2 +- .../client/src/pages/welcome.timeline.vue | 10 +- packages/client/src/pizzax.ts | 8 +- packages/client/src/plugin.ts | 16 +- packages/client/src/router.ts | 5 +- packages/client/src/scripts/array.ts | 2 +- packages/client/src/scripts/autocomplete.ts | 14 +- packages/client/src/scripts/chart-vline.ts | 2 +- .../client/src/scripts/check-word-mute.ts | 12 +- packages/client/src/scripts/emojilist.ts | 4 +- packages/client/src/scripts/extract-mfm.ts | 2 +- .../client/src/scripts/format-time-string.ts | 4 +- .../client/src/scripts/gen-search-query.ts | 7 +- packages/client/src/scripts/get-note-menu.ts | 7 +- .../client/src/scripts/get-note-summary.ts | 2 +- packages/client/src/scripts/get-user-menu.ts | 8 +- packages/client/src/scripts/helpMenu.ts | 2 +- packages/client/src/scripts/hotkey.ts | 10 +- packages/client/src/scripts/hpml/block.ts | 4 +- packages/client/src/scripts/hpml/evaluator.ts | 17 +- packages/client/src/scripts/hpml/expr.ts | 11 +- packages/client/src/scripts/hpml/index.ts | 18 +- packages/client/src/scripts/hpml/lib.ts | 8 +- .../client/src/scripts/hpml/type-checker.ts | 10 +- packages/client/src/scripts/i18n.ts | 4 +- packages/client/src/scripts/idb-proxy.ts | 2 +- packages/client/src/scripts/init-chart.ts | 20 +- packages/client/src/scripts/katex-macro.ts | 54 +- packages/client/src/scripts/page-metadata.ts | 18 +- packages/client/src/scripts/physics.ts | 18 +- packages/client/src/scripts/popout.ts | 2 +- packages/client/src/scripts/popup-position.ts | 12 +- packages/client/src/scripts/preprocess.ts | 10 +- .../client/src/scripts/reaction-picker.ts | 3 +- packages/client/src/scripts/search.ts | 2 +- packages/client/src/scripts/select-file.ts | 4 +- packages/client/src/scripts/shuffle.ts | 4 +- packages/client/src/scripts/theme-editor.ts | 27 +- packages/client/src/scripts/theme.ts | 6 +- packages/client/src/scripts/upload.ts | 8 +- .../client/src/scripts/use-chart-tooltip.ts | 2 +- .../client/src/scripts/use-leave-guard.ts | 3 +- .../client/src/scripts/use-note-capture.ts | 5 +- packages/client/src/scripts/use-tooltip.ts | 32 +- packages/client/src/store.ts | 4 +- packages/client/src/theme-store.ts | 2 +- packages/client/src/types/menu.ts | 36 +- packages/client/src/ui/_common_/common.vue | 4 +- .../src/ui/_common_/navbar-for-mobile.vue | 2 +- packages/client/src/ui/_common_/navbar.vue | 12 +- .../src/ui/_common_/statusbar-federation.vue | 4 +- .../client/src/ui/_common_/statusbar-rss.vue | 2 +- .../src/ui/_common_/statusbar-user-list.vue | 4 +- .../src/ui/_common_/stream-indicator.vue | 2 +- packages/client/src/ui/_common_/sw-inject.ts | 1 - .../client/src/ui/deck/channel-column.vue | 1 - packages/client/src/ui/deck/column.vue | 10 +- packages/client/src/ui/deck/deck-store.ts | 21 +- packages/client/src/ui/deck/list-column.vue | 1 - packages/client/src/ui/deck/main-column.vue | 2 +- packages/client/src/ui/deck/tl-column.vue | 6 +- .../client/src/ui/deck/widgets-column.vue | 3 +- packages/client/src/ui/universal.vue | 2 +- packages/client/src/ui/visitor/b.vue | 12 +- packages/client/src/ui/zen.vue | 2 +- .../client/src/widgets/activity.chart.vue | 12 +- packages/client/src/widgets/clock.vue | 1 - packages/client/src/widgets/digital-clock.vue | 2 +- packages/client/src/widgets/index.ts | 3 +- .../client/src/widgets/instance-cloud.vue | 3 +- packages/client/src/widgets/rss-ticker.vue | 2 +- .../src/widgets/server-metric/cpu-mem.vue | 20 +- .../client/src/widgets/server-metric/cpu.vue | 2 +- .../client/src/widgets/server-metric/disk.vue | 1 - .../src/widgets/server-metric/meilisearch.vue | 10 +- .../client/src/widgets/server-metric/mem.vue | 8 +- .../client/src/widgets/server-metric/net.vue | 20 +- .../client/src/widgets/server-metric/pie.vue | 2 - packages/client/src/widgets/user-list.vue | 6 +- packages/client/src/widgets/widget.ts | 18 +- pnpm-lock.yaml | 845 +++++++++++------- 318 files changed, 1702 insertions(+), 1473 deletions(-) diff --git a/.gitignore b/.gitignore index c5ff3fb98..3c55ec0d7 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,9 @@ coverage # docker dev config /dev/docker-compose.yml +# ESLint +.eslintcache + # misskey built db diff --git a/packages/client/.eslintrc.json b/packages/client/.eslintrc.json index fd4718003..6c11c2429 100644 --- a/packages/client/.eslintrc.json +++ b/packages/client/.eslintrc.json @@ -1,6 +1,7 @@ { "extends": ["@eslint-sets/vue3", "@eslint-sets/vue3-ts"], "plugins": ["file-progress", "prettier"], + "ignorePatterns": ["**/*.json5"], "rules": { "file-progress/activate": 1 } diff --git a/packages/client/package.json b/packages/client/package.json index 9efe66f4b..ef28a5db6 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -5,8 +5,8 @@ "watch": "pnpm vite build --watch --mode development", "build": "pnpm vite build", "build:debug": "pnpm run build", - "lint": "pnpm rome check **/*.ts --apply && pnpm run lint:vue", - "lint:vue": "pnpm paralint --ext .vue --fix '**/*.vue' --cache", + "lint": "pnpm rome check **/*.ts --apply ; pnpm run lint:vue", + "lint:vue": "pnpm eslint src --fix '**/*.vue' --cache ; pnpm run format", "format": "pnpm rome format * --write && pnpm prettier --write '**/*.{scss,vue}' --cache --cache-strategy metadata" }, "devDependencies": { @@ -16,7 +16,7 @@ "@phosphor-icons/web": "^2.0.3", "@rollup/plugin-alias": "5.0.0", "@rollup/plugin-json": "6.0.0", - "@rollup/pluginutils": "^5.0.3", + "@rollup/pluginutils": "^5.0.4", "@syuilo/aiscript": "0.11.1", "@types/escape-regexp": "0.0.1", "@types/glob": "8.1.0", @@ -28,15 +28,15 @@ "@types/seedrandom": "3.0.5", "@types/throttle-debounce": "5.0.0", "@types/tinycolor2": "1.4.3", - "@types/uuid": "9.0.2", - "@vitejs/plugin-vue": "4.3.1", + "@types/uuid": "9.0.3", + "@vitejs/plugin-vue": "4.3.4", "@vue/compiler-sfc": "3.3.4", "autobind-decorator": "2.4.0", "autosize": "6.0.1", "blurhash": "2.0.5", - "broadcast-channel": "5.2.0", + "broadcast-channel": "5.3.0", "browser-image-resizer": "github:misskey-dev/browser-image-resizer", - "chart.js": "4.3.3", + "chart.js": "4.4.0", "chartjs-adapter-date-fns": "3.0.0", "chartjs-chart-matrix": "^2.0.1", "chartjs-plugin-gradient": "0.6.1", @@ -63,36 +63,35 @@ "katex": "0.16.8", "matter-js": "0.19.0", "mfm-js": "0.23.3", - "paralint": "^1.2.1", "photoswipe": "5.3.8", - "prettier": "3.0.2", + "prettier": "3.0.3", "prettier-plugin-vue": "1.1.6", "prismjs": "1.29.0", "punycode": "2.3.0", "rndstr": "1.0.0", - "rollup": "3.28.0", + "rollup": "3.28.1", "s-age": "1.1.2", - "sass": "1.66.0", + "sass": "1.66.1", "seedrandom": "3.0.5", "strict-event-emitter-types": "2.0.0", "stringz": "2.1.0", "swiper": "10.2.0", "syuilo-password-strength": "0.0.1", "textarea-caret": "3.1.0", - "three": "0.155.0", + "three": "0.156.0", "throttle-debounce": "5.0.0", "tinycolor2": "1.6.0", "tsc-alias": "1.8.7", "tsconfig-paths": "4.2.0", "twemoji-parser": "14.0.0", - "typescript": "5.1.6", + "typescript": "5.2.2", "unicode-emoji-json": "^0.4.0", "uuid": "9.0.0", "vanilla-tilt": "1.8.1", "vite": "4.4.9", "vite-plugin-compression": "^0.5.1", "vue": "3.3.4", - "vue-draggable-plus": "^0.2.5", + "vue-draggable-plus": "^0.2.6", "vue-isyourpasswordsafe": "^2.0.0", "vue-plyr": "^7.0.0", "vue-prism-editor": "2.0.0-alpha.2" diff --git a/packages/client/src/account.ts b/packages/client/src/account.ts index b2d6df033..13408b525 100644 --- a/packages/client/src/account.ts +++ b/packages/client/src/account.ts @@ -1,10 +1,10 @@ import { defineAsyncComponent, reactive } from "vue"; -import * as misskey from "firefish-js"; +import type * as misskey from "firefish-js"; import { i18n } from "./i18n"; import { del, get, set } from "@/scripts/idb-proxy"; import { apiUrl } from "@/config"; -import { waiting, api, popup, popupMenu, success, alert } from "@/os"; -import { unisonReload, reloadChannel } from "@/scripts/unison-reload"; +import { alert, api, popup, popupMenu, success, waiting } from "@/os"; +import { reloadChannel, unisonReload } from "@/scripts/unison-reload"; // TODO: 他のタブと永続化されたstateを同期 @@ -28,7 +28,7 @@ export async function signout() { const accounts = await getAccounts(); - //#region Remove service worker registration + // #region Remove service worker registration try { if (navigator.serviceWorker.controller) { const registration = await navigator.serviceWorker.ready; @@ -52,7 +52,7 @@ export async function signout() { }); } } catch (err) {} - //#endregion + // #endregion document.cookie = "igi=; path=/"; diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue index 3cfd332c7..5acef3965 100644 --- a/packages/client/src/components/MkDialog.vue +++ b/packages/client/src/components/MkDialog.vue @@ -199,7 +199,7 @@ diff --git a/packages/client/src/components/MkDrive.vue b/packages/client/src/components/MkDrive.vue index a0b3713a7..28204fe86 100644 --- a/packages/client/src/components/MkDrive.vue +++ b/packages/client/src/components/MkDrive.vue @@ -139,7 +139,7 @@ import { ref, watch, } from "vue"; -import * as Misskey from "firefish-js"; +import type * as Misskey from "firefish-js"; import MkButton from "./MkButton.vue"; import XNavFolder from "@/components/MkDrive.navFolder.vue"; import XFolder from "@/components/MkDrive.folder.vue"; @@ -294,7 +294,7 @@ function onDrop(ev: DragEvent): any { return; } - //#region ドライブのファイル + // #region ドライブのファイル const driveFile = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FILE_); if (driveFile != null && driveFile !== "") { const file = JSON.parse(driveFile); @@ -305,9 +305,9 @@ function onDrop(ev: DragEvent): any { folderId: folder.value ? folder.value.id : null, }); } - //#endregion + // #endregion - //#region ドライブのフォルダ + // #region ドライブのフォルダ const driveFolder = ev.dataTransfer.getData(_DATA_TRANSFER_DRIVE_FOLDER_); if (driveFolder != null && driveFolder !== "") { const droppedFolder = JSON.parse(driveFolder); @@ -339,7 +339,7 @@ function onDrop(ev: DragEvent): any { } }); } - //#endregion + // #endregion } function selectLocalFile() { @@ -354,7 +354,7 @@ function urlUpload() { }).then(({ canceled, result: url }) => { if (canceled || !url) return; os.api("drive/files/upload-from-url", { - url: url, + url, folderId: folder.value ? folder.value.id : undefined, }); @@ -372,7 +372,7 @@ function createFolder() { }).then(({ canceled, result: name }) => { if (canceled) return; os.api("drive/folders/create", { - name: name, + name, parentId: folder.value ? folder.value.id : undefined, }).then((createdFolder) => { addFolder(createdFolder, true); @@ -389,7 +389,7 @@ function renameFolder(folderToRename: Misskey.entities.DriveFolder) { if (canceled) return; os.api("drive/folders/update", { folderId: folderToRename.id, - name: name, + name, }).then((updatedFolder) => { // FIXME: 画面を更新するために自分自身に移動 move(updatedFolder); diff --git a/packages/client/src/components/MkDriveFileThumbnail.vue b/packages/client/src/components/MkDriveFileThumbnail.vue index c5af469e9..7d9b43635 100644 --- a/packages/client/src/components/MkDriveFileThumbnail.vue +++ b/packages/client/src/components/MkDriveFileThumbnail.vue @@ -68,7 +68,7 @@ const is = computed(() => { "application/x-tar", "application/gzip", "application/x-7z-compressed", - ].some((archiveType) => archiveType === props.file.type) + ].includes(props.file.type) ) return "archive"; return "unknown"; diff --git a/packages/client/src/components/MkDriveSelectDialog.vue b/packages/client/src/components/MkDriveSelectDialog.vue index 5b3b33d6c..ae292b96a 100644 --- a/packages/client/src/components/MkDriveSelectDialog.vue +++ b/packages/client/src/components/MkDriveSelectDialog.vue @@ -37,7 +37,7 @@