From d6e23b803b10a471bb5b1054b357c70a16e8f6da Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 23 Mar 2021 17:30:14 +0900 Subject: refactor: Tweak path alias of client --- src/client/scripts/aiscript/api.ts | 4 ++-- src/client/scripts/autocomplete.ts | 4 ++-- src/client/scripts/gen-search-query.ts | 2 +- src/client/scripts/get-static-image-url.ts | 2 +- src/client/scripts/get-user-menu.ts | 16 ++++++++-------- src/client/scripts/hpml/evaluator.ts | 4 ++-- src/client/scripts/initialize-sw.ts | 8 ++++---- src/client/scripts/paging.ts | 2 +- src/client/scripts/please-login.ts | 6 +++--- src/client/scripts/popout.ts | 2 +- src/client/scripts/reaction-picker.ts | 4 ++-- src/client/scripts/search.ts | 6 +++--- src/client/scripts/select-file.ts | 4 ++-- src/client/scripts/sound.ts | 2 +- src/client/scripts/stream.ts | 2 +- 15 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/client/scripts') diff --git a/src/client/scripts/aiscript/api.ts b/src/client/scripts/aiscript/api.ts index 20c15d809e..5dd08f34ac 100644 --- a/src/client/scripts/aiscript/api.ts +++ b/src/client/scripts/aiscript/api.ts @@ -1,6 +1,6 @@ import { utils, values } from '@syuilo/aiscript'; -import * as os from '@/os'; -import { $i } from '@/account'; +import * as os from '@client/os'; +import { $i } from '@client/account'; export function createAiScriptEnv(opts) { let apiRequests = 0; diff --git a/src/client/scripts/autocomplete.ts b/src/client/scripts/autocomplete.ts index 83ceece5df..eab893a386 100644 --- a/src/client/scripts/autocomplete.ts +++ b/src/client/scripts/autocomplete.ts @@ -1,7 +1,7 @@ import { Ref, ref } from 'vue'; import * as getCaretCoordinates from 'textarea-caret'; import { toASCII } from 'punycode'; -import { popup } from '@/os'; +import { popup } from '@client/os'; export class Autocomplete { private suggestion: { @@ -150,7 +150,7 @@ export class Autocomplete { const _y = ref(y); const _q = ref(q); - const { dispose } = await popup(import('@/components/autocomplete.vue'), { + const { dispose } = await popup(import('@client/components/autocomplete.vue'), { textarea: this.textarea, close: this.close, type: type, diff --git a/src/client/scripts/gen-search-query.ts b/src/client/scripts/gen-search-query.ts index 670d915104..998d932141 100644 --- a/src/client/scripts/gen-search-query.ts +++ b/src/client/scripts/gen-search-query.ts @@ -1,5 +1,5 @@ import parseAcct from '../../misc/acct/parse'; -import { host as localHost } from '@/config'; +import { host as localHost } from '@client/config'; export async function genSearchQuery(v: any, q: string) { let host: string; diff --git a/src/client/scripts/get-static-image-url.ts b/src/client/scripts/get-static-image-url.ts index e932eb6da5..e2728d73f4 100644 --- a/src/client/scripts/get-static-image-url.ts +++ b/src/client/scripts/get-static-image-url.ts @@ -1,4 +1,4 @@ -import { url as instanceUrl } from '@/config'; +import { url as instanceUrl } from '@client/config'; import * as url from '../../prelude/url'; export function getStaticImageUrl(baseUrl: string): string { diff --git a/src/client/scripts/get-user-menu.ts b/src/client/scripts/get-user-menu.ts index 0e4e4af5d3..87f7bff942 100644 --- a/src/client/scripts/get-user-menu.ts +++ b/src/client/scripts/get-user-menu.ts @@ -1,13 +1,13 @@ import { faAt, faListUl, faEye, faEyeSlash, faBan, faPencilAlt, faComments, faUsers, faMicrophoneSlash, faPlug, faExclamationCircle } from '@fortawesome/free-solid-svg-icons'; import { faSnowflake, faEnvelope } from '@fortawesome/free-regular-svg-icons'; -import { i18n } from '@/i18n'; -import copyToClipboard from '@/scripts/copy-to-clipboard'; -import { host } from '@/config'; +import { i18n } from '@client/i18n'; +import copyToClipboard from '@client/scripts/copy-to-clipboard'; +import { host } from '@client/config'; import getAcct from '../../misc/acct/render'; -import * as os from '@/os'; -import { userActions } from '@/store'; -import { router } from '@/router'; -import { $i } from '@/account'; +import * as os from '@client/os'; +import { userActions } from '@client/store'; +import { router } from '@client/router'; +import { $i } from '@client/account'; export function getUserMenu(user) { const meId = $i ? $i.id : null; @@ -104,7 +104,7 @@ export function getUserMenu(user) { } function reportAbuse() { - os.popup(import('@/components/abuse-report-window.vue'), { + os.popup(import('@client/components/abuse-report-window.vue'), { user: user, }, {}, 'closed'); } diff --git a/src/client/scripts/hpml/evaluator.ts b/src/client/scripts/hpml/evaluator.ts index 20261d333d..68d140ff50 100644 --- a/src/client/scripts/hpml/evaluator.ts +++ b/src/client/scripts/hpml/evaluator.ts @@ -1,11 +1,11 @@ import autobind from 'autobind-decorator'; import { PageVar, envVarsDef, Fn, HpmlScope, HpmlError } from '.'; -import { version } from '@/config'; +import { version } from '@client/config'; import { AiScript, utils, values } from '@syuilo/aiscript'; import { createAiScriptEnv } from '../aiscript/api'; import { collectPageVars } from '../collect-page-vars'; import { initHpmlLib, initAiLib } from './lib'; -import * as os from '@/os'; +import * as os from '@client/os'; import { markRaw, ref, Ref, unref } from 'vue'; import { Expr, isLiteralValue, Variable } from './expr'; diff --git a/src/client/scripts/initialize-sw.ts b/src/client/scripts/initialize-sw.ts index d6dbd5dbd4..6f1874572a 100644 --- a/src/client/scripts/initialize-sw.ts +++ b/src/client/scripts/initialize-sw.ts @@ -1,7 +1,7 @@ -import { instance } from '@/instance'; -import { $i } from '@/account'; -import { api } from '@/os'; -import { lang } from '@/config'; +import { instance } from '@client/instance'; +import { $i } from '@client/account'; +import { api } from '@client/os'; +import { lang } from '@client/config'; export async function initializeSw() { if (instance.swPublickey && diff --git a/src/client/scripts/paging.ts b/src/client/scripts/paging.ts index 6e3da94124..2e49f1a64c 100644 --- a/src/client/scripts/paging.ts +++ b/src/client/scripts/paging.ts @@ -1,5 +1,5 @@ import { markRaw } from 'vue'; -import * as os from '@/os'; +import * as os from '@client/os'; import { onScrollTop, isTopVisible, getScrollPosition, getScrollContainer } from './scroll'; const SECOND_FETCH_LIMIT = 30; diff --git a/src/client/scripts/please-login.ts b/src/client/scripts/please-login.ts index 928f6ec0f4..a584e9fa96 100644 --- a/src/client/scripts/please-login.ts +++ b/src/client/scripts/please-login.ts @@ -1,6 +1,6 @@ -import { $i } from '@/account'; -import { i18n } from '@/i18n'; -import { dialog } from '@/os'; +import { $i } from '@client/account'; +import { i18n } from '@client/i18n'; +import { dialog } from '@client/os'; export function pleaseLogin() { if ($i) return; diff --git a/src/client/scripts/popout.ts b/src/client/scripts/popout.ts index 51b8d72868..6d92af4a05 100644 --- a/src/client/scripts/popout.ts +++ b/src/client/scripts/popout.ts @@ -1,4 +1,4 @@ -import * as config from '@/config'; +import * as config from '@client/config'; export function popout(path: string, w?: HTMLElement) { let url = path.startsWith('http://') || path.startsWith('https://') ? path : config.url + path; diff --git a/src/client/scripts/reaction-picker.ts b/src/client/scripts/reaction-picker.ts index e923326ece..38699c0979 100644 --- a/src/client/scripts/reaction-picker.ts +++ b/src/client/scripts/reaction-picker.ts @@ -1,5 +1,5 @@ import { Ref, ref } from 'vue'; -import { popup } from '@/os'; +import { popup } from '@client/os'; class ReactionPicker { private src: Ref = ref(null); @@ -12,7 +12,7 @@ class ReactionPicker { } public async init() { - await popup(import('@/components/emoji-picker-dialog.vue'), { + await popup(import('@client/components/emoji-picker-dialog.vue'), { src: this.src, asReactionPicker: true, manualShowing: this.manualShowing diff --git a/src/client/scripts/search.ts b/src/client/scripts/search.ts index 3e442cb94d..829065534c 100644 --- a/src/client/scripts/search.ts +++ b/src/client/scripts/search.ts @@ -1,7 +1,7 @@ import { faHistory } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; -import { i18n } from '@/i18n'; -import { router } from '@/router'; +import * as os from '@client/os'; +import { i18n } from '@client/i18n'; +import { router } from '@client/router'; export async function search() { const { canceled, result: query } = await os.dialog({ diff --git a/src/client/scripts/select-file.ts b/src/client/scripts/select-file.ts index c083e1ef88..03ac863aa0 100644 --- a/src/client/scripts/select-file.ts +++ b/src/client/scripts/select-file.ts @@ -1,6 +1,6 @@ import { faUpload, faCloud, faLink } from '@fortawesome/free-solid-svg-icons'; -import * as os from '@/os'; -import { i18n } from '@/i18n'; +import * as os from '@client/os'; +import { i18n } from '@client/i18n'; export function selectFile(src: any, label: string | null, multiple = false) { return new Promise((res, rej) => { diff --git a/src/client/scripts/sound.ts b/src/client/scripts/sound.ts index 9b7061d5fc..d3422bfff2 100644 --- a/src/client/scripts/sound.ts +++ b/src/client/scripts/sound.ts @@ -1,4 +1,4 @@ -import { ColdDeviceStorage } from '@/store'; +import { ColdDeviceStorage } from '@client/store'; const cache = new Map(); diff --git a/src/client/scripts/stream.ts b/src/client/scripts/stream.ts index 7330a2f8bb..065059221d 100644 --- a/src/client/scripts/stream.ts +++ b/src/client/scripts/stream.ts @@ -2,7 +2,7 @@ import autobind from 'autobind-decorator'; import { EventEmitter } from 'eventemitter3'; import ReconnectingWebsocket from 'reconnecting-websocket'; import { markRaw } from 'vue'; -import { debug, wsUrl } from '@/config'; +import { debug, wsUrl } from '@client/config'; import { query as urlQuery } from '../../prelude/url'; /** -- cgit v1.2.3-freya From c74fe3c6e2aae3df4624b9b3a55b45293223ebf5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 23 Mar 2021 17:43:07 +0900 Subject: refactor: Use path alias --- src/argv.ts | 2 +- src/boot/master.ts | 6 +++--- src/client/components/autocomplete.vue | 4 ++-- src/client/components/emoji-picker.vue | 2 +- src/client/components/notification.vue | 2 +- src/client/components/poll-editor.vue | 2 +- src/client/components/post-form.vue | 6 +++--- src/client/components/token-generate-window.vue | 2 +- src/client/components/user-info.vue | 2 +- src/client/components/user-preview.vue | 2 +- src/client/filters/user.ts | 4 ++-- src/client/i18n.ts | 2 +- src/client/pages/follow.vue | 2 +- src/client/pages/instance/abuses.vue | 2 +- src/client/pages/instance/settings.vue | 2 +- src/client/pages/instance/users.vue | 2 +- src/client/pages/messaging/index.vue | 2 +- src/client/pages/messaging/messaging-room.form.vue | 2 +- src/client/pages/messaging/messaging-room.vue | 2 +- src/client/pages/my-antennas/index.antenna.vue | 2 +- src/client/pages/room/room.vue | 2 +- src/client/pages/user/index.vue | 2 +- src/client/scripts/gen-search-query.ts | 2 +- src/client/scripts/get-user-menu.ts | 2 +- src/client/sw/compose-notification.ts | 4 ++-- src/client/sw/sw.ts | 2 +- src/client/ui/chat/post-form.vue | 6 +++--- src/db/elasticsearch.ts | 2 +- src/db/postgre.ts | 2 +- src/db/redis.ts | 2 +- src/mfm/language.ts | 4 ++-- src/mfm/to-html.ts | 2 +- src/mfm/to-string.ts | 2 +- src/misc/captcha.ts | 2 +- src/misc/convert-host.ts | 2 +- src/misc/download-url.ts | 2 +- src/misc/fetch.ts | 2 +- src/misc/gen-id.ts | 2 +- src/models/repositories/antenna.ts | 2 +- src/models/repositories/app.ts | 2 +- src/models/repositories/blocking.ts | 2 +- src/models/repositories/channel.ts | 2 +- src/models/repositories/clip.ts | 2 +- src/models/repositories/drive-file.ts | 8 ++++---- src/models/repositories/drive-folder.ts | 2 +- src/models/repositories/federation-instance.ts | 2 +- src/models/repositories/following.ts | 2 +- src/models/repositories/hashtag.ts | 2 +- src/models/repositories/messaging-message.ts | 2 +- src/models/repositories/muting.ts | 2 +- src/models/repositories/note-reaction.ts | 4 ++-- src/models/repositories/note.ts | 6 +++--- src/models/repositories/notification.ts | 4 ++-- src/models/repositories/page.ts | 2 +- src/models/repositories/user-group.ts | 2 +- src/models/repositories/user-list.ts | 2 +- src/models/repositories/user.ts | 8 ++++---- src/queue/index.ts | 2 +- src/queue/initialize.ts | 2 +- src/queue/processors/db/export-blocking.ts | 2 +- src/queue/processors/db/export-following.ts | 2 +- src/queue/processors/db/export-mute.ts | 2 +- src/queue/processors/db/export-user-lists.ts | 2 +- src/queue/processors/db/import-following.ts | 6 +++--- src/queue/processors/db/import-user-lists.ts | 8 ++++---- src/queue/processors/deliver.ts | 6 +++--- src/queue/processors/inbox.ts | 4 ++-- src/queue/queues.ts | 2 +- src/remote/activitypub/db-resolver.ts | 2 +- src/remote/activitypub/kernel/announce/note.ts | 6 +++--- src/remote/activitypub/kernel/create/note.ts | 4 ++-- src/remote/activitypub/kernel/delete/note.ts | 2 +- src/remote/activitypub/kernel/flag/index.ts | 4 ++-- src/remote/activitypub/kernel/read.ts | 2 +- src/remote/activitypub/misc/ld-signature.ts | 2 +- src/remote/activitypub/models/image.ts | 2 +- src/remote/activitypub/models/note.ts | 10 +++++----- src/remote/activitypub/models/person.ts | 10 +++++----- src/remote/activitypub/models/question.ts | 2 +- src/remote/activitypub/renderer/accept.ts | 2 +- src/remote/activitypub/renderer/add.ts | 2 +- src/remote/activitypub/renderer/announce.ts | 2 +- src/remote/activitypub/renderer/block.ts | 2 +- src/remote/activitypub/renderer/create.ts | 2 +- src/remote/activitypub/renderer/delete.ts | 2 +- src/remote/activitypub/renderer/emoji.ts | 2 +- src/remote/activitypub/renderer/follow-relay.ts | 2 +- src/remote/activitypub/renderer/follow-user.ts | 2 +- src/remote/activitypub/renderer/follow.ts | 2 +- src/remote/activitypub/renderer/hashtag.ts | 2 +- src/remote/activitypub/renderer/index.ts | 4 ++-- src/remote/activitypub/renderer/key.ts | 2 +- src/remote/activitypub/renderer/like.ts | 2 +- src/remote/activitypub/renderer/mention.ts | 2 +- src/remote/activitypub/renderer/note.ts | 2 +- src/remote/activitypub/renderer/person.ts | 4 ++-- src/remote/activitypub/renderer/question.ts | 2 +- src/remote/activitypub/renderer/read.ts | 2 +- src/remote/activitypub/renderer/reject.ts | 2 +- src/remote/activitypub/renderer/remove.ts | 2 +- src/remote/activitypub/renderer/undo.ts | 2 +- src/remote/activitypub/renderer/update.ts | 2 +- src/remote/activitypub/renderer/vote.ts | 2 +- src/remote/activitypub/request.ts | 6 +++--- src/remote/activitypub/resolver.ts | 4 ++-- src/remote/resolve-user.ts | 4 ++-- src/remote/webfinger.ts | 2 +- src/server/activitypub.ts | 4 ++-- src/server/activitypub/featured.ts | 2 +- src/server/activitypub/followers.ts | 4 ++-- src/server/activitypub/following.ts | 4 ++-- src/server/activitypub/outbox.ts | 4 ++-- src/server/api/2fa.ts | 2 +- src/server/api/authenticate.ts | 2 +- .../api/common/generate-native-user-token.ts | 2 +- src/server/api/common/getters.ts | 2 +- src/server/api/common/read-messaging-message.ts | 2 +- src/server/api/common/signin.ts | 4 ++-- src/server/api/common/signup.ts | 4 ++-- src/server/api/define.ts | 2 +- src/server/api/endpoints.ts | 2 +- .../api/endpoints/admin/abuse-user-reports.ts | 2 +- .../api/endpoints/admin/announcements/create.ts | 2 +- .../api/endpoints/admin/announcements/delete.ts | 2 +- .../api/endpoints/admin/announcements/list.ts | 2 +- .../api/endpoints/admin/announcements/update.ts | 2 +- .../endpoints/admin/delete-all-files-of-a-user.ts | 2 +- src/server/api/endpoints/admin/drive/files.ts | 2 +- src/server/api/endpoints/admin/drive/show-file.ts | 2 +- src/server/api/endpoints/admin/emoji/add.ts | 4 ++-- src/server/api/endpoints/admin/emoji/copy.ts | 4 ++-- .../api/endpoints/admin/emoji/list-remote.ts | 4 ++-- src/server/api/endpoints/admin/emoji/list.ts | 2 +- src/server/api/endpoints/admin/emoji/remove.ts | 2 +- src/server/api/endpoints/admin/emoji/update.ts | 2 +- .../federation/refresh-remote-instance-metadata.ts | 2 +- .../endpoints/admin/federation/update-instance.ts | 2 +- src/server/api/endpoints/admin/invite.ts | 2 +- src/server/api/endpoints/admin/moderators/add.ts | 2 +- .../api/endpoints/admin/moderators/remove.ts | 2 +- src/server/api/endpoints/admin/promo/create.ts | 2 +- src/server/api/endpoints/admin/reset-password.ts | 2 +- .../endpoints/admin/resolve-abuse-user-report.ts | 2 +- .../api/endpoints/admin/show-moderation-logs.ts | 2 +- src/server/api/endpoints/admin/show-user.ts | 2 +- src/server/api/endpoints/admin/silence-user.ts | 2 +- src/server/api/endpoints/admin/suspend-user.ts | 2 +- src/server/api/endpoints/admin/unsilence-user.ts | 2 +- src/server/api/endpoints/admin/unsuspend-user.ts | 2 +- src/server/api/endpoints/admin/update-meta.ts | 4 ++-- .../api/endpoints/admin/update-remote-user.ts | 2 +- src/server/api/endpoints/announcements.ts | 2 +- src/server/api/endpoints/antennas/create.ts | 4 ++-- src/server/api/endpoints/antennas/delete.ts | 2 +- src/server/api/endpoints/antennas/notes.ts | 2 +- src/server/api/endpoints/antennas/show.ts | 2 +- src/server/api/endpoints/antennas/update.ts | 2 +- src/server/api/endpoints/ap/show.ts | 6 +++--- src/server/api/endpoints/app/create.ts | 4 ++-- src/server/api/endpoints/app/show.ts | 2 +- src/server/api/endpoints/auth/accept.ts | 4 ++-- src/server/api/endpoints/auth/session/generate.ts | 4 ++-- src/server/api/endpoints/blocking/create.ts | 2 +- src/server/api/endpoints/blocking/delete.ts | 2 +- src/server/api/endpoints/blocking/list.ts | 2 +- src/server/api/endpoints/channels/create.ts | 4 ++-- src/server/api/endpoints/channels/follow.ts | 4 ++-- src/server/api/endpoints/channels/followed.ts | 2 +- src/server/api/endpoints/channels/owned.ts | 2 +- src/server/api/endpoints/channels/show.ts | 2 +- src/server/api/endpoints/channels/timeline.ts | 2 +- src/server/api/endpoints/channels/unfollow.ts | 2 +- src/server/api/endpoints/channels/update.ts | 2 +- src/server/api/endpoints/charts/user/drive.ts | 2 +- src/server/api/endpoints/charts/user/following.ts | 2 +- src/server/api/endpoints/charts/user/notes.ts | 2 +- src/server/api/endpoints/charts/user/reactions.ts | 2 +- src/server/api/endpoints/clips/add-note.ts | 4 ++-- src/server/api/endpoints/clips/create.ts | 2 +- src/server/api/endpoints/clips/delete.ts | 2 +- src/server/api/endpoints/clips/notes.ts | 2 +- src/server/api/endpoints/clips/show.ts | 2 +- src/server/api/endpoints/clips/update.ts | 2 +- src/server/api/endpoints/drive.ts | 2 +- src/server/api/endpoints/drive/files.ts | 2 +- .../api/endpoints/drive/files/attached-notes.ts | 2 +- src/server/api/endpoints/drive/files/create.ts | 2 +- src/server/api/endpoints/drive/files/delete.ts | 2 +- src/server/api/endpoints/drive/files/find.ts | 2 +- src/server/api/endpoints/drive/files/show.ts | 2 +- src/server/api/endpoints/drive/files/update.ts | 2 +- .../api/endpoints/drive/files/upload-from-url.ts | 2 +- src/server/api/endpoints/drive/folders.ts | 2 +- src/server/api/endpoints/drive/folders/create.ts | 4 ++-- src/server/api/endpoints/drive/folders/delete.ts | 2 +- src/server/api/endpoints/drive/folders/find.ts | 2 +- src/server/api/endpoints/drive/folders/show.ts | 2 +- src/server/api/endpoints/drive/folders/update.ts | 2 +- src/server/api/endpoints/drive/stream.ts | 2 +- src/server/api/endpoints/federation/followers.ts | 2 +- src/server/api/endpoints/federation/following.ts | 2 +- src/server/api/endpoints/federation/instances.ts | 4 ++-- .../api/endpoints/federation/show-instance.ts | 4 ++-- src/server/api/endpoints/federation/users.ts | 2 +- src/server/api/endpoints/following/create.ts | 2 +- src/server/api/endpoints/following/delete.ts | 2 +- .../api/endpoints/following/requests/accept.ts | 2 +- .../api/endpoints/following/requests/cancel.ts | 2 +- .../api/endpoints/following/requests/reject.ts | 2 +- src/server/api/endpoints/games/reversi/games.ts | 2 +- .../api/endpoints/games/reversi/games/show.ts | 2 +- .../api/endpoints/games/reversi/games/surrender.ts | 2 +- src/server/api/endpoints/games/reversi/match.ts | 4 ++-- src/server/api/endpoints/get-online-users-count.ts | 2 +- src/server/api/endpoints/hashtags/show.ts | 2 +- src/server/api/endpoints/hashtags/trend.ts | 6 +++--- src/server/api/endpoints/hashtags/users.ts | 2 +- src/server/api/endpoints/i/2fa/key-done.ts | 2 +- src/server/api/endpoints/i/2fa/register-key.ts | 2 +- src/server/api/endpoints/i/2fa/register.ts | 2 +- src/server/api/endpoints/i/favorites.ts | 2 +- src/server/api/endpoints/i/import-following.ts | 2 +- src/server/api/endpoints/i/import-user-lists.ts | 2 +- src/server/api/endpoints/i/notifications.ts | 2 +- src/server/api/endpoints/i/page-likes.ts | 2 +- src/server/api/endpoints/i/pages.ts | 2 +- src/server/api/endpoints/i/pin.ts | 2 +- src/server/api/endpoints/i/read-announcement.ts | 4 ++-- src/server/api/endpoints/i/registry/set.ts | 2 +- src/server/api/endpoints/i/revoke-token.ts | 2 +- src/server/api/endpoints/i/signin-history.ts | 2 +- src/server/api/endpoints/i/unpin.ts | 2 +- src/server/api/endpoints/i/update-email.ts | 2 +- src/server/api/endpoints/i/update.ts | 8 ++++---- src/server/api/endpoints/i/user-group-invites.ts | 2 +- src/server/api/endpoints/messaging/messages.ts | 2 +- .../api/endpoints/messaging/messages/create.ts | 2 +- .../api/endpoints/messaging/messages/delete.ts | 2 +- .../api/endpoints/messaging/messages/read.ts | 2 +- src/server/api/endpoints/meta.ts | 6 +++--- src/server/api/endpoints/miauth/gen-token.ts | 4 ++-- src/server/api/endpoints/mute/create.ts | 4 ++-- src/server/api/endpoints/mute/delete.ts | 2 +- src/server/api/endpoints/mute/list.ts | 2 +- src/server/api/endpoints/notes.ts | 2 +- src/server/api/endpoints/notes/children.ts | 2 +- src/server/api/endpoints/notes/clips.ts | 2 +- src/server/api/endpoints/notes/conversation.ts | 2 +- src/server/api/endpoints/notes/create.ts | 6 +++--- src/server/api/endpoints/notes/delete.ts | 2 +- src/server/api/endpoints/notes/favorites/create.ts | 4 ++-- src/server/api/endpoints/notes/favorites/delete.ts | 2 +- src/server/api/endpoints/notes/global-timeline.ts | 4 ++-- src/server/api/endpoints/notes/hybrid-timeline.ts | 4 ++-- src/server/api/endpoints/notes/local-timeline.ts | 4 ++-- src/server/api/endpoints/notes/mentions.ts | 2 +- src/server/api/endpoints/notes/polls/vote.ts | 4 ++-- src/server/api/endpoints/notes/reactions.ts | 2 +- src/server/api/endpoints/notes/reactions/create.ts | 2 +- src/server/api/endpoints/notes/reactions/delete.ts | 2 +- src/server/api/endpoints/notes/renotes.ts | 2 +- src/server/api/endpoints/notes/replies.ts | 2 +- src/server/api/endpoints/notes/search-by-tag.ts | 6 +++--- src/server/api/endpoints/notes/search.ts | 4 ++-- src/server/api/endpoints/notes/show.ts | 2 +- src/server/api/endpoints/notes/state.ts | 2 +- src/server/api/endpoints/notes/timeline.ts | 2 +- src/server/api/endpoints/notes/unrenote.ts | 2 +- .../api/endpoints/notes/user-list-timeline.ts | 2 +- src/server/api/endpoints/notes/watching/create.ts | 2 +- src/server/api/endpoints/notes/watching/delete.ts | 2 +- src/server/api/endpoints/page-push.ts | 2 +- src/server/api/endpoints/pages/create.ts | 4 ++-- src/server/api/endpoints/pages/delete.ts | 2 +- src/server/api/endpoints/pages/like.ts | 4 ++-- src/server/api/endpoints/pages/show.ts | 2 +- src/server/api/endpoints/pages/unlike.ts | 2 +- src/server/api/endpoints/pages/update.ts | 2 +- src/server/api/endpoints/pinned-users.ts | 4 ++-- src/server/api/endpoints/promo/read.ts | 4 ++-- src/server/api/endpoints/room/show.ts | 4 ++-- src/server/api/endpoints/sw/register.ts | 4 ++-- src/server/api/endpoints/users/clips.ts | 2 +- src/server/api/endpoints/users/followers.ts | 4 ++-- src/server/api/endpoints/users/following.ts | 4 ++-- .../users/get-frequently-replied-users.ts | 2 +- src/server/api/endpoints/users/groups/create.ts | 2 +- src/server/api/endpoints/users/groups/delete.ts | 2 +- .../endpoints/users/groups/invitations/accept.ts | 4 ++-- .../endpoints/users/groups/invitations/reject.ts | 2 +- src/server/api/endpoints/users/groups/invite.ts | 4 ++-- src/server/api/endpoints/users/groups/pull.ts | 2 +- src/server/api/endpoints/users/groups/show.ts | 2 +- src/server/api/endpoints/users/groups/transfer.ts | 2 +- src/server/api/endpoints/users/groups/update.ts | 2 +- src/server/api/endpoints/users/lists/create.ts | 2 +- src/server/api/endpoints/users/lists/delete.ts | 2 +- src/server/api/endpoints/users/lists/pull.ts | 2 +- src/server/api/endpoints/users/lists/push.ts | 2 +- src/server/api/endpoints/users/lists/show.ts | 2 +- src/server/api/endpoints/users/lists/update.ts | 2 +- src/server/api/endpoints/users/notes.ts | 2 +- src/server/api/endpoints/users/pages.ts | 2 +- src/server/api/endpoints/users/relation.ts | 2 +- src/server/api/endpoints/users/report-abuse.ts | 4 ++-- src/server/api/endpoints/users/show.ts | 2 +- src/server/api/endpoints/users/stats.ts | 2 +- src/server/api/limiter.ts | 2 +- src/server/api/openapi/description.ts | 2 +- src/server/api/openapi/gen-spec.ts | 2 +- src/server/api/openapi/schemas.ts | 2 +- src/server/api/private/signin.ts | 4 ++-- src/server/api/private/signup.ts | 4 ++-- src/server/api/service/discord.ts | 6 +++--- src/server/api/service/github.ts | 6 +++--- src/server/api/service/twitter.ts | 4 ++-- src/server/api/stream/channels/antenna.ts | 2 +- src/server/api/stream/channels/channel.ts | 2 +- src/server/api/stream/channels/global-timeline.ts | 6 +++--- src/server/api/stream/channels/hashtag.ts | 4 ++-- src/server/api/stream/channels/home-timeline.ts | 4 ++-- src/server/api/stream/channels/hybrid-timeline.ts | 6 +++--- src/server/api/stream/channels/local-timeline.ts | 6 +++--- src/server/api/stream/channels/user-list.ts | 2 +- src/server/file/send-drive-file.ts | 6 +++--- src/server/index.ts | 6 +++--- src/server/nodeinfo.ts | 4 ++-- src/server/proxy/proxy-media.ts | 6 +++--- src/server/web/feed.ts | 2 +- src/server/web/index.ts | 8 ++++---- src/server/web/manifest.ts | 2 +- src/server/web/url-preview.ts | 6 +++--- src/server/well-known.ts | 6 +++--- src/services/add-note-to-antenna.ts | 4 ++-- src/services/blocking/create.ts | 2 +- src/services/chart/charts/classes/active-users.ts | 2 +- src/services/chart/charts/classes/drive.ts | 2 +- src/services/chart/charts/classes/federation.ts | 2 +- src/services/chart/charts/classes/hashtag.ts | 2 +- src/services/chart/charts/classes/instance.ts | 4 ++-- src/services/chart/charts/classes/network.ts | 2 +- src/services/chart/charts/classes/notes.ts | 2 +- .../chart/charts/classes/per-user-drive.ts | 2 +- .../chart/charts/classes/per-user-following.ts | 2 +- .../chart/charts/classes/per-user-notes.ts | 2 +- .../chart/charts/classes/per-user-reactions.ts | 2 +- src/services/chart/charts/classes/test-grouped.ts | 2 +- src/services/chart/charts/classes/test-unique.ts | 2 +- src/services/chart/charts/classes/test.ts | 2 +- src/services/chart/charts/classes/users.ts | 2 +- src/services/chart/core.ts | 4 ++-- src/services/chart/index.ts | 2 +- src/services/create-notification.ts | 2 +- src/services/create-system-user.ts | 4 ++-- src/services/drive/add-file.ts | 10 +++++----- src/services/drive/delete-file.ts | 4 ++-- src/services/drive/internal-storage.ts | 2 +- src/services/drive/s3.ts | 2 +- src/services/drive/upload-from-url.ts | 4 ++-- src/services/fetch-instance-metadata.ts | 4 ++-- src/services/following/create.ts | 6 +++--- src/services/following/requests/accept.ts | 2 +- src/services/following/requests/cancel.ts | 2 +- src/services/following/requests/create.ts | 2 +- src/services/i/pin.ts | 6 +++--- src/services/insert-moderation-log.ts | 2 +- src/services/instance-actor.ts | 2 +- src/services/logger.ts | 4 ++-- src/services/messages/create.ts | 2 +- src/services/messages/delete.ts | 2 +- src/services/note/create.ts | 22 +++++++++++----------- src/services/note/delete.ts | 4 ++-- src/services/note/polls/vote.ts | 2 +- src/services/note/reaction/create.ts | 6 +++--- src/services/note/reaction/delete.ts | 4 ++-- src/services/note/read.ts | 4 ++-- src/services/note/unread.ts | 2 +- src/services/note/watch.ts | 2 +- src/services/push-notification.ts | 4 ++-- src/services/register-or-fetch-instance-doc.ts | 6 +++--- src/services/relay.ts | 2 +- src/services/send-email-notification.ts | 2 +- src/services/send-email.ts | 4 ++-- src/services/stream.ts | 2 +- src/services/suspend-user.ts | 2 +- src/services/unsuspend-user.ts | 2 +- src/services/update-hashtag.ts | 4 ++-- src/services/user-list/push.ts | 4 ++-- src/tools/accept-migration.ts | 2 +- src/tools/add-emoji.ts | 2 +- src/tools/resync-remote-user.ts | 2 +- 391 files changed, 557 insertions(+), 557 deletions(-) (limited to 'src/client/scripts') diff --git a/src/argv.ts b/src/argv.ts index a92338f867..9c69a450db 100644 --- a/src/argv.ts +++ b/src/argv.ts @@ -1,5 +1,5 @@ import * as program from 'commander'; -import config from './config'; +import config from '@/config'; program .version(config.version) diff --git a/src/boot/master.ts b/src/boot/master.ts index 33ccec55d0..ef8692b308 100644 --- a/src/boot/master.ts +++ b/src/boot/master.ts @@ -6,11 +6,11 @@ import * as isRoot from 'is-root'; import { getConnection } from 'typeorm'; import Logger from '../services/logger'; -import loadConfig from '../config/load'; -import { Config } from '../config/types'; +import loadConfig from '@/config/load'; +import { Config } from '@/config/types'; import { lessThan } from '../prelude/array'; import { program } from '../argv'; -import { showMachineInfo } from '../misc/show-machine-info'; +import { showMachineInfo } from '@/misc/show-machine-info'; import { initDb } from '../db/postgre'; const meta = require('../meta.json'); diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue index 2014c710a5..35cfb77301 100644 --- a/src/client/components/autocomplete.vue +++ b/src/client/components/autocomplete.vue @@ -29,9 +29,9 @@