diff options
Diffstat (limited to 'src/client')
25 files changed, 32 insertions, 32 deletions
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 @@ <script lang="ts"> import { defineComponent, markRaw } from 'vue'; -import { emojilist } from '../../misc/emojilist'; +import { emojilist } from '@/misc/emojilist'; import contains from '@client/scripts/contains'; -import { twemojiSvgBase } from '../../misc/twemoji-base'; +import { twemojiSvgBase } from '@/misc/twemoji-base'; import { getStaticImageUrl } from '@client/scripts/get-static-image-url'; import { acct } from '@client/filters/user'; import * as os from '@client/os'; diff --git a/src/client/components/emoji-picker.vue b/src/client/components/emoji-picker.vue index 4e4468912f..573833b9d3 100644 --- a/src/client/components/emoji-picker.vue +++ b/src/client/components/emoji-picker.vue @@ -74,7 +74,7 @@ <script lang="ts"> import { defineComponent, markRaw } from 'vue'; -import { emojilist } from '../../misc/emojilist'; +import { emojilist } from '@/misc/emojilist'; import { getStaticImageUrl } from '@client/scripts/get-static-image-url'; import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice, faGlobe, faClock, faUser, faChevronDown, faShapes, faBicycle, faHashtag } from '@fortawesome/free-solid-svg-icons'; import { faHeart, faFlag, faLaugh } from '@fortawesome/free-regular-svg-icons'; diff --git a/src/client/components/notification.vue b/src/client/components/notification.vue index ac46307352..2b8b440ced 100644 --- a/src/client/components/notification.vue +++ b/src/client/components/notification.vue @@ -61,7 +61,7 @@ import { defineComponent } from 'vue'; import { faIdCardAlt, faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faCheck, faPollH } from '@fortawesome/free-solid-svg-icons'; import { faClock } from '@fortawesome/free-regular-svg-icons'; -import { getNoteSummary } from '../../misc/get-note-summary'; +import { getNoteSummary } from '@/misc/get-note-summary'; import XReactionIcon from './reaction-icon.vue'; import MkFollowButton from './follow-button.vue'; import notePage from '../filters/note'; diff --git a/src/client/components/poll-editor.vue b/src/client/components/poll-editor.vue index 49454f23c3..3503d3df71 100644 --- a/src/client/components/poll-editor.vue +++ b/src/client/components/poll-editor.vue @@ -52,7 +52,7 @@ import { defineComponent } from 'vue'; import { faExclamationTriangle, faTimes } from '@fortawesome/free-solid-svg-icons'; import { addTime } from '../../prelude/time'; -import { formatDateTimeString } from '../../misc/format-time-string'; +import { formatDateTimeString } from '@/misc/format-time-string'; import MkInput from './ui/input.vue'; import MkSelect from './ui/select.vue'; import MkSwitch from './ui/switch.vue'; diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue index dc24c714b5..7d2355c190 100644 --- a/src/client/components/post-form.vue +++ b/src/client/components/post-form.vue @@ -61,9 +61,9 @@ import XNotePreview from './note-preview.vue'; import { parse } from '../../mfm/parse'; import { host, url } from '@client/config'; import { erase, unique } from '../../prelude/array'; -import extractMentions from '../../misc/extract-mentions'; -import getAcct from '../../misc/acct/render'; -import { formatTimeString } from '../../misc/format-time-string'; +import extractMentions from '@/misc/extract-mentions'; +import getAcct from '@/misc/acct/render'; +import { formatTimeString } from '@/misc/format-time-string'; import { Autocomplete } from '@client/scripts/autocomplete'; import { noteVisibilities } from '../../types'; import * as os from '@client/os'; diff --git a/src/client/components/token-generate-window.vue b/src/client/components/token-generate-window.vue index 9d5b16e03f..87a76931e4 100644 --- a/src/client/components/token-generate-window.vue +++ b/src/client/components/token-generate-window.vue @@ -27,7 +27,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import { kinds } from '../../misc/api-permissions'; +import { kinds } from '@/misc/api-permissions'; import XModalWindow from '@client/components/ui/modal-window.vue'; import MkInput from './ui/input.vue'; import MkTextarea from './ui/textarea.vue'; diff --git a/src/client/components/user-info.vue b/src/client/components/user-info.vue index 711e367411..34ea38c3b4 100644 --- a/src/client/components/user-info.vue +++ b/src/client/components/user-info.vue @@ -29,7 +29,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import parseAcct from '../../misc/acct/parse'; +import parseAcct from '@/misc/acct/parse'; import MkFollowButton from './follow-button.vue'; import { userPage } from '../filters/user'; diff --git a/src/client/components/user-preview.vue b/src/client/components/user-preview.vue index 216141347c..b2b3358374 100644 --- a/src/client/components/user-preview.vue +++ b/src/client/components/user-preview.vue @@ -33,7 +33,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import parseAcct from '../../misc/acct/parse'; +import parseAcct from '@/misc/acct/parse'; import MkFollowButton from './follow-button.vue'; import { userPage } from '../filters/user'; import * as os from '@client/os'; diff --git a/src/client/filters/user.ts b/src/client/filters/user.ts index e3b7e556b0..ad4663cb92 100644 --- a/src/client/filters/user.ts +++ b/src/client/filters/user.ts @@ -1,5 +1,5 @@ -import getAcct from '../../misc/acct/render'; -import getUserName from '../../misc/get-user-name'; +import getAcct from '@/misc/acct/render'; +import getUserName from '@/misc/get-user-name'; import { url } from '@client/config'; export const acct = user => { diff --git a/src/client/i18n.ts b/src/client/i18n.ts index d0f4c963ce..dc23676474 100644 --- a/src/client/i18n.ts +++ b/src/client/i18n.ts @@ -1,6 +1,6 @@ import { markRaw } from 'vue'; import { locale } from '@client/config'; -import { I18n } from '../misc/i18n'; +import { I18n } from '@/misc/i18n'; export const i18n = markRaw(new I18n(locale)); diff --git a/src/client/pages/follow.vue b/src/client/pages/follow.vue index 018901abb4..f5afdf0892 100644 --- a/src/client/pages/follow.vue +++ b/src/client/pages/follow.vue @@ -6,7 +6,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; import * as os from '@client/os'; -import parseAcct from '../../misc/acct/parse'; +import parseAcct from '@/misc/acct/parse'; export default defineComponent({ created() { diff --git a/src/client/pages/instance/abuses.vue b/src/client/pages/instance/abuses.vue index b78141eb2e..d7d7697ebd 100644 --- a/src/client/pages/instance/abuses.vue +++ b/src/client/pages/instance/abuses.vue @@ -65,7 +65,7 @@ import { defineComponent } from 'vue'; import { faPlus, faUsers, faSearch, faBookmark, faMicrophoneSlash, faExclamationCircle } from '@fortawesome/free-solid-svg-icons'; import { faSnowflake, faBookmark as farBookmark } from '@fortawesome/free-regular-svg-icons'; -import parseAcct from '../../../misc/acct/parse'; +import parseAcct from '@/misc/acct/parse'; import MkButton from '@client/components/ui/button.vue'; import MkInput from '@client/components/ui/input.vue'; import MkSelect from '@client/components/ui/select.vue'; diff --git a/src/client/pages/instance/settings.vue b/src/client/pages/instance/settings.vue index 93564d42e9..891eba3cf0 100644 --- a/src/client/pages/instance/settings.vue +++ b/src/client/pages/instance/settings.vue @@ -258,7 +258,7 @@ import MkTextarea from '@client/components/ui/textarea.vue'; import MkSwitch from '@client/components/ui/switch.vue'; import MkInfo from '@client/components/ui/info.vue'; import { url } from '@client/config'; -import getAcct from '../../../misc/acct/render'; +import getAcct from '@/misc/acct/render'; import * as os from '@client/os'; import { fetchInstance } from '@client/instance'; diff --git a/src/client/pages/instance/users.vue b/src/client/pages/instance/users.vue index c88306b55b..013eed3971 100644 --- a/src/client/pages/instance/users.vue +++ b/src/client/pages/instance/users.vue @@ -82,7 +82,7 @@ import { defineComponent } from 'vue'; import { faPlus, faUsers, faSearch, faBookmark, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons'; import { faSnowflake, faBookmark as farBookmark } from '@fortawesome/free-regular-svg-icons'; -import parseAcct from '../../../misc/acct/parse'; +import parseAcct from '@/misc/acct/parse'; import MkButton from '@client/components/ui/button.vue'; import MkInput from '@client/components/ui/input.vue'; import MkSelect from '@client/components/ui/select.vue'; diff --git a/src/client/pages/messaging/index.vue b/src/client/pages/messaging/index.vue index 2dfad3e238..c906b968a4 100644 --- a/src/client/pages/messaging/index.vue +++ b/src/client/pages/messaging/index.vue @@ -41,7 +41,7 @@ <script lang="ts"> import { defineAsyncComponent, defineComponent } from 'vue'; import { faUser, faUsers, faComments, faPlus } from '@fortawesome/free-solid-svg-icons'; -import getAcct from '../../../misc/acct/render'; +import getAcct from '@/misc/acct/render'; import MkButton from '@client/components/ui/button.vue'; import { acct } from '../../filters/user'; import * as os from '@client/os'; diff --git a/src/client/pages/messaging/messaging-room.form.vue b/src/client/pages/messaging/messaging-room.form.vue index a98448553f..5826b8d0d2 100644 --- a/src/client/pages/messaging/messaging-room.form.vue +++ b/src/client/pages/messaging/messaging-room.form.vue @@ -26,7 +26,7 @@ import { defineComponent, defineAsyncComponent } from 'vue'; import { faPaperPlane, faPhotoVideo, faLaughSquint } from '@fortawesome/free-solid-svg-icons'; import insertTextAtCursor from 'insert-text-at-cursor'; import * as autosize from 'autosize'; -import { formatTimeString } from '../../../misc/format-time-string'; +import { formatTimeString } from '@/misc/format-time-string'; import { selectFile } from '@client/scripts/select-file'; import * as os from '@client/os'; import { Autocomplete } from '@client/scripts/autocomplete'; diff --git a/src/client/pages/messaging/messaging-room.vue b/src/client/pages/messaging/messaging-room.vue index 53da13f5a3..8473bb36c2 100644 --- a/src/client/pages/messaging/messaging-room.vue +++ b/src/client/pages/messaging/messaging-room.vue @@ -42,7 +42,7 @@ import { faWindowMaximize } from '@fortawesome/free-regular-svg-icons'; import XList from '@client/components/date-separated-list.vue'; import XMessage from './messaging-room.message.vue'; import XForm from './messaging-room.form.vue'; -import parseAcct from '../../../misc/acct/parse'; +import parseAcct from '@/misc/acct/parse'; import { isBottom, onScrollBottom, scroll } from '@client/scripts/scroll'; import * as os from '@client/os'; import { popout } from '@client/scripts/popout'; diff --git a/src/client/pages/my-antennas/index.antenna.vue b/src/client/pages/my-antennas/index.antenna.vue index 34452e96ac..d7050d08c4 100644 --- a/src/client/pages/my-antennas/index.antenna.vue +++ b/src/client/pages/my-antennas/index.antenna.vue @@ -53,7 +53,7 @@ import MkInput from '@client/components/ui/input.vue'; import MkTextarea from '@client/components/ui/textarea.vue'; import MkSelect from '@client/components/ui/select.vue'; import MkSwitch from '@client/components/ui/switch.vue'; -import getAcct from '../../../misc/acct/render'; +import getAcct from '@/misc/acct/render'; import * as os from '@client/os'; export default defineComponent({ diff --git a/src/client/pages/room/room.vue b/src/client/pages/room/room.vue index ceb2cc7890..e6e2809725 100644 --- a/src/client/pages/room/room.vue +++ b/src/client/pages/room/room.vue @@ -52,7 +52,7 @@ <script lang="ts"> import { computed, defineComponent } from 'vue'; import { Room } from '@client/scripts/room/room'; -import parseAcct from '../../../misc/acct/parse'; +import parseAcct from '@/misc/acct/parse'; import XPreview from './preview.vue'; const storeItems = require('@client/scripts/room/furnitures.json5'); import { faBoxOpen, faUndo, faArrowsAlt, faBan, faBroom } from '@fortawesome/free-solid-svg-icons'; diff --git a/src/client/pages/user/index.vue b/src/client/pages/user/index.vue index 18c66adbeb..5ca29a3e41 100644 --- a/src/client/pages/user/index.vue +++ b/src/client/pages/user/index.vue @@ -228,7 +228,7 @@ import MkFolder from '@client/components/ui/folder.vue'; import MkRemoteCaution from '@client/components/remote-caution.vue'; import MkTab from '@client/components/tab.vue'; import Progress from '@client/scripts/loading'; -import parseAcct from '../../../misc/acct/parse'; +import parseAcct from '@/misc/acct/parse'; import { getScrollPosition } from '@client/scripts/scroll'; import { getUserMenu } from '@client/scripts/get-user-menu'; import number from '../../filters/number'; diff --git a/src/client/scripts/gen-search-query.ts b/src/client/scripts/gen-search-query.ts index 998d932141..a1db267123 100644 --- a/src/client/scripts/gen-search-query.ts +++ b/src/client/scripts/gen-search-query.ts @@ -1,4 +1,4 @@ -import parseAcct from '../../misc/acct/parse'; +import parseAcct from '@/misc/acct/parse'; import { host as localHost } from '@client/config'; export async function genSearchQuery(v: any, q: string) { diff --git a/src/client/scripts/get-user-menu.ts b/src/client/scripts/get-user-menu.ts index 87f7bff942..163eff619c 100644 --- a/src/client/scripts/get-user-menu.ts +++ b/src/client/scripts/get-user-menu.ts @@ -3,7 +3,7 @@ import { faSnowflake, faEnvelope } from '@fortawesome/free-regular-svg-icons'; 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 getAcct from '@/misc/acct/render'; import * as os from '@client/os'; import { userActions } from '@client/store'; import { router } from '@client/router'; diff --git a/src/client/sw/compose-notification.ts b/src/client/sw/compose-notification.ts index e9586dd574..7ed0a95359 100644 --- a/src/client/sw/compose-notification.ts +++ b/src/client/sw/compose-notification.ts @@ -3,8 +3,8 @@ */ declare var self: ServiceWorkerGlobalScope; -import { getNoteSummary } from '../../misc/get-note-summary'; -import getUserName from '../../misc/get-user-name'; +import { getNoteSummary } from '@/misc/get-note-summary'; +import getUserName from '@/misc/get-user-name'; export default async function(type, data, i18n): Promise<[string, NotificationOptions] | null | undefined> { if (!i18n) { diff --git a/src/client/sw/sw.ts b/src/client/sw/sw.ts index 26b4efb053..5be4eb9770 100644 --- a/src/client/sw/sw.ts +++ b/src/client/sw/sw.ts @@ -5,7 +5,7 @@ declare var self: ServiceWorkerGlobalScope; import { get, set } from 'idb-keyval'; import composeNotification from '@client/sw/compose-notification'; -import { I18n } from '../../misc/i18n'; +import { I18n } from '@/misc/i18n'; //#region Variables const version = _VERSION_; diff --git a/src/client/ui/chat/post-form.vue b/src/client/ui/chat/post-form.vue index 398a5a176b..5bb1a04d58 100644 --- a/src/client/ui/chat/post-form.vue +++ b/src/client/ui/chat/post-form.vue @@ -56,9 +56,9 @@ import { toASCII } from 'punycode'; import { parse } from '../../../mfm/parse'; import { host, url } from '@client/config'; import { erase, unique } from '../../../prelude/array'; -import extractMentions from '../../../misc/extract-mentions'; -import getAcct from '../../../misc/acct/render'; -import { formatTimeString } from '../../../misc/format-time-string'; +import extractMentions from '@/misc/extract-mentions'; +import getAcct from '@/misc/acct/render'; +import { formatTimeString } from '@/misc/format-time-string'; import { Autocomplete } from '@client/scripts/autocomplete'; import { noteVisibilities } from '../../../types'; import * as os from '@client/os'; |