diff --git a/src/client/components/notification-setting-window.vue b/src/client/components/notification-setting-window.vue index 0b416721706ad0c3f1193207d5bb55ecf264ab5d..14e0b76cc6fd39ad84cd495f8b55fb1c4426656b 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 8be1e191b99f8aea269abc0870a21fcec8cf5dfd..78c1cce0c7cdc57be25521b380a14258eea9a716 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 1ef350335ce8e6056a67d168168fa6f1c8523c94..5f84349474ba617d4a04cd68d980ec69dbdc78a4 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 988fdb341ffcea5ce63e8258a16de4b806bf0130..47184caacc90d7a23b017a39c575ecf820e2b14e 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 3a9043fac604085068907c9fe9916fd680eb3846..a2da07d76f47275f0bb97f5cfcc445e14e9cfa59 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 0c5586054ff00d451e40e6d70993b9452cdd96ce..fcabbbc3ddd2e200e13f9028cfa6d596d07e387e 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 fb7e12760ed5b2d9931b321982277ea7975b8e00..9dd637251dc8b1167354051c2d8148e3f6014e9f 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 = {