diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-03-25 17:32:18 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-03-25 17:32:18 -0400 |
| commit | f861bec1a767eed7bfcc78f1a705b04031dcf0da (patch) | |
| tree | e18cfa9efd4824bb4e4527f1967e04f6ae06d913 | |
| parent | Revert "feat: google analytics (#15451)" (diff) | |
| download | sharkey-f861bec1a767eed7bfcc78f1a705b04031dcf0da.tar.gz sharkey-f861bec1a767eed7bfcc78f1a705b04031dcf0da.tar.bz2 sharkey-f861bec1a767eed7bfcc78f1a705b04031dcf0da.zip | |
update references from /scripts/ to /utility/
30 files changed, 87 insertions, 87 deletions
diff --git a/packages/frontend/src/components/MkLink.vue b/packages/frontend/src/components/MkLink.vue index 4a431a64df..4b128fc167 100644 --- a/packages/frontend/src/components/MkLink.vue +++ b/packages/frontend/src/components/MkLink.vue @@ -23,7 +23,7 @@ import { useTooltip } from '@/use/use-tooltip.js'; import * as os from '@/os.js'; import { isEnabledUrlPreview } from '@/instance.js'; import type { MkABehavior } from '@/components/global/MkA.vue'; -import { warningExternalWebsite } from '@/scripts/warning-external-website.js'; +import { warningExternalWebsite } from '@/utility/warning-external-website.js'; const props = withDefaults(defineProps<{ url: string; diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index d42c46fba0..fe911a1293 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -285,7 +285,7 @@ import MkUserCardMini from '@/components/MkUserCardMini.vue'; import MkPagination from '@/components/MkPagination.vue'; import MkReactionIcon from '@/components/MkReactionIcon.vue'; import MkButton from '@/components/MkButton.vue'; -import { boostMenuItems, type Visibility, computeRenoteTooltip } from '@/scripts/boost-quote.js'; +import { boostMenuItems, type Visibility, computeRenoteTooltip } from '@/utility/boost-quote.js'; import { isEnabledUrlPreview } from '@/instance.js'; import { getAppearNote } from '@/utility/get-appear-note.js'; import { prefer } from '@/preferences.js'; diff --git a/packages/frontend/src/components/MkScheduleEditor.vue b/packages/frontend/src/components/MkScheduleEditor.vue index 695a474998..1a6d5fd82d 100644 --- a/packages/frontend/src/components/MkScheduleEditor.vue +++ b/packages/frontend/src/components/MkScheduleEditor.vue @@ -20,8 +20,8 @@ SPDX-License-Identifier: AGPL-3.0-only import { onMounted, ref, watch } from 'vue'; import moment from 'moment'; import MkInput from '@/components/MkInput.vue'; -import { formatDateTimeString } from '@/scripts/format-time-string.js'; -import { addTime } from '@/scripts/time.js'; +import { formatDateTimeString } from '@/utility/format-time-string.js'; +import { addTime } from '@/utility/time.js'; import { i18n } from '@/i18n.js'; const props = defineProps<{ diff --git a/packages/frontend/src/components/MkSignin.vue b/packages/frontend/src/components/MkSignin.vue index 3037a41657..68151fdc78 100644 --- a/packages/frontend/src/components/MkSignin.vue +++ b/packages/frontend/src/components/MkSignin.vue @@ -73,7 +73,7 @@ import type { PwResponse } from '@/components/MkSignin.password.vue'; import { misskeyApi } from '@/utility/misskey-api.js'; import { showSuspendedDialog } from '@/utility/show-suspended-dialog.js'; import { i18n } from '@/i18n.js'; -import { showSystemAccountDialog } from '@/scripts/show-system-account-dialog.js'; +import { showSystemAccountDialog } from '@/utility/show-system-account-dialog.js'; import * as os from '@/os.js'; import XInput from '@/components/MkSignin.input.vue'; diff --git a/packages/frontend/src/components/MkSignupDialog.rules.vue b/packages/frontend/src/components/MkSignupDialog.rules.vue index d1685c6990..f3d358c874 100644 --- a/packages/frontend/src/components/MkSignupDialog.rules.vue +++ b/packages/frontend/src/components/MkSignupDialog.rules.vue @@ -67,7 +67,7 @@ SPDX-License-Identifier: AGPL-3.0-only import { computed, ref } from 'vue'; import { instance } from '@/instance.js'; import { i18n } from '@/i18n.js'; -import sanitizeHtml from '@/scripts/sanitize-html.js'; +import sanitizeHtml from '@/utility/sanitize-html.js'; import MkButton from '@/components/MkButton.vue'; import MkFolder from '@/components/MkFolder.vue'; import MkSwitch from '@/components/MkSwitch.vue'; diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue index 145de3b9d3..2ac34431c4 100644 --- a/packages/frontend/src/components/MkSubNoteContent.vue +++ b/packages/frontend/src/components/MkSubNoteContent.vue @@ -50,7 +50,7 @@ import { i18n } from '@/i18n.js'; import { defaultStore } from '@/store.js'; import { useRouter } from '@/router/supplier.js'; import * as os from '@/os.js'; -import { checkAnimationFromMfm } from '@/scripts/check-animated-mfm.js'; +import { checkAnimationFromMfm } from '@/utility/check-animated-mfm.js'; const props = defineProps<{ note: Misskey.entities.Note; diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue index 9a87d480e3..828009df93 100644 --- a/packages/frontend/src/components/MkVisitorDashboard.vue +++ b/packages/frontend/src/components/MkVisitorDashboard.vue @@ -58,7 +58,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { ref } from 'vue'; import * as Misskey from 'misskey-js'; -import sanitizeHtml from '@/scripts/sanitize-html.js'; +import sanitizeHtml from '@/utility/sanitize-html.js'; import XSigninDialog from '@/components/MkSigninDialog.vue'; import XSignupDialog from '@/components/MkSignupDialog.vue'; import MkButton from '@/components/MkButton.vue'; diff --git a/packages/frontend/src/components/SkApprovalUser.vue b/packages/frontend/src/components/SkApprovalUser.vue index 1ef0ac5b17..7029ce43a3 100644 --- a/packages/frontend/src/components/SkApprovalUser.vue +++ b/packages/frontend/src/components/SkApprovalUser.vue @@ -38,7 +38,7 @@ import MkFolder from '@/components/MkFolder.vue'; import MkButton from '@/components/MkButton.vue'; import { i18n } from '@/i18n.js'; import * as os from '@/os.js'; -import { misskeyApi } from '@/scripts/misskey-api.js'; +import { misskeyApi } from '@/utility/misskey-api.js'; const props = defineProps<{ user: Misskey.entities.User; diff --git a/packages/frontend/src/components/SkFetchNote.vue b/packages/frontend/src/components/SkFetchNote.vue index ab702c28f8..d325ef1687 100644 --- a/packages/frontend/src/components/SkFetchNote.vue +++ b/packages/frontend/src/components/SkFetchNote.vue @@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only import { ref, watch } from 'vue'; import * as Misskey from 'misskey-js'; import { i18n } from '@/i18n.js'; -import { misskeyApi } from '@/scripts/misskey-api'; +import { misskeyApi } from '@/utility/misskey-api'; import DynamicNote from '@/components/DynamicNote.vue'; const props = withDefaults(defineProps<{ diff --git a/packages/frontend/src/components/SkFollowingFeedEntry.vue b/packages/frontend/src/components/SkFollowingFeedEntry.vue index 75539f1de7..d1c522df33 100644 --- a/packages/frontend/src/components/SkFollowingFeedEntry.vue +++ b/packages/frontend/src/components/SkFollowingFeedEntry.vue @@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import * as Misskey from 'misskey-js'; -import { getNoteSummary } from '@/scripts/get-note-summary.js'; +import { getNoteSummary } from '@/utility/get-note-summary.js'; import { userPage } from '@/filters/user.js'; import { notePage } from '@/filters/note.js'; import { i18n } from '@/i18n.js'; diff --git a/packages/frontend/src/components/SkFollowingRecentNotes.vue b/packages/frontend/src/components/SkFollowingRecentNotes.vue index 7e71065082..2e0d8f67e0 100644 --- a/packages/frontend/src/components/SkFollowingRecentNotes.vue +++ b/packages/frontend/src/components/SkFollowingRecentNotes.vue @@ -31,8 +31,8 @@ import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue'; import MkPagination, { Paging } from '@/components/MkPagination.vue'; import SkFollowingFeedEntry from '@/components/SkFollowingFeedEntry.vue'; import { $i } from '@/account.js'; -import { checkWordMute } from '@/scripts/check-word-mute.js'; -import { FollowingFeedTab } from '@/scripts/following-feed-utils.js'; +import { checkWordMute } from '@/utility/check-word-mute.js'; +import { FollowingFeedTab } from '@/utility/following-feed-utils.js'; import MkPullToRefresh from '@/components/MkPullToRefresh.vue'; const props = defineProps<{ diff --git a/packages/frontend/src/components/SkInstanceTicker.vue b/packages/frontend/src/components/SkInstanceTicker.vue index 800b3afc65..22532f7c33 100644 --- a/packages/frontend/src/components/SkInstanceTicker.vue +++ b/packages/frontend/src/components/SkInstanceTicker.vue @@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only import { computed, type CSSProperties } from 'vue'; import { instanceName as localInstanceName } from '@@/js/config.js'; import { instance as localInstance } from '@/instance.js'; -import { getProxiedImageUrlNullable } from '@/scripts/media-proxy.js'; +import { getProxiedImageUrlNullable } from '@/utility/media-proxy.js'; const props = defineProps<{ host: string | null; diff --git a/packages/frontend/src/components/SkModPlayer.vue b/packages/frontend/src/components/SkModPlayer.vue index 0933806109..82f5705d00 100644 --- a/packages/frontend/src/components/SkModPlayer.vue +++ b/packages/frontend/src/components/SkModPlayer.vue @@ -45,8 +45,8 @@ import { ref, nextTick, watch, onDeactivated, onMounted } from 'vue'; import * as Misskey from 'misskey-js'; import { i18n } from '@/i18n.js'; import { defaultStore } from '@/store.js'; -import { ChiptuneJsPlayer, ChiptuneJsConfig } from '@/scripts/chiptune2.js'; -import { isTouchUsing } from '@/scripts/touch.js'; +import { ChiptuneJsPlayer, ChiptuneJsConfig } from '@/utility/chiptune2.js'; +import { isTouchUsing } from '@/utility/touch.js'; const colours = { background: '#000000', diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue index 65130640eb..67c82f95aa 100644 --- a/packages/frontend/src/components/SkNote.vue +++ b/packages/frontend/src/components/SkNote.vue @@ -226,35 +226,35 @@ import MkPoll from '@/components/MkPoll.vue'; import MkUsersTooltip from '@/components/MkUsersTooltip.vue'; import MkUrlPreview from '@/components/MkUrlPreview.vue'; import MkButton from '@/components/MkButton.vue'; -import { pleaseLogin, type OpenOnRemoteOptions } from '@/scripts/please-login.js'; -import { checkWordMute } from '@/scripts/check-word-mute.js'; +import { pleaseLogin, type OpenOnRemoteOptions } from '@/utility/please-login.js'; +import { checkWordMute } from '@/utility/check-word-mute.js'; import { notePage } from '@/filters/note.js'; import { userPage } from '@/filters/user.js'; import number from '@/filters/number.js'; import * as os from '@/os.js'; -import { misskeyApi, misskeyApiGet } from '@/scripts/misskey-api.js'; -import * as sound from '@/scripts/sound.js'; +import { misskeyApi, misskeyApiGet } from '@/utility/misskey-api.js'; +import * as sound from '@/utility/sound.js'; import { defaultStore, noteViewInterruptors } from '@/store.js'; -import { reactionPicker } from '@/scripts/reaction-picker.js'; -import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm.js'; -import { checkAnimationFromMfm } from '@/scripts/check-animated-mfm.js'; +import { reactionPicker } from '@/utility/reaction-picker.js'; +import { extractUrlFromMfm } from '@/utility/extract-url-from-mfm.js'; +import { checkAnimationFromMfm } from '@/utility/check-animated-mfm.js'; import { $i } from '@/account.js'; import { i18n } from '@/i18n.js'; -import { getAbuseNoteMenu, getCopyNoteLinkMenu, getNoteClipMenu, getNoteMenu } from '@/scripts/get-note-menu.js'; -import { getNoteVersionsMenu } from '@/scripts/get-note-versions-menu.js'; -import { useNoteCapture } from '@/scripts/use-note-capture.js'; -import { deepClone } from '@/scripts/clone.js'; -import { useTooltip } from '@/scripts/use-tooltip.js'; -import { claimAchievement } from '@/scripts/achievements.js'; -import { getNoteSummary } from '@/scripts/get-note-summary.js'; +import { getAbuseNoteMenu, getCopyNoteLinkMenu, getNoteClipMenu, getNoteMenu } from '@/utility/get-note-menu.js'; +import { getNoteVersionsMenu } from '@/utility/get-note-versions-menu.js'; +import { useNoteCapture } from '@/utility/use-note-capture.js'; +import { deepClone } from '@/utility/clone.js'; +import { useTooltip } from '@/utility/use-tooltip.js'; +import { claimAchievement } from '@/utility/achievements.js'; +import { getNoteSummary } from '@/utility/get-note-summary.js'; import MkRippleEffect from '@/components/MkRippleEffect.vue'; -import { showMovedDialog } from '@/scripts/show-moved-dialog.js'; +import { showMovedDialog } from '@/utility/show-moved-dialog.js'; import { useRouter } from '@/router/supplier.js'; -import { boostMenuItems, type Visibility, computeRenoteTooltip } from '@/scripts/boost-quote.js'; +import { boostMenuItems, type Visibility, computeRenoteTooltip } from '@/utility/boost-quote.js'; import { isEnabledUrlPreview } from '@/instance.js'; -import { type Keymap } from '@/scripts/hotkey.js'; -import { focusPrev, focusNext } from '@/scripts/focus.js'; -import { getAppearNote } from '@/scripts/get-appear-note.js'; +import { type Keymap } from '@/utility/hotkey.js'; +import { focusPrev, focusNext } from '@/utility/focus.js'; +import { getAppearNote } from '@/utility/get-appear-note.js'; const props = withDefaults(defineProps<{ note: Misskey.entities.Note; diff --git a/packages/frontend/src/components/SkNoteDetailed.vue b/packages/frontend/src/components/SkNoteDetailed.vue index 91f2a19686..8870d12164 100644 --- a/packages/frontend/src/components/SkNoteDetailed.vue +++ b/packages/frontend/src/components/SkNoteDetailed.vue @@ -261,36 +261,36 @@ import MkPoll from '@/components/MkPoll.vue'; import MkUsersTooltip from '@/components/MkUsersTooltip.vue'; import MkUrlPreview from '@/components/MkUrlPreview.vue'; import SkInstanceTicker from '@/components/SkInstanceTicker.vue'; -import { pleaseLogin, type OpenOnRemoteOptions } from '@/scripts/please-login.js'; -import { checkWordMute } from '@/scripts/check-word-mute.js'; +import { pleaseLogin, type OpenOnRemoteOptions } from '@/utility/please-login.js'; +import { checkWordMute } from '@/utility/check-word-mute.js'; import { userPage } from '@/filters/user.js'; import number from '@/filters/number.js'; import { notePage } from '@/filters/note.js'; import * as os from '@/os.js'; -import { misskeyApi, misskeyApiGet } from '@/scripts/misskey-api.js'; -import * as sound from '@/scripts/sound.js'; +import { misskeyApi, misskeyApiGet } from '@/utility/misskey-api.js'; +import * as sound from '@/utility/sound.js'; import { defaultStore, noteViewInterruptors } from '@/store.js'; -import { reactionPicker } from '@/scripts/reaction-picker.js'; -import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm.js'; +import { reactionPicker } from '@/utility/reaction-picker.js'; +import { extractUrlFromMfm } from '@/utility/extract-url-from-mfm.js'; import { $i } from '@/account.js'; import { i18n } from '@/i18n.js'; -import { getNoteClipMenu, getNoteMenu } from '@/scripts/get-note-menu.js'; -import { getNoteVersionsMenu } from '@/scripts/get-note-versions-menu.js'; -import { useNoteCapture } from '@/scripts/use-note-capture.js'; -import { deepClone } from '@/scripts/clone.js'; -import { useTooltip } from '@/scripts/use-tooltip.js'; -import { claimAchievement } from '@/scripts/achievements.js'; -import { checkAnimationFromMfm } from '@/scripts/check-animated-mfm.js'; +import { getNoteClipMenu, getNoteMenu } from '@/utility/get-note-menu.js'; +import { getNoteVersionsMenu } from '@/utility/get-note-versions-menu.js'; +import { useNoteCapture } from '@/utility/use-note-capture.js'; +import { deepClone } from '@/utility/clone.js'; +import { useTooltip } from '@/utility/use-tooltip.js'; +import { claimAchievement } from '@/utility/achievements.js'; +import { checkAnimationFromMfm } from '@/utility/check-animated-mfm.js'; import MkRippleEffect from '@/components/MkRippleEffect.vue'; -import { showMovedDialog } from '@/scripts/show-moved-dialog.js'; +import { showMovedDialog } from '@/utility/show-moved-dialog.js'; import MkUserCardMini from '@/components/MkUserCardMini.vue'; import MkPagination, { type Paging } from '@/components/MkPagination.vue'; import MkReactionIcon from '@/components/MkReactionIcon.vue'; import MkButton from '@/components/MkButton.vue'; -import { boostMenuItems, type Visibility, computeRenoteTooltip } from '@/scripts/boost-quote.js'; +import { boostMenuItems, type Visibility, computeRenoteTooltip } from '@/utility/boost-quote.js'; import { isEnabledUrlPreview } from '@/instance.js'; -import { getAppearNote } from '@/scripts/get-appear-note.js'; -import { type Keymap } from '@/scripts/hotkey.js'; +import { getAppearNote } from '@/utility/get-appear-note.js'; +import { type Keymap } from '@/utility/hotkey.js'; const props = withDefaults(defineProps<{ note: Misskey.entities.Note; diff --git a/packages/frontend/src/components/SkNoteHeader.vue b/packages/frontend/src/components/SkNoteHeader.vue index cb50e57132..12ba9f187a 100644 --- a/packages/frontend/src/components/SkNoteHeader.vue +++ b/packages/frontend/src/components/SkNoteHeader.vue @@ -80,12 +80,12 @@ import * as Misskey from 'misskey-js'; import { i18n } from '@/i18n.js'; import { notePage } from '@/filters/note.js'; import { userPage } from '@/filters/user.js'; -import { getNoteVersionsMenu } from '@/scripts/get-note-versions-menu.js'; +import { getNoteVersionsMenu } from '@/utility/get-note-versions-menu.js'; import SkInstanceTicker from '@/components/SkInstanceTicker.vue'; import { popupMenu } from '@/os.js'; import { defaultStore } from '@/store.js'; import { useRouter } from '@/router/supplier.js'; -import { deviceKind } from '@/scripts/device-kind.js'; +import { deviceKind } from '@/utility/device-kind.js'; import MkInstanceTicker from '@/components/MkInstanceTicker.vue'; const props = defineProps<{ diff --git a/packages/frontend/src/components/SkNoteSub.vue b/packages/frontend/src/components/SkNoteSub.vue index f1713c9b73..aa05e1b0cf 100644 --- a/packages/frontend/src/components/SkNoteSub.vue +++ b/packages/frontend/src/components/SkNoteSub.vue @@ -101,22 +101,22 @@ import MkSubNoteContent from '@/components/MkSubNoteContent.vue'; import MkCwButton from '@/components/MkCwButton.vue'; import { notePage } from '@/filters/note.js'; import * as os from '@/os.js'; -import { misskeyApi } from '@/scripts/misskey-api.js'; -import * as sound from '@/scripts/sound.js'; +import { misskeyApi } from '@/utility/misskey-api.js'; +import * as sound from '@/utility/sound.js'; import { i18n } from '@/i18n.js'; import { $i } from '@/account.js'; import { userPage } from '@/filters/user.js'; -import { checkWordMute } from '@/scripts/check-word-mute.js'; +import { checkWordMute } from '@/utility/check-word-mute.js'; import { defaultStore } from '@/store.js'; import { host } from '@@/js/config.js'; -import { pleaseLogin, type OpenOnRemoteOptions } from '@/scripts/please-login.js'; -import { showMovedDialog } from '@/scripts/show-moved-dialog.js'; +import { pleaseLogin, type OpenOnRemoteOptions } from '@/utility/please-login.js'; +import { showMovedDialog } from '@/utility/show-moved-dialog.js'; import MkRippleEffect from '@/components/MkRippleEffect.vue'; -import { reactionPicker } from '@/scripts/reaction-picker.js'; -import { claimAchievement } from '@/scripts/achievements.js'; -import { getNoteMenu } from '@/scripts/get-note-menu.js'; -import { useNoteCapture } from '@/scripts/use-note-capture.js'; -import { boostMenuItems, type Visibility, computeRenoteTooltip } from '@/scripts/boost-quote.js'; +import { reactionPicker } from '@/utility/reaction-picker.js'; +import { claimAchievement } from '@/utility/achievements.js'; +import { getNoteMenu } from '@/utility/get-note-menu.js'; +import { useNoteCapture } from '@/utility/use-note-capture.js'; +import { boostMenuItems, type Visibility, computeRenoteTooltip } from '@/utility/boost-quote.js'; const canRenote = computed(() => ['public', 'home'].includes(props.note.visibility) || props.note.userId === $i.id); const hideLine = computed(() => { return props.detail ? true : false; }); diff --git a/packages/frontend/src/components/SkOldNoteWindow.vue b/packages/frontend/src/components/SkOldNoteWindow.vue index 48b9020402..52b135649d 100644 --- a/packages/frontend/src/components/SkOldNoteWindow.vue +++ b/packages/frontend/src/components/SkOldNoteWindow.vue @@ -93,10 +93,10 @@ import MkUrlPreview from '@/components/MkUrlPreview.vue'; import MkInstanceTicker from '@/components/MkInstanceTicker.vue'; import { userPage } from '@/filters/user.js'; import { defaultStore, noteViewInterruptors } from '@/store.js'; -import { extractUrlFromMfm } from '@/scripts/extract-url-from-mfm.js'; +import { extractUrlFromMfm } from '@/utility/extract-url-from-mfm.js'; import { i18n } from '@/i18n.js'; -import { deepClone } from '@/scripts/clone.js'; -import { dateTimeFormat } from '@/scripts/intl-const.js'; +import { deepClone } from '@/utility/clone.js'; +import { dateTimeFormat } from '@/utility/intl-const.js'; const props = defineProps<{ note: Misskey.entities.Note; diff --git a/packages/frontend/src/components/SkRemoteFollowersWarning.vue b/packages/frontend/src/components/SkRemoteFollowersWarning.vue index ceebbd59dd..225d52e8ed 100644 --- a/packages/frontend/src/components/SkRemoteFollowersWarning.vue +++ b/packages/frontend/src/components/SkRemoteFollowersWarning.vue @@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only import { computed } from 'vue'; import { i18n } from '@/i18n.js'; import MkInfo from '@/components/MkInfo.vue'; -import { followersTab, FollowingFeedModel } from '@/scripts/following-feed-utils.js'; +import { followersTab, FollowingFeedModel } from '@/utility/following-feed-utils.js'; const props = defineProps<{ model: FollowingFeedModel, diff --git a/packages/frontend/src/components/SkUserRecentNotes.vue b/packages/frontend/src/components/SkUserRecentNotes.vue index 908affcdaf..a6a808e748 100644 --- a/packages/frontend/src/components/SkUserRecentNotes.vue +++ b/packages/frontend/src/components/SkUserRecentNotes.vue @@ -22,7 +22,7 @@ import MkNotes from '@/components/MkNotes.vue'; import MkUserInfo from '@/components/MkUserInfo.vue'; import MkPullToRefresh from '@/components/MkPullToRefresh.vue'; import { Paging } from '@/components/MkPagination.vue'; -import { misskeyApi } from '@/scripts/misskey-api.js'; +import { misskeyApi } from '@/utility/misskey-api.js'; const props = defineProps<{ userId: string; diff --git a/packages/frontend/src/components/global/MkUrl.vue b/packages/frontend/src/components/global/MkUrl.vue index 3a3e73978b..b2d83df0f8 100644 --- a/packages/frontend/src/components/global/MkUrl.vue +++ b/packages/frontend/src/components/global/MkUrl.vue @@ -34,7 +34,7 @@ import * as os from '@/os.js'; import { useTooltip } from '@/use/use-tooltip.js'; import { isEnabledUrlPreview } from '@/instance.js'; import type { MkABehavior } from '@/components/global/MkA.vue'; -import { warningExternalWebsite } from '@/scripts/warning-external-website.js'; +import { warningExternalWebsite } from '@/utility/warning-external-website.js'; function safeURIDecode(str: string): string { try { diff --git a/packages/frontend/src/pages/about-sharkey.vue b/packages/frontend/src/pages/about-sharkey.vue index 07558f6faf..23e75ed7f1 100644 --- a/packages/frontend/src/pages/about-sharkey.vue +++ b/packages/frontend/src/pages/about-sharkey.vue @@ -98,14 +98,14 @@ import FormSection from '@/components/form/section.vue'; import MkButton from '@/components/MkButton.vue'; import MkLink from '@/components/MkLink.vue'; import MkInfo from '@/components/MkInfo.vue'; -import { physics } from '@/scripts/physics.js'; +import { physics } from '@/utility/physics.js'; import { i18n } from '@/i18n.js'; import { instance } from '@/instance.js'; import { defaultStore } from '@/store.js'; import * as os from '@/os.js'; -import { misskeyApi } from '@/scripts/misskey-api.js'; -import { definePageMetadata } from '@/scripts/page-metadata.js'; -import { claimAchievement, claimedAchievements } from '@/scripts/achievements.js'; +import { misskeyApi } from '@/utility/misskey-api.js'; +import { definePageMetadata } from '@/utility/page-metadata.js'; +import { claimAchievement, claimedAchievements } from '@/utility/achievements.js'; import { $i } from '@/account.js'; type Section = { diff --git a/packages/frontend/src/pages/about.overview.vue b/packages/frontend/src/pages/about.overview.vue index ebd440ac8a..12df748f3d 100644 --- a/packages/frontend/src/pages/about.overview.vue +++ b/packages/frontend/src/pages/about.overview.vue @@ -147,7 +147,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { ref } from 'vue'; -import sanitizeHtml from '@/scripts/sanitize-html.js'; +import sanitizeHtml from '@/utility/sanitize-html.js'; import { host, version } from '@@/js/config.js'; import { i18n } from '@/i18n.js'; import { instance } from '@/instance.js'; diff --git a/packages/frontend/src/pages/admin/approvals.vue b/packages/frontend/src/pages/admin/approvals.vue index 0497e85da3..ad69c5c242 100644 --- a/packages/frontend/src/pages/admin/approvals.vue +++ b/packages/frontend/src/pages/admin/approvals.vue @@ -28,7 +28,7 @@ import XHeader from './_header_.vue'; import MkPagination from '@/components/MkPagination.vue'; import SkApprovalUser from '@/components/SkApprovalUser.vue'; import { i18n } from '@/i18n.js'; -import { definePageMetadata } from '@/scripts/page-metadata.js'; +import { definePageMetadata } from '@/utility/page-metadata.js'; let paginationComponent = shallowRef<InstanceType<typeof MkPagination>>(); diff --git a/packages/frontend/src/pages/following-feed.vue b/packages/frontend/src/pages/following-feed.vue index 7fb13c8fcb..e9069ab360 100644 --- a/packages/frontend/src/pages/following-feed.vue +++ b/packages/frontend/src/pages/following-feed.vue @@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { computed, ComputedRef, Ref, ref, shallowRef } from 'vue'; import { getScrollContainer } from '@@/js/scroll.js'; -import { definePageMetadata } from '@/scripts/page-metadata.js'; +import { definePageMetadata } from '@/utility/page-metadata.js'; import { i18n } from '@/i18n.js'; import MkHorizontalSwipe from '@/components/MkHorizontalSwipe.vue'; import { Tab } from '@/components/global/MkPageHeader.tabs.vue'; @@ -36,7 +36,7 @@ import { useRouter } from '@/router/supplier.js'; import MkPageHeader from '@/components/global/MkPageHeader.vue'; import SkUserRecentNotes from '@/components/SkUserRecentNotes.vue'; import { useScrollPositionManager } from '@/nirax.js'; -import { createModel, createHeaderItem, followingFeedTabs, followingTabIcon, followingTabName, followingTab } from '@/scripts/following-feed-utils.js'; +import { createModel, createHeaderItem, followingFeedTabs, followingTabIcon, followingTabName, followingTab } from '@/utility/following-feed-utils.js'; import SkLazy from '@/components/global/SkLazy.vue'; import SkFollowingRecentNotes from '@/components/SkFollowingRecentNotes.vue'; import SkRemoteFollowersWarning from '@/components/SkRemoteFollowersWarning.vue'; diff --git a/packages/frontend/src/pages/user-list-timeline.vue b/packages/frontend/src/pages/user-list-timeline.vue index a57d2bb51b..2b9d644eca 100644 --- a/packages/frontend/src/pages/user-list-timeline.vue +++ b/packages/frontend/src/pages/user-list-timeline.vue @@ -34,7 +34,7 @@ import { definePage } from '@/page.js'; import { i18n } from '@/i18n.js'; import { useRouter } from '@/router.js'; import { defaultStore } from '@/store.js'; -import { deepMerge } from '@/scripts/merge.js'; +import { deepMerge } from '@/utility/merge.js'; import * as os from '@/os.js'; import { $i } from '@/account.js'; diff --git a/packages/frontend/src/pages/user/recent-notes.vue b/packages/frontend/src/pages/user/recent-notes.vue index d636068408..53d19c0b5b 100644 --- a/packages/frontend/src/pages/user/recent-notes.vue +++ b/packages/frontend/src/pages/user/recent-notes.vue @@ -14,13 +14,13 @@ SPDX-License-Identifier: AGPL-3.0-only <script setup lang="ts"> import { computed, shallowRef } from 'vue'; -import { definePageMetadata } from '@/scripts/page-metadata.js'; +import { definePageMetadata } from '@/utility/page-metadata.js'; import { i18n } from '@/i18n.js'; import { PageHeaderItem } from '@/types/page-header.js'; import MkPageHeader from '@/components/global/MkPageHeader.vue'; import SkUserRecentNotes from '@/components/SkUserRecentNotes.vue'; import { acct } from '@/filters/user.js'; -import { createModel, createHeaderItem } from '@/scripts/following-feed-utils.js'; +import { createModel, createHeaderItem } from '@/utility/following-feed-utils.js'; import MkStickyContainer from '@/components/global/MkStickyContainer.vue'; defineProps<{ diff --git a/packages/frontend/src/ui/deck/following-column.vue b/packages/frontend/src/ui/deck/following-column.vue index 6b8c9db917..f2ebb23f02 100644 --- a/packages/frontend/src/ui/deck/following-column.vue +++ b/packages/frontend/src/ui/deck/following-column.vue @@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts"> import { computed, shallowRef } from 'vue'; import type { Column } from '@/ui/deck/deck-store.js'; -import type { FollowingFeedState } from '@/scripts/following-feed-utils.js'; +import type { FollowingFeedState } from '@/utility/following-feed-utils.js'; export type FollowingColumn = Column & Partial<FollowingFeedState>; </script> @@ -28,7 +28,7 @@ import { getColumn, getReactiveColumn, updateColumn } from '@/ui/deck/deck-store import XColumn from '@/ui/deck/column.vue'; import SkFollowingRecentNotes from '@/components/SkFollowingRecentNotes.vue'; import SkRemoteFollowersWarning from '@/components/SkRemoteFollowersWarning.vue'; -import { createModel, createOptionsMenu, FollowingFeedTab, followingTab, followingTabName, followingTabIcon, followingFeedTabs } from '@/scripts/following-feed-utils.js'; +import { createModel, createOptionsMenu, FollowingFeedTab, followingTab, followingTabName, followingTabIcon, followingFeedTabs } from '@/utility/following-feed-utils.js'; import * as os from '@/os.js'; import { i18n } from '@/i18n.js'; import { MenuItem } from '@/types/menu.js'; diff --git a/packages/frontend/src/utility/following-feed-utils.ts b/packages/frontend/src/utility/following-feed-utils.ts index 39f17949d6..81c3ca568a 100644 --- a/packages/frontend/src/utility/following-feed-utils.ts +++ b/packages/frontend/src/utility/following-feed-utils.ts @@ -5,7 +5,7 @@ import { computed, Ref, WritableComputedRef } from 'vue'; import { defaultStore } from '@/store.js'; -import { deepMerge } from '@/scripts/merge.js'; +import { deepMerge } from '@/utility/merge.js'; import { PageHeaderItem } from '@/types/page-header.js'; import { i18n } from '@/i18n.js'; import { popupMenu } from '@/os.js'; diff --git a/packages/frontend/src/widgets/WidgetSearch.vue b/packages/frontend/src/widgets/WidgetSearch.vue index 974536e880..bece958278 100644 --- a/packages/frontend/src/widgets/WidgetSearch.vue +++ b/packages/frontend/src/widgets/WidgetSearch.vue @@ -20,11 +20,11 @@ import { useWidgetPropsManager, WidgetComponentEmits, WidgetComponentExpose, Wid import MkInput from '@/components/MkInput.vue'; import MkContainer from '@/components/MkContainer.vue'; import { i18n } from '@/i18n.js'; -import { misskeyApi } from '@/scripts/misskey-api.js'; +import { misskeyApi } from '@/utility/misskey-api.js'; import * as os from '@/os.js'; import { useRouter } from '@/router/supplier.js'; -import { GetFormResultType } from '@/scripts/form.js'; -import { notesSearchAvailable } from '@/scripts/check-permissions.js'; +import { GetFormResultType } from '@/utility/form.js'; +import { notesSearchAvailable } from '@/utility/check-permissions.js'; const name = 'search'; |