From 97f2675d404eb073a447ea9b3c7678b5e560a095 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 19 Aug 2021 22:04:15 +0900
Subject: [PATCH] refactor: use path alias to improve readability
---
src/boot/master.ts | 2 +-
src/games/reversi/core.ts | 2 +-
src/mfm/to-html.ts | 2 +-
src/models/repositories/abuse-user-report.ts | 4 ++--
src/models/repositories/antenna.ts | 2 +-
src/models/repositories/app.ts | 2 +-
src/models/repositories/auth-session.ts | 6 +++---
src/models/repositories/blocking.ts | 6 +++---
src/models/repositories/channel.ts | 4 ++--
src/models/repositories/clip.ts | 4 ++--
src/models/repositories/drive-file.ts | 10 +++++-----
src/models/repositories/drive-folder.ts | 4 ++--
src/models/repositories/emoji.ts | 2 +-
src/models/repositories/follow-request.ts | 4 ++--
src/models/repositories/following.ts | 6 +++---
src/models/repositories/gallery-like.ts | 2 +-
src/models/repositories/gallery-post.ts | 6 +++---
src/models/repositories/games/reversi/game.ts | 2 +-
src/models/repositories/games/reversi/matching.ts | 4 ++--
src/models/repositories/hashtag.ts | 2 +-
src/models/repositories/messaging-message.ts | 4 ++--
src/models/repositories/moderation-logs.ts | 4 ++--
src/models/repositories/muting.ts | 6 +++---
src/models/repositories/note-favorite.ts | 4 ++--
src/models/repositories/note-reaction.ts | 4 ++--
src/models/repositories/note.ts | 8 ++++----
src/models/repositories/notification.ts | 10 +++++-----
src/models/repositories/page-like.ts | 4 ++--
src/models/repositories/page.ts | 8 ++++----
src/models/repositories/relay.ts | 2 +-
src/models/repositories/signin.ts | 2 +-
src/models/repositories/user-group-invitation.ts | 2 +-
src/models/repositories/user-group.ts | 2 +-
src/models/repositories/user-list.ts | 2 +-
src/models/repositories/user.ts | 4 ++--
src/remote/activitypub/audience.ts | 2 +-
src/remote/activitypub/kernel/create/index.ts | 2 +-
src/remote/activitypub/kernel/delete/index.ts | 2 +-
src/remote/activitypub/kernel/index.ts | 2 +-
src/remote/activitypub/models/mention.ts | 2 +-
src/remote/activitypub/models/note.ts | 2 +-
src/remote/activitypub/models/person.ts | 2 +-
src/remote/activitypub/models/tag.ts | 2 +-
src/remote/webfinger.ts | 2 +-
src/server/activitypub/followers.ts | 2 +-
src/server/activitypub/following.ts | 2 +-
src/server/activitypub/outbox.ts | 4 ++--
src/server/api/common/read-messaging-message.ts | 2 +-
src/server/api/endpoints/app/create.ts | 2 +-
.../endpoints/users/get-frequently-replied-users.ts | 2 +-
src/server/index.ts | 2 +-
src/server/web/url-preview.ts | 2 +-
src/server/well-known.ts | 2 +-
src/services/chart/core.ts | 2 +-
src/services/note/create.ts | 2 +-
55 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/src/boot/master.ts b/src/boot/master.ts
index 4cd91dc66a..03a28c339b 100644
--- a/src/boot/master.ts
+++ b/src/boot/master.ts
@@ -7,7 +7,7 @@ import { getConnection } from 'typeorm';
import Logger from '@/services/logger';
import loadConfig from '@/config/load';
import { Config } from '@/config/types';
-import { lessThan } from '../prelude/array';
+import { lessThan } from '@/prelude/array';
import { program } from '../argv';
import { showMachineInfo } from '@/misc/show-machine-info';
import { initDb } from '../db/postgre';
diff --git a/src/games/reversi/core.ts b/src/games/reversi/core.ts
index e7ae1af7a2..9bfce9834a 100644
--- a/src/games/reversi/core.ts
+++ b/src/games/reversi/core.ts
@@ -1,4 +1,4 @@
-import { count, concat } from '../../prelude/array';
+import { count, concat } from '@/prelude/array';
// MISSKEY REVERSI ENGINE
diff --git a/src/mfm/to-html.ts b/src/mfm/to-html.ts
index 6dbcc17d29..b3678a0dda 100644
--- a/src/mfm/to-html.ts
+++ b/src/mfm/to-html.ts
@@ -1,7 +1,7 @@
import { JSDOM } from 'jsdom';
import * as mfm from 'mfm-js';
import config from '@/config/index';
-import { intersperse } from '../prelude/array';
+import { intersperse } from '@/prelude/array';
import { IMentionedRemoteUsers } from '@/models/entities/note';
import { wellKnownServices } from '../well-known-services';
diff --git a/src/models/repositories/abuse-user-report.ts b/src/models/repositories/abuse-user-report.ts
index a8c6344966..039a9924d2 100644
--- a/src/models/repositories/abuse-user-report.ts
+++ b/src/models/repositories/abuse-user-report.ts
@@ -1,7 +1,7 @@
import { EntityRepository, Repository } from 'typeorm';
import { Users } from '../index';
-import { AbuseUserReport } from '../entities/abuse-user-report';
-import { awaitAll } from '../../prelude/await-all';
+import { AbuseUserReport } from '@/models/entities/abuse-user-report';
+import { awaitAll } from '@/prelude/await-all';
@EntityRepository(AbuseUserReport)
export class AbuseUserReportRepository extends Repository<AbuseUserReport> {
diff --git a/src/models/repositories/antenna.ts b/src/models/repositories/antenna.ts
index afda5ccaaa..e61eed5e08 100644
--- a/src/models/repositories/antenna.ts
+++ b/src/models/repositories/antenna.ts
@@ -1,5 +1,5 @@
import { EntityRepository, Repository } from 'typeorm';
-import { Antenna } from '../entities/antenna';
+import { Antenna } from '@/models/entities/antenna';
import { SchemaType } from '@/misc/schema';
import { AntennaNotes, UserGroupJoinings } from '../index';
diff --git a/src/models/repositories/app.ts b/src/models/repositories/app.ts
index 698191de7e..2287bd4390 100644
--- a/src/models/repositories/app.ts
+++ b/src/models/repositories/app.ts
@@ -1,5 +1,5 @@
import { EntityRepository, Repository } from 'typeorm';
-import { App } from '../entities/app';
+import { App } from '@/models/entities/app';
import { AccessTokens } from '../index';
import { SchemaType } from '@/misc/schema';
diff --git a/src/models/repositories/auth-session.ts b/src/models/repositories/auth-session.ts
index aa1cddebcf..c8f4c10f2a 100644
--- a/src/models/repositories/auth-session.ts
+++ b/src/models/repositories/auth-session.ts
@@ -1,8 +1,8 @@
import { EntityRepository, Repository } from 'typeorm';
import { Apps } from '../index';
-import { AuthSession } from '../entities/auth-session';
-import { awaitAll } from '../../prelude/await-all';
-import { User } from '../entities/user';
+import { AuthSession } from '@/models/entities/auth-session';
+import { awaitAll } from '@/prelude/await-all';
+import { User } from '@/models/entities/user';
@EntityRepository(AuthSession)
export class AuthSessionRepository extends Repository<AuthSession> {
diff --git a/src/models/repositories/blocking.ts b/src/models/repositories/blocking.ts
index 3349a54ae9..dd3a10905c 100644
--- a/src/models/repositories/blocking.ts
+++ b/src/models/repositories/blocking.ts
@@ -1,9 +1,9 @@
import { EntityRepository, Repository } from 'typeorm';
import { Users } from '../index';
-import { Blocking } from '../entities/blocking';
-import { awaitAll } from '../../prelude/await-all';
+import { Blocking } from '@/models/entities/blocking';
+import { awaitAll } from '@/prelude/await-all';
import { SchemaType } from '@/misc/schema';
-import { User } from '../entities/user';
+import { User } from '@/models/entities/user';
export type PackedBlocking = SchemaType<typeof packedBlockingSchema>;
diff --git a/src/models/repositories/channel.ts b/src/models/repositories/channel.ts
index 1b1a30e7a2..4bb829f570 100644
--- a/src/models/repositories/channel.ts
+++ b/src/models/repositories/channel.ts
@@ -1,8 +1,8 @@
import { EntityRepository, Repository } from 'typeorm';
-import { Channel } from '../entities/channel';
+import { Channel } from '@/models/entities/channel';
import { SchemaType } from '@/misc/schema';
import { DriveFiles, ChannelFollowings, NoteUnreads } from '../index';
-import { User } from '../entities/user';
+import { User } from '@/models/entities/user';
export type PackedChannel = SchemaType<typeof packedChannelSchema>;
diff --git a/src/models/repositories/clip.ts b/src/models/repositories/clip.ts
index 608101d34b..49dc3a332e 100644
--- a/src/models/repositories/clip.ts
+++ b/src/models/repositories/clip.ts
@@ -1,8 +1,8 @@
import { EntityRepository, Repository } from 'typeorm';
-import { Clip } from '../entities/clip';
+import { Clip } from '@/models/entities/clip';
import { SchemaType } from '@/misc/schema';
import { Users } from '../index';
-import { awaitAll } from '../../prelude/await-all';
+import { awaitAll } from '@/prelude/await-all';
export type PackedClip = SchemaType<typeof packedClipSchema>;
diff --git a/src/models/repositories/drive-file.ts b/src/models/repositories/drive-file.ts
index eecb477ac0..42a60ff03c 100644
--- a/src/models/repositories/drive-file.ts
+++ b/src/models/repositories/drive-file.ts
@@ -1,13 +1,13 @@
import { EntityRepository, Repository } from 'typeorm';
-import { DriveFile } from '../entities/drive-file';
+import { DriveFile } from '@/models/entities/drive-file';
import { Users, DriveFolders } from '../index';
-import { User } from '../entities/user';
+import { User } from '@/models/entities/user';
import { toPuny } from '@/misc/convert-host';
-import { awaitAll } from '../../prelude/await-all';
+import { awaitAll } from '@/prelude/await-all';
import { SchemaType } from '@/misc/schema';
import config from '@/config/index';
-import { query, appendQuery } from '../../prelude/url';
-import { Meta } from '../entities/meta';
+import { query, appendQuery } from '@/prelude/url';
+import { Meta } from '@/models/entities/meta';
import { fetchMeta } from '@/misc/fetch-meta';
export type PackedDriveFile = SchemaType<typeof packedDriveFileSchema>;
diff --git a/src/models/repositories/drive-folder.ts b/src/models/repositories/drive-folder.ts
index de286ba218..4228284f82 100644
--- a/src/models/repositories/drive-folder.ts
+++ b/src/models/repositories/drive-folder.ts
@@ -1,7 +1,7 @@
import { EntityRepository, Repository } from 'typeorm';
import { DriveFolders, DriveFiles } from '../index';
-import { DriveFolder } from '../entities/drive-folder';
-import { awaitAll } from '../../prelude/await-all';
+import { DriveFolder } from '@/models/entities/drive-folder';
+import { awaitAll } from '@/prelude/await-all';
import { SchemaType } from '@/misc/schema';
export type PackedDriveFolder = SchemaType<typeof packedDriveFolderSchema>;
diff --git a/src/models/repositories/emoji.ts b/src/models/repositories/emoji.ts
index 3490a6ac86..c3d7184ec9 100644
--- a/src/models/repositories/emoji.ts
+++ b/src/models/repositories/emoji.ts
@@ -1,5 +1,5 @@
import { EntityRepository, Repository } from 'typeorm';
-import { Emoji } from '../entities/emoji';
+import { Emoji } from '@/models/entities/emoji';
@EntityRepository(Emoji)
export class EmojiRepository extends Repository<Emoji> {
diff --git a/src/models/repositories/follow-request.ts b/src/models/repositories/follow-request.ts
index 253e03ca7b..d6ee58e235 100644
--- a/src/models/repositories/follow-request.ts
+++ b/src/models/repositories/follow-request.ts
@@ -1,7 +1,7 @@
import { EntityRepository, Repository } from 'typeorm';
-import { FollowRequest } from '../entities/follow-request';
+import { FollowRequest } from '@/models/entities/follow-request';
import { Users } from '../index';
-import { User } from '../entities/user';
+import { User } from '@/models/entities/user';
@EntityRepository(FollowRequest)
export class FollowRequestRepository extends Repository<FollowRequest> {
diff --git a/src/models/repositories/following.ts b/src/models/repositories/following.ts
index dbbb0e6c75..3bb120bc4b 100644
--- a/src/models/repositories/following.ts
+++ b/src/models/repositories/following.ts
@@ -1,9 +1,9 @@
import { EntityRepository, Repository } from 'typeorm';
import { Users } from '../index';
-import { Following } from '../entities/following';
-import { awaitAll } from '../../prelude/await-all';
+import { Following } from '@/models/entities/following';
+import { awaitAll } from '@/prelude/await-all';
import { SchemaType } from '@/misc/schema';
-import { User } from '../entities/user';
+import { User } from '@/models/entities/user';
type LocalFollowerFollowing = Following & {
followerHost: null;
diff --git a/src/models/repositories/gallery-like.ts b/src/models/repositories/gallery-like.ts
index d0de01d8fd..79123e5eec 100644
--- a/src/models/repositories/gallery-like.ts
+++ b/src/models/repositories/gallery-like.ts
@@ -1,5 +1,5 @@
import { EntityRepository, Repository } from 'typeorm';
-import { GalleryLike } from '../entities/gallery-like';
+import { GalleryLike } from '@/models/entities/gallery-like';
import { GalleryPosts } from '../index';
@EntityRepository(GalleryLike)
diff --git a/src/models/repositories/gallery-post.ts b/src/models/repositories/gallery-post.ts
index fe44d7c93e..03edb35213 100644
--- a/src/models/repositories/gallery-post.ts
+++ b/src/models/repositories/gallery-post.ts
@@ -1,9 +1,9 @@
import { EntityRepository, Repository } from 'typeorm';
-import { GalleryPost } from '../entities/gallery-post';
+import { GalleryPost } from '@/models/entities/gallery-post';
import { SchemaType } from '../../misc/schema';
import { Users, DriveFiles, GalleryLikes } from '../index';
-import { awaitAll } from '../../prelude/await-all';
-import { User } from '../entities/user';
+import { awaitAll } from '@/prelude/await-all';
+import { User } from '@/models/entities/user';
export type PackedGalleryPost = SchemaType<typeof packedGalleryPostSchema>;
diff --git a/src/models/repositories/games/reversi/game.ts b/src/models/repositories/games/reversi/game.ts
index 021eba1da3..dc91ad51b8 100644
--- a/src/models/repositories/games/reversi/game.ts
+++ b/src/models/repositories/games/reversi/game.ts
@@ -1,7 +1,7 @@
import { User } from '@/models/entities/user';
import { EntityRepository, Repository } from 'typeorm';
import { Users } from '../../../index';
-import { ReversiGame } from '../../../entities/games/reversi/game';
+import { ReversiGame } from '@/models/entities/games/reversi/game';
@EntityRepository(ReversiGame)
export class ReversiGameRepository extends Repository<ReversiGame> {
diff --git a/src/models/repositories/games/reversi/matching.ts b/src/models/repositories/games/reversi/matching.ts
index f8ee646cb7..148221dee5 100644
--- a/src/models/repositories/games/reversi/matching.ts
+++ b/src/models/repositories/games/reversi/matching.ts
@@ -1,7 +1,7 @@
import { EntityRepository, Repository } from 'typeorm';
-import { ReversiMatching } from '../../../entities/games/reversi/matching';
+import { ReversiMatching } from '@/models/entities/games/reversi/matching';
import { Users } from '../../../index';
-import { awaitAll } from '../../../../prelude/await-all';
+import { awaitAll } from '@/prelude/await-all';
import { User } from '@/models/entities/user';
@EntityRepository(ReversiMatching)
diff --git a/src/models/repositories/hashtag.ts b/src/models/repositories/hashtag.ts
index 3fee2f771d..ee42ad16b6 100644
--- a/src/models/repositories/hashtag.ts
+++ b/src/models/repositories/hashtag.ts
@@ -1,5 +1,5 @@
import { EntityRepository, Repository } from 'typeorm';
-import { Hashtag } from '../entities/hashtag';
+import { Hashtag } from '@/models/entities/hashtag';
import { SchemaType } from '@/misc/schema';
export type PackedHashtag = SchemaType<typeof packedHashtagSchema>;
diff --git a/src/models/repositories/messaging-message.ts b/src/models/repositories/messaging-message.ts
index 47f6d4227a..1a4a8eecc4 100644
--- a/src/models/repositories/messaging-message.ts
+++ b/src/models/repositories/messaging-message.ts
@@ -1,8 +1,8 @@
import { EntityRepository, Repository } from 'typeorm';
-import { MessagingMessage } from '../entities/messaging-message';
+import { MessagingMessage } from '@/models/entities/messaging-message';
import { Users, DriveFiles, UserGroups } from '../index';
import { SchemaType } from '@/misc/schema';
-import { User } from '../entities/user';
+import { User } from '@/models/entities/user';
export type PackedMessagingMessage = SchemaType<typeof packedMessagingMessageSchema>;
diff --git a/src/models/repositories/moderation-logs.ts b/src/models/repositories/moderation-logs.ts
index 4e9ef1b31b..c7df3afdc9 100644
--- a/src/models/repositories/moderation-logs.ts
+++ b/src/models/repositories/moderation-logs.ts
@@ -1,7 +1,7 @@
import { EntityRepository, Repository } from 'typeorm';
import { Users } from '../index';
-import { ModerationLog } from '../entities/moderation-log';
-import { awaitAll } from '../../prelude/await-all';
+import { ModerationLog } from '@/models/entities/moderation-log';
+import { awaitAll } from '@/prelude/await-all';
@EntityRepository(ModerationLog)
export class ModerationLogRepository extends Repository<ModerationLog> {
diff --git a/src/models/repositories/muting.ts b/src/models/repositories/muting.ts
index 806a7accd2..e46f4ae448 100644
--- a/src/models/repositories/muting.ts
+++ b/src/models/repositories/muting.ts
@@ -1,9 +1,9 @@
import { EntityRepository, Repository } from 'typeorm';
import { Users } from '../index';
-import { Muting } from '../entities/muting';
-import { awaitAll } from '../../prelude/await-all';
+import { Muting } from '@/models/entities/muting';
+import { awaitAll } from '@/prelude/await-all';
import { SchemaType } from '@/misc/schema';
-import { User } from '../entities/user';
+import { User } from '@/models/entities/user';
export type PackedMuting = SchemaType<typeof packedMutingSchema>;
diff --git a/src/models/repositories/note-favorite.ts b/src/models/repositories/note-favorite.ts
index 624e125ddf..3248c32ded 100644
--- a/src/models/repositories/note-favorite.ts
+++ b/src/models/repositories/note-favorite.ts
@@ -1,7 +1,7 @@
import { EntityRepository, Repository } from 'typeorm';
-import { NoteFavorite } from '../entities/note-favorite';
+import { NoteFavorite } from '@/models/entities/note-favorite';
import { Notes } from '../index';
-import { User } from '../entities/user';
+import { User } from '@/models/entities/user';
@EntityRepository(NoteFavorite)
export class NoteFavoriteRepository extends Repository<NoteFavorite> {
diff --git a/src/models/repositories/note-reaction.ts b/src/models/repositories/note-reaction.ts
index 6671b0cd75..c349edf182 100644
--- a/src/models/repositories/note-reaction.ts
+++ b/src/models/repositories/note-reaction.ts
@@ -1,9 +1,9 @@
import { EntityRepository, Repository } from 'typeorm';
-import { NoteReaction } from '../entities/note-reaction';
+import { NoteReaction } from '@/models/entities/note-reaction';
import { Users } from '../index';
import { SchemaType } from '@/misc/schema';
import { convertLegacyReaction } from '@/misc/reaction-lib';
-import { User } from '../entities/user';
+import { User } from '@/models/entities/user';
export type PackedNoteReaction = SchemaType<typeof packedNoteReactionSchema>;
diff --git a/src/models/repositories/note.ts b/src/models/repositories/note.ts
index f178c091f1..a8e356abf2 100644
--- a/src/models/repositories/note.ts
+++ b/src/models/repositories/note.ts
@@ -1,13 +1,13 @@
import { EntityRepository, Repository, In } from 'typeorm';
import * as mfm from 'mfm-js';
-import { Note } from '../entities/note';
-import { User } from '../entities/user';
+import { Note } from '@/models/entities/note';
+import { User } from '@/models/entities/user';
import { Users, PollVotes, DriveFiles, NoteReactions, Followings, Polls, Channels } from '../index';
import { SchemaType } from '@/misc/schema';
import { nyaize } from '@/misc/nyaize';
-import { awaitAll } from '../../prelude/await-all';
+import { awaitAll } from '@/prelude/await-all';
import { convertLegacyReaction, convertLegacyReactions, decodeReaction } from '@/misc/reaction-lib';
-import { NoteReaction } from '../entities/note-reaction';
+import { NoteReaction } from '@/models/entities/note-reaction';
import { aggregateNoteEmojis, populateEmojis, prefetchEmojis } from '@/misc/populate-emojis';
export type PackedNote = SchemaType<typeof packedNoteSchema>;
diff --git a/src/models/repositories/notification.ts b/src/models/repositories/notification.ts
index 2b2ae22602..55af96b6d7 100644
--- a/src/models/repositories/notification.ts
+++ b/src/models/repositories/notification.ts
@@ -1,11 +1,11 @@
import { EntityRepository, In, Repository } from 'typeorm';
import { Users, Notes, UserGroupInvitations, AccessTokens, NoteReactions } from '../index';
-import { Notification } from '../entities/notification';
-import { awaitAll } from '../../prelude/await-all';
+import { Notification } from '@/models/entities/notification';
+import { awaitAll } from '@/prelude/await-all';
import { SchemaType } from '@/misc/schema';
-import { Note } from '../entities/note';
-import { NoteReaction } from '../entities/note-reaction';
-import { User } from '../entities/user';
+import { Note } from '@/models/entities/note';
+import { NoteReaction } from '@/models/entities/note-reaction';
+import { User } from '@/models/entities/user';
import { aggregateNoteEmojis, prefetchEmojis } from '@/misc/populate-emojis';
export type PackedNotification = SchemaType<typeof packedNotificationSchema>;
diff --git a/src/models/repositories/page-like.ts b/src/models/repositories/page-like.ts
index 2f9977de93..28f34254d9 100644
--- a/src/models/repositories/page-like.ts
+++ b/src/models/repositories/page-like.ts
@@ -1,7 +1,7 @@
import { EntityRepository, Repository } from 'typeorm';
-import { PageLike } from '../entities/page-like';
+import { PageLike } from '@/models/entities/page-like';
import { Pages } from '../index';
-import { User } from '../entities/user';
+import { User } from '@/models/entities/user';
@EntityRepository(PageLike)
export class PageLikeRepository extends Repository<PageLike> {
diff --git a/src/models/repositories/page.ts b/src/models/repositories/page.ts
index cac1a9545f..757aaa5a3f 100644
--- a/src/models/repositories/page.ts
+++ b/src/models/repositories/page.ts
@@ -1,10 +1,10 @@
import { EntityRepository, Repository } from 'typeorm';
-import { Page } from '../entities/page';
+import { Page } from '@/models/entities/page';
import { SchemaType } from '@/misc/schema';
import { Users, DriveFiles, PageLikes } from '../index';
-import { awaitAll } from '../../prelude/await-all';
-import { DriveFile } from '../entities/drive-file';
-import { User } from '../entities/user';
+import { awaitAll } from '@/prelude/await-all';
+import { DriveFile } from '@/models/entities/drive-file';
+import { User } from '@/models/entities/user';
export type PackedPage = SchemaType<typeof packedPageSchema>;
diff --git a/src/models/repositories/relay.ts b/src/models/repositories/relay.ts
index 601bb5eb39..72ead899f1 100644
--- a/src/models/repositories/relay.ts
+++ b/src/models/repositories/relay.ts
@@ -1,5 +1,5 @@
import { EntityRepository, Repository } from 'typeorm';
-import { Relay } from '../entities/relay';
+import { Relay } from '@/models/entities/relay';
@EntityRepository(Relay)
export class RelayRepository extends Repository<Relay> {
diff --git a/src/models/repositories/signin.ts b/src/models/repositories/signin.ts
index f5b90c0e9e..9942d2d962 100644
--- a/src/models/repositories/signin.ts
+++ b/src/models/repositories/signin.ts
@@ -1,5 +1,5 @@
import { EntityRepository, Repository } from 'typeorm';
-import { Signin } from '../entities/signin';
+import { Signin } from '@/models/entities/signin';
@EntityRepository(Signin)
export class SigninRepository extends Repository<Signin> {
diff --git a/src/models/repositories/user-group-invitation.ts b/src/models/repositories/user-group-invitation.ts
index fb34dc9c29..638603d6ea 100644
--- a/src/models/repositories/user-group-invitation.ts
+++ b/src/models/repositories/user-group-invitation.ts
@@ -1,5 +1,5 @@
import { EntityRepository, Repository } from 'typeorm';
-import { UserGroupInvitation } from '../entities/user-group-invitation';
+import { UserGroupInvitation } from '@/models/entities/user-group-invitation';
import { UserGroups } from '../index';
@EntityRepository(UserGroupInvitation)
diff --git a/src/models/repositories/user-group.ts b/src/models/repositories/user-group.ts
index ad144290ab..a76ac7b9d3 100644
--- a/src/models/repositories/user-group.ts
+++ b/src/models/repositories/user-group.ts
@@ -1,5 +1,5 @@
import { EntityRepository, Repository } from 'typeorm';
-import { UserGroup } from '../entities/user-group';
+import { UserGroup } from '@/models/entities/user-group';
import { UserGroupJoinings } from '../index';
import { SchemaType } from '@/misc/schema';
diff --git a/src/models/repositories/user-list.ts b/src/models/repositories/user-list.ts
index 38b8c2f1b7..809dbe0268 100644
--- a/src/models/repositories/user-list.ts
+++ b/src/models/repositories/user-list.ts
@@ -1,5 +1,5 @@
import { EntityRepository, Repository } from 'typeorm';
-import { UserList } from '../entities/user-list';
+import { UserList } from '@/models/entities/user-list';
import { UserListJoinings } from '../index';
import { SchemaType } from '@/misc/schema';
diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts
index a4e5a43a00..f56090bb82 100644
--- a/src/models/repositories/user.ts
+++ b/src/models/repositories/user.ts
@@ -1,10 +1,10 @@
import $ from 'cafy';
import { EntityRepository, Repository, In, Not } from 'typeorm';
-import { User, ILocalUser, IRemoteUser } from '../entities/user';
+import { User, ILocalUser, IRemoteUser } from '@/models/entities/user';
import { Notes, NoteUnreads, FollowRequests, Notifications, MessagingMessages, UserNotePinings, Followings, Blockings, Mutings, UserProfiles, UserSecurityKeys, UserGroupJoinings, Pages, Announcements, AnnouncementReads, Antennas, AntennaNotes, ChannelFollowings, Instances } from '../index';
import config from '@/config/index';
import { SchemaType } from '@/misc/schema';
-import { awaitAll } from '../../prelude/await-all';
+import { awaitAll } from '@/prelude/await-all';
import { populateEmojis } from '@/misc/populate-emojis';
import { getAntennas } from '@/misc/antenna-cache';
import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const';
diff --git a/src/remote/activitypub/audience.ts b/src/remote/activitypub/audience.ts
index 7feef5ee7a..3d2dab1459 100644
--- a/src/remote/activitypub/audience.ts
+++ b/src/remote/activitypub/audience.ts
@@ -1,7 +1,7 @@
import { ApObject, getApIds } from './type';
import Resolver from './resolver';
import { resolvePerson } from './models/person';
-import { unique, concat } from '../../prelude/array';
+import { unique, concat } from '@/prelude/array';
import * as promiseLimit from 'promise-limit';
import { User, IRemoteUser } from '@/models/entities/user';
diff --git a/src/remote/activitypub/kernel/create/index.ts b/src/remote/activitypub/kernel/create/index.ts
index a44a6ced2b..ce039a363b 100644
--- a/src/remote/activitypub/kernel/create/index.ts
+++ b/src/remote/activitypub/kernel/create/index.ts
@@ -3,7 +3,7 @@ import { IRemoteUser } from '@/models/entities/user';
import createNote from './note';
import { ICreate, getApId, isPost, getApType } from '../../type';
import { apLogger } from '../../logger';
-import { toArray, concat, unique } from '../../../../prelude/array';
+import { toArray, concat, unique } from '@/prelude/array';
const logger = apLogger;
diff --git a/src/remote/activitypub/kernel/delete/index.ts b/src/remote/activitypub/kernel/delete/index.ts
index fe919975e7..474f3f6d60 100644
--- a/src/remote/activitypub/kernel/delete/index.ts
+++ b/src/remote/activitypub/kernel/delete/index.ts
@@ -1,7 +1,7 @@
import deleteNote from './note';
import { IRemoteUser } from '@/models/entities/user';
import { IDelete, getApId, isTombstone, IObject, validPost, validActor } from '../../type';
-import { toSingle } from '../../../../prelude/array';
+import { toSingle } from '@/prelude/array';
/**
* 削除アクティビティを捌きます
diff --git a/src/remote/activitypub/kernel/index.ts b/src/remote/activitypub/kernel/index.ts
index 0bd0814340..20df28eec6 100644
--- a/src/remote/activitypub/kernel/index.ts
+++ b/src/remote/activitypub/kernel/index.ts
@@ -16,7 +16,7 @@ import block from './block/index';
import flag from './flag/index';
import { apLogger } from '../logger';
import Resolver from '../resolver';
-import { toArray } from '../../../prelude/array';
+import { toArray } from '@/prelude/array';
export async function performActivity(actor: IRemoteUser, activity: IObject) {
if (isCollectionOrOrderedCollection(activity)) {
diff --git a/src/remote/activitypub/models/mention.ts b/src/remote/activitypub/models/mention.ts
index 0db0324aba..ade9c90806 100644
--- a/src/remote/activitypub/models/mention.ts
+++ b/src/remote/activitypub/models/mention.ts
@@ -1,4 +1,4 @@
-import { toArray, unique } from '../../../prelude/array';
+import { toArray, unique } from '@/prelude/array';
import { IObject, isMention, IApMention } from '../type';
import { resolvePerson } from './person';
import * as promiseLimit from 'promise-limit';
diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts
index d28d642a0a..25004cb4d2 100644
--- a/src/remote/activitypub/models/note.ts
+++ b/src/remote/activitypub/models/note.ts
@@ -8,7 +8,7 @@ import { resolveImage } from './image';
import { IRemoteUser } from '@/models/entities/user';
import { htmlToMfm } from '../misc/html-to-mfm';
import { extractApHashtags } from './tag';
-import { unique, toArray, toSingle } from '../../../prelude/array';
+import { unique, toArray, toSingle } from '@/prelude/array';
import { extractPollFromQuestion } from './question';
import vote from '@/services/note/polls/vote';
import { apLogger } from '../logger';
diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index 3ae13135e3..4823def7cb 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -25,7 +25,7 @@ import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error';
import { toPuny } from '@/misc/convert-host';
import { UserProfile } from '@/models/entities/user-profile';
import { getConnection } from 'typeorm';
-import { toArray } from '../../../prelude/array';
+import { toArray } from '@/prelude/array';
import { fetchInstanceMetadata } from '@/services/fetch-instance-metadata';
import { normalizeForSearch } from '@/misc/normalize-for-search';
diff --git a/src/remote/activitypub/models/tag.ts b/src/remote/activitypub/models/tag.ts
index d25cb463fe..fbc6b9b428 100644
--- a/src/remote/activitypub/models/tag.ts
+++ b/src/remote/activitypub/models/tag.ts
@@ -1,4 +1,4 @@
-import { toArray } from '../../../prelude/array';
+import { toArray } from '@/prelude/array';
import { IObject, isHashtag, IApHashtag } from '../type';
export function extractApHashtags(tags: IObject | IObject[] | null | undefined) {
diff --git a/src/remote/webfinger.ts b/src/remote/webfinger.ts
index 744ab3639a..f63fd03628 100644
--- a/src/remote/webfinger.ts
+++ b/src/remote/webfinger.ts
@@ -1,6 +1,6 @@
import { URL } from 'url';
import { getJson } from '@/misc/fetch';
-import { query as urlQuery } from '../prelude/url';
+import { query as urlQuery } from '@/prelude/url';
type ILink = {
href: string;
diff --git a/src/server/activitypub/followers.ts b/src/server/activitypub/followers.ts
index 0fad6b13c1..8b6a066bf0 100644
--- a/src/server/activitypub/followers.ts
+++ b/src/server/activitypub/followers.ts
@@ -2,7 +2,7 @@ import * as Router from '@koa/router';
import config from '@/config/index';
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
-import * as url from '../../prelude/url';
+import * as url from '@/prelude/url';
import { renderActivity } from '@/remote/activitypub/renderer/index';
import renderOrderedCollection from '@/remote/activitypub/renderer/ordered-collection';
import renderOrderedCollectionPage from '@/remote/activitypub/renderer/ordered-collection-page';
diff --git a/src/server/activitypub/following.ts b/src/server/activitypub/following.ts
index e7316d3e4d..5fc5d68a9c 100644
--- a/src/server/activitypub/following.ts
+++ b/src/server/activitypub/following.ts
@@ -2,7 +2,7 @@ import * as Router from '@koa/router';
import config from '@/config/index';
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
-import * as url from '../../prelude/url';
+import * as url from '@/prelude/url';
import { renderActivity } from '@/remote/activitypub/renderer/index';
import renderOrderedCollection from '@/remote/activitypub/renderer/ordered-collection';
import renderOrderedCollectionPage from '@/remote/activitypub/renderer/ordered-collection-page';
diff --git a/src/server/activitypub/outbox.ts b/src/server/activitypub/outbox.ts
index c6cf10de5e..df528e8b5a 100644
--- a/src/server/activitypub/outbox.ts
+++ b/src/server/activitypub/outbox.ts
@@ -9,8 +9,8 @@ import { setResponseType } from '../activitypub';
import renderNote from '@/remote/activitypub/renderer/note';
import renderCreate from '@/remote/activitypub/renderer/create';
import renderAnnounce from '@/remote/activitypub/renderer/announce';
-import { countIf } from '../../prelude/array';
-import * as url from '../../prelude/url';
+import { countIf } from '@/prelude/array';
+import * as url from '@/prelude/url';
import { Users, Notes } from '@/models/index';
import { makePaginationQuery } from '../api/common/make-pagination-query';
import { Brackets } from 'typeorm';
diff --git a/src/server/api/common/read-messaging-message.ts b/src/server/api/common/read-messaging-message.ts
index 8e030faa3d..1dce76d2a9 100644
--- a/src/server/api/common/read-messaging-message.ts
+++ b/src/server/api/common/read-messaging-message.ts
@@ -7,7 +7,7 @@ import { MessagingMessages, UserGroupJoinings, Users } from '@/models/index';
import { In } from 'typeorm';
import { IdentifiableError } from '@/misc/identifiable-error';
import { UserGroup } from '@/models/entities/user-group';
-import { toArray } from '../../../prelude/array';
+import { toArray } from '@/prelude/array';
import { renderReadActivity } from '@/remote/activitypub/renderer/read';
import { renderActivity } from '@/remote/activitypub/renderer/index';
import { deliver } from '@/queue/index';
diff --git a/src/server/api/endpoints/app/create.ts b/src/server/api/endpoints/app/create.ts
index 5dbafa07ee..c2ce943dcc 100644
--- a/src/server/api/endpoints/app/create.ts
+++ b/src/server/api/endpoints/app/create.ts
@@ -2,7 +2,7 @@ import $ from 'cafy';
import define from '../../define';
import { Apps } from '@/models/index';
import { genId } from '@/misc/gen-id';
-import { unique } from '../../../../prelude/array';
+import { unique } from '@/prelude/array';
import { secureRndstr } from '@/misc/secure-rndstr';
export const meta = {
diff --git a/src/server/api/endpoints/users/get-frequently-replied-users.ts b/src/server/api/endpoints/users/get-frequently-replied-users.ts
index 921d30c82e..32ebfd683a 100644
--- a/src/server/api/endpoints/users/get-frequently-replied-users.ts
+++ b/src/server/api/endpoints/users/get-frequently-replied-users.ts
@@ -1,7 +1,7 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import define from '../../define';
-import { maximum } from '../../../../prelude/array';
+import { maximum } from '@/prelude/array';
import { ApiError } from '../../error';
import { getUser } from '../../common/getters';
import { Not, In, IsNull } from 'typeorm';
diff --git a/src/server/index.ts b/src/server/index.ts
index a9904accb4..fb4e48c1c6 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -18,7 +18,7 @@ import nodeinfo from './nodeinfo';
import wellKnown from './well-known';
import config from '@/config/index';
import apiServer from './api/index';
-import { sum } from '../prelude/array';
+import { sum } from '@/prelude/array';
import Logger from '@/services/logger';
import { program } from '../argv';
import { UserProfiles, Users } from '@/models/index';
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts
index 619335634c..1375420c0a 100644
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@@ -3,7 +3,7 @@ import summaly from 'summaly';
import { fetchMeta } from '@/misc/fetch-meta';
import Logger from '@/services/logger';
import config from '@/config/index';
-import { query } from '../../prelude/url';
+import { query } from '@/prelude/url';
import { getJson } from '@/misc/fetch';
const logger = new Logger('url-preview');
diff --git a/src/server/well-known.ts b/src/server/well-known.ts
index 11ad22c580..a2e6bc0bc4 100644
--- a/src/server/well-known.ts
+++ b/src/server/well-known.ts
@@ -3,7 +3,7 @@ import * as Router from '@koa/router';
import config from '@/config/index';
import { parseAcct, Acct } from '@/misc/acct';
import { links } from './nodeinfo';
-import { escapeAttribute, escapeValue } from '../prelude/xml';
+import { escapeAttribute, escapeValue } from '@/prelude/xml';
import { Users } from '@/models/index';
import { User } from '@/models/entities/user';
diff --git a/src/services/chart/core.ts b/src/services/chart/core.ts
index 3c0526d2e5..eee7d20efb 100644
--- a/src/services/chart/core.ts
+++ b/src/services/chart/core.ts
@@ -9,7 +9,7 @@ import autobind from 'autobind-decorator';
import Logger from '../logger';
import { Schema } from '@/misc/schema';
import { EntitySchema, getRepository, Repository, LessThan, Between } from 'typeorm';
-import { dateUTC, isTimeSame, isTimeBefore, subtractTime, addTime } from '../../prelude/time';
+import { dateUTC, isTimeSame, isTimeBefore, subtractTime, addTime } from '@/prelude/time';
import { getChartInsertLock } from '@/misc/app-lock';
const logger = new Logger('chart', 'white', process.env.NODE_ENV !== 'test');
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 56cdec4a51..8c996bdba6 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -9,7 +9,7 @@ import { renderActivity } from '@/remote/activitypub/renderer/index';
import { resolveUser } from '@/remote/resolve-user';
import config from '@/config/index';
import { updateHashtags } from '../update-hashtag';
-import { concat } from '../../prelude/array';
+import { concat } from '@/prelude/array';
import insertNoteUnread from './unread';
import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc';
import { extractMentions } from '@/misc/extract-mentions';