From abc45ded9be06e01c95d9ac9966ab8ee0dacf138 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 9 Oct 2021 12:47:40 +0900 Subject: [PATCH] refactor: use path alias --- src/client/components/notification-setting-window.vue | 2 +- src/client/components/notifications.vue | 2 +- src/client/pages/settings/notifications.vue | 2 +- src/models/entities/notification.ts | 2 +- src/models/entities/user-profile.ts | 2 +- src/server/api/endpoints/i/notifications.ts | 2 +- src/server/api/endpoints/i/update.ts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/client/components/notification-setting-window.vue b/src/client/components/notification-setting-window.vue index 0b41672170..14e0b76cc6 100644 --- a/src/client/components/notification-setting-window.vue +++ b/src/client/components/notification-setting-window.vue @@ -32,7 +32,7 @@ import XModalWindow from '@client/components/ui/modal-window.vue'; import MkSwitch from './form/switch.vue'; import MkInfo from './ui/info.vue'; import MkButton from './ui/button.vue'; -import { notificationTypes } from '../../types'; +import { notificationTypes } from '@/types'; export default defineComponent({ components: { diff --git a/src/client/components/notifications.vue b/src/client/components/notifications.vue index 8be1e191b9..78c1cce0c7 100644 --- a/src/client/components/notifications.vue +++ b/src/client/components/notifications.vue @@ -26,7 +26,7 @@ import paging from '@client/scripts/paging'; import XNotification from './notification.vue'; import XList from './date-separated-list.vue'; import XNote from './note.vue'; -import { notificationTypes } from '../../types'; +import { notificationTypes } from '@/types'; import * as os from '@client/os'; import MkButton from '@client/components/ui/button.vue'; diff --git a/src/client/pages/settings/notifications.vue b/src/client/pages/settings/notifications.vue index 1ef350335c..5f84349474 100644 --- a/src/client/pages/settings/notifications.vue +++ b/src/client/pages/settings/notifications.vue @@ -15,7 +15,7 @@ import FormButton from '@client/components/debobigego/button.vue'; import FormLink from '@client/components/debobigego/link.vue'; import FormBase from '@client/components/debobigego/base.vue'; import FormGroup from '@client/components/debobigego/group.vue'; -import { notificationTypes } from '../../../types'; +import { notificationTypes } from '@/types'; import * as os from '@client/os'; import * as symbols from '@client/symbols'; diff --git a/src/models/entities/notification.ts b/src/models/entities/notification.ts index 988fdb341f..47184caacc 100644 --- a/src/models/entities/notification.ts +++ b/src/models/entities/notification.ts @@ -5,7 +5,7 @@ import { Note } from './note'; import { FollowRequest } from './follow-request'; import { UserGroupInvitation } from './user-group-invitation'; import { AccessToken } from './access-token'; -import { notificationTypes } from '../../types'; +import { notificationTypes } from '@/types'; @Entity() export class Notification { diff --git a/src/models/entities/user-profile.ts b/src/models/entities/user-profile.ts index 3a9043fac6..a2da07d76f 100644 --- a/src/models/entities/user-profile.ts +++ b/src/models/entities/user-profile.ts @@ -2,7 +2,7 @@ import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'type import { id } from '../id'; import { User } from './user'; import { Page } from './page'; -import { notificationTypes } from '../../types'; +import { notificationTypes } from '@/types'; // TODO: このテーブルで管理している情報すべてレジストリで管理するようにしても良いかも // ただ、「emailVerified が true なユーザーを find する」のようなクエリは書けなくなるからウーン diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts index 0c5586054f..fcabbbc3dd 100644 --- a/src/server/api/endpoints/i/notifications.ts +++ b/src/server/api/endpoints/i/notifications.ts @@ -4,7 +4,7 @@ import { readNotification } from '../../common/read-notification'; import define from '../../define'; import { makePaginationQuery } from '../../common/make-pagination-query'; import { Notifications, Followings, Mutings, Users } from '@/models/index'; -import { notificationTypes } from '../../../../types'; +import { notificationTypes } from '@/types'; import read from '@/services/note/read'; export const meta = { diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index fb7e12760e..9dd637251d 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -13,7 +13,7 @@ import { ApiError } from '../../error'; import { Users, DriveFiles, UserProfiles, Pages } from '@/models/index'; import { User } from '@/models/entities/user'; import { UserProfile } from '@/models/entities/user-profile'; -import { notificationTypes } from '../../../../types'; +import { notificationTypes } from '@/types'; import { normalizeForSearch } from '@/misc/normalize-for-search'; export const meta = {