Fix aliases

index.js

@@ -1 +1,2 @@
+require('module-alias/register');
 require('./built').default();

package.json

@@ -25,6 +25,11 @@
 		"test": "gulp test",
 		"format": "gulp format"
 	},
+	"_moduleAliases": {
+		"package.json": "package.json",
+		"~": "built",
+		"$": "locales"
+	},
 	"resolutions": {
 		"gulp-cssnano/cssnano/postcss-svgo/svgo/js-yaml": "^3.13.1",
 		"lodash": "^4.17.13"
@@ -173,6 +178,7 @@
 		"lolex": "4.1.0",
 		"lookup-dns-cache": "2.1.0",
 		"mocha": "6.2.0",
+		"module-alias": "2.2.1",
 		"moji": "0.5.1",
 		"ms": "2.1.2",
 		"nested-property": "1.0.1",

src/@types/package.json.d.ts

@@ -1,4 +1,4 @@
-declare module '*/package.json' {
+declare module 'package.json' {
 	interface IRepository {
 		type: string;
 		url: string;

src/argv.ts

@@ -1,5 +1,5 @@
 import * as program from 'commander';
-import * as pkg from '../package.json';
+import * as pkg from 'package.json';
 
 program
 	.version(pkg.version)

src/boot/index.ts

@@ -2,8 +2,8 @@ import * as cluster from 'cluster';
 import chalk from 'chalk';
 import Xev from 'xev';
 
-import Logger from '../services/logger';
-import { program } from '../argv';
+import Logger from '~/services/logger';
+import { program } from '~/argv';
 
 // for typeorm
 import 'reflect-metadata';

src/boot/master.ts

@@ -4,14 +4,14 @@ import chalk from 'chalk';
 import * as portscanner from 'portscanner';
 import * as isRoot from 'is-root';
 
-import Logger from '../services/logger';
-import loadConfig from '../config/load';
-import { Config } from '../config/types';
-import { lessThan } from '../prelude/array';
-import * as pkg from '../../package.json';
-import { program } from '../argv';
-import { showMachineInfo } from '../misc/show-machine-info';
-import { initDb } from '../db/postgre';
+import Logger from '~/services/logger';
+import loadConfig from '~/config/load';
+import { Config } from '~/config/types';
+import { lessThan } from '~/prelude/array';
+import * as pkg from 'package.json';
+import { program } from '~/argv';
+import { showMachineInfo } from '~/misc/show-machine-info';
+import { initDb } from '~/db/postgre';
 
 const logger = new Logger('core', 'cyan');
 const bootLogger = logger.createSubLogger('boot', 'magenta', false);

src/boot/worker.ts

@@ -1,5 +1,5 @@
 import * as cluster from 'cluster';
-import { initDb } from '../db/postgre';
+import { initDb } from '~/db/postgre';
 
 /**
  * Init worker process

src/config/load.ts

@@ -5,7 +5,7 @@
 import * as fs from 'fs';
 import * as yaml from 'js-yaml';
 import { Source, Mixin } from './types';
-import * as pkg from '../../package.json';
+import * as pkg from 'package.json';
 
 /**
  * Path of configuration directory

src/daemons/janitor.ts

@@ -1,5 +1,5 @@
 const interval = 30 * 60 * 1000;
-import { AttestationChallenges } from '../models';
+import { AttestationChallenges } from '~/models';
 import { LessThan } from 'typeorm';
 
 /**

src/daemons/notes-stats-child.ts

@@ -1,6 +1,6 @@
 import { MoreThanOrEqual, getRepository } from 'typeorm';
-import { Note } from '../models/entities/note';
-import { initDb } from '../db/postgre';
+import { Note } from '~/models/entities/note';
+import { initDb } from '~/db/postgre';
 
 const interval = 5000;
 

src/daemons/queue-stats.ts

@@ -1,6 +1,6 @@
 import * as Deque from 'double-ended-queue';
 import Xev from 'xev';
-import { deliverQueue, inboxQueue, dbQueue, objectStorageQueue } from '../queue';
+import { deliverQueue, inboxQueue, dbQueue, objectStorageQueue } from '~/queue';
 
 const ev = new Xev();
 

src/db/elasticsearch.ts

@@ -1,5 +1,5 @@
 import * as elasticsearch from '@elastic/elasticsearch';
-import config from '../config';
+import config from '~/config';
 
 const index = {
 	settings: {

src/db/logger.ts

@@ -1,3 +1,3 @@
-import Logger from '../services/logger';
+import Logger from '~/services/logger';
 
 export const dbLogger = new Logger('db');

src/db/postgre.ts

@@ -1,54 +1,54 @@
 import { createConnection, Logger, getConnection } from 'typeorm';
-import config from '../config';
-import { entities as charts } from '../services/chart/entities';
+import config from '~/config';
+import { entities as charts } from '~/services/chart/entities';
 import { dbLogger } from './logger';
 import * as highlight from 'cli-highlight';
 
-import { Log } from '../models/entities/log';
-import { User } from '../models/entities/user';
-import { DriveFile } from '../models/entities/drive-file';
-import { DriveFolder } from '../models/entities/drive-folder';
-import { AccessToken } from '../models/entities/access-token';
-import { App } from '../models/entities/app';
-import { PollVote } from '../models/entities/poll-vote';
-import { Note } from '../models/entities/note';
-import { NoteReaction } from '../models/entities/note-reaction';
-import { NoteWatching } from '../models/entities/note-watching';
-import { NoteUnread } from '../models/entities/note-unread';
-import { Notification } from '../models/entities/notification';
-import { Meta } from '../models/entities/meta';
-import { Following } from '../models/entities/following';
-import { Instance } from '../models/entities/instance';
-import { Muting } from '../models/entities/muting';
-import { SwSubscription } from '../models/entities/sw-subscription';
-import { Blocking } from '../models/entities/blocking';
-import { UserList } from '../models/entities/user-list';
-import { UserListJoining } from '../models/entities/user-list-joining';
-import { UserGroup } from '../models/entities/user-group';
-import { UserGroupJoining } from '../models/entities/user-group-joining';
-import { UserGroupInvite } from '../models/entities/user-group-invite';
-import { Hashtag } from '../models/entities/hashtag';
-import { NoteFavorite } from '../models/entities/note-favorite';
-import { AbuseUserReport } from '../models/entities/abuse-user-report';
-import { RegistrationTicket } from '../models/entities/registration-tickets';
-import { MessagingMessage } from '../models/entities/messaging-message';
-import { Signin } from '../models/entities/signin';
-import { AuthSession } from '../models/entities/auth-session';
-import { FollowRequest } from '../models/entities/follow-request';
-import { Emoji } from '../models/entities/emoji';
-import { ReversiGame } from '../models/entities/games/reversi/game';
-import { ReversiMatching } from '../models/entities/games/reversi/matching';
-import { UserNotePining } from '../models/entities/user-note-pinings';
-import { Poll } from '../models/entities/poll';
-import { UserKeypair } from '../models/entities/user-keypair';
-import { UserPublickey } from '../models/entities/user-publickey';
-import { UserProfile } from '../models/entities/user-profile';
-import { UserSecurityKey } from '../models/entities/user-security-key';
-import { AttestationChallenge } from '../models/entities/attestation-challenge';
-import { Page } from '../models/entities/page';
-import { PageLike } from '../models/entities/page-like';
-import { ModerationLog } from '../models/entities/moderation-log';
-import { UsedUsername } from '../models/entities/used-username';
+import { Log } from '~/models/entities/log';
+import { User } from '~/models/entities/user';
+import { DriveFile } from '~/models/entities/drive-file';
+import { DriveFolder } from '~/models/entities/drive-folder';
+import { AccessToken } from '~/models/entities/access-token';
+import { App } from '~/models/entities/app';
+import { PollVote } from '~/models/entities/poll-vote';
+import { Note } from '~/models/entities/note';
+import { NoteReaction } from '~/models/entities/note-reaction';
+import { NoteWatching } from '~/models/entities/note-watching';
+import { NoteUnread } from '~/models/entities/note-unread';
+import { Notification } from '~/models/entities/notification';
+import { Meta } from '~/models/entities/meta';
+import { Following } from '~/models/entities/following';
+import { Instance } from '~/models/entities/instance';
+import { Muting } from '~/models/entities/muting';
+import { SwSubscription } from '~/models/entities/sw-subscription';
+import { Blocking } from '~/models/entities/blocking';
+import { UserList } from '~/models/entities/user-list';
+import { UserListJoining } from '~/models/entities/user-list-joining';
+import { UserGroup } from '~/models/entities/user-group';
+import { UserGroupJoining } from '~/models/entities/user-group-joining';
+import { UserGroupInvite } from '~/models/entities/user-group-invite';
+import { Hashtag } from '~/models/entities/hashtag';
+import { NoteFavorite } from '~/models/entities/note-favorite';
+import { AbuseUserReport } from '~/models/entities/abuse-user-report';
+import { RegistrationTicket } from '~/models/entities/registration-tickets';
+import { MessagingMessage } from '~/models/entities/messaging-message';
+import { Signin } from '~/models/entities/signin';
+import { AuthSession } from '~/models/entities/auth-session';
+import { FollowRequest } from '~/models/entities/follow-request';
+import { Emoji } from '~/models/entities/emoji';
+import { ReversiGame } from '~/models/entities/games/reversi/game';
+import { ReversiMatching } from '~/models/entities/games/reversi/matching';
+import { UserNotePining } from '~/models/entities/user-note-pinings';
+import { Poll } from '~/models/entities/poll';
+import { UserKeypair } from '~/models/entities/user-keypair';
+import { UserPublickey } from '~/models/entities/user-publickey';
+import { UserProfile } from '~/models/entities/user-profile';
+import { UserSecurityKey } from '~/models/entities/user-security-key';
+import { AttestationChallenge } from '~/models/entities/attestation-challenge';
+import { Page } from '~/models/entities/page';
+import { PageLike } from '~/models/entities/page-like';
+import { ModerationLog } from '~/models/entities/moderation-log';
+import { UsedUsername } from '~/models/entities/used-username';
 
 const sqlLogger = dbLogger.createSubLogger('sql', 'white', false);
 

src/db/redis.ts

@@ -1,5 +1,5 @@
 import * as redis from 'redis';
-import config from '../config';
+import config from '~/config';
 
 export default redis.createClient(
 	config.redis.port,

src/games/reversi/core.ts

@@ -1,4 +1,4 @@
-import { count, concat } from '../../prelude/array';
+import { count, concat } from '~/prelude/array';
 
 // MISSKEY REVERSI ENGINE
 

src/index.ts

@@ -6,7 +6,7 @@ Error.stackTraceLimit = Infinity;
 
 require('events').EventEmitter.defaultMaxListeners = 128;
 
-import boot from './boot';
+import boot from '~/boot';
 
 export default function() {
 	return boot();

src/mfm/language.ts

@@ -1,9 +1,9 @@
 import * as P from 'parsimmon';
 import { createLeaf, createTree, urlRegex } from './prelude';
-import { takeWhile, cumulativeSum } from '../prelude/array';
-import parseAcct from '../misc/acct/parse';
+import { takeWhile, cumulativeSum } from '~/prelude/array';
+import parseAcct from '~/misc/acct/parse';
 import { toUnicode } from 'punycode';
-import { emojiRegex } from '../misc/emoji-regex';
+import { emojiRegex } from '~/misc/emoji-regex';
 
 export function removeOrphanedBrackets(s: string): string {
 	const openBrackets = ['(', '「', '['];

src/mfm/normalize.ts

@@ -1,7 +1,7 @@
-import * as A from '../prelude/array';
-import * as S from '../prelude/string';
+import * as A from '~/prelude/array';
+import * as S from '~/prelude/string';
 import { MfmForest, MfmTree } from './prelude';
-import { createTree, createLeaf } from '../prelude/tree';
+import { createTree, createLeaf } from '~/prelude/tree';
 
 function isEmptyTextTree(t: MfmTree): boolean {
 	return t.node.type == 'text' && t.node.props.text === '';

src/mfm/prelude.ts

@@ -1,5 +1,5 @@
-import { Tree } from '../prelude/tree';
-import * as T from '../prelude/tree';
+import { Tree } from '~/prelude/tree';
+import * as T from '~/prelude/tree';
 
 type Node<T, P> = { type: T, props: P };
 

src/mfm/toHtml.ts

@@ -1,8 +1,8 @@
 import { JSDOM } from 'jsdom';
-import config from '../config';
-import { intersperse } from '../prelude/array';
+import config from '~/config';
+import { intersperse } from '~/prelude/array';
 import { MfmForest, MfmTree } from './prelude';
-import { IMentionedRemoteUsers } from '../models/entities/note';
+import { IMentionedRemoteUsers } from '~/models/entities/note';
 
 export function toHtml(tokens: MfmForest | null, mentionedRemoteUsers: IMentionedRemoteUsers = []) {
 	if (tokens == null) {

src/misc/convert-host.ts

@@ -1,4 +1,4 @@
-import config from '../config';
+import config from '~/config';
 import { toASCII } from 'punycode';
 
 export function getFullApAccount(username: string, host: string | null) {

src/misc/detect-mine.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import fileType = require('file-type');
-import checkSvg from '../misc/check-svg';
+import checkSvg from '~/misc/check-svg';
 
 export async function detectMine(path: string) {
 	return new Promise<[string, string | null]>((res, rej) => {

src/misc/donwload-url.ts

@@ -1,8 +1,8 @@
 import * as fs from 'fs';
 import * as request from 'request';
-import config from '../config';
+import config from '~/config';
 import chalk from 'chalk';
-import Logger from '../services/logger';
+import Logger from '~/services/logger';
 
 export async function downloadUrl(url: string, path: string) {
 	const logger = new Logger('download');

src/misc/download-text-file.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as util from 'util';
-import Logger from '../services/logger';
+import Logger from '~/services/logger';
 import { createTemp } from './create-temp';
 import { downloadUrl } from './donwload-url';
 

src/misc/extract-emojis.ts

@@ -1,6 +1,6 @@
-import { EmojiNode, MfmForest } from '../mfm/prelude';
-import { preorderF } from '../prelude/tree';
-import { unique } from '../prelude/array';
+import { EmojiNode, MfmForest } from '~/mfm/prelude';
+import { preorderF } from '~/prelude/tree';
+import { unique } from '~/prelude/array';
 
 export default function(mfmForest: MfmForest): string[] {
 	const emojiNodes = preorderF(mfmForest).filter(x => x.type === 'emoji') as EmojiNode[];

src/misc/extract-hashtags.ts

@@ -1,6 +1,6 @@
-import { HashtagNode, MfmForest } from '../mfm/prelude';
-import { preorderF } from '../prelude/tree';
-import { unique } from '../prelude/array';
+import { HashtagNode, MfmForest } from '~/mfm/prelude';
+import { preorderF } from '~/prelude/tree';
+import { unique } from '~/prelude/array';
 
 export default function(mfmForest: MfmForest): string[] {
 	const hashtagNodes = preorderF(mfmForest).filter(x => x.type === 'hashtag') as HashtagNode[];

src/misc/extract-mentions.ts

@@ -1,7 +1,7 @@
 // test is located in test/extract-mentions
 
-import { MentionNode, MfmForest } from '../mfm/prelude';
-import { preorderF } from '../prelude/tree';
+import { MentionNode, MfmForest } from '~/mfm/prelude';
+import { preorderF } from '~/prelude/tree';
 
 export default function(mfmForest: MfmForest): MentionNode['props'][] {
 	// TODO: 重複を削除

src/misc/fetch-meta.ts

@@ -1,4 +1,4 @@
-import { Meta } from '../models/entities/meta';
+import { Meta } from '~/models/entities/meta';
 import { getConnection } from 'typeorm';
 
 let cache: Meta;

src/misc/fetch-proxy-account.ts

@@ -1,7 +1,7 @@
 import { fetchMeta } from './fetch-meta';
-import { ILocalUser } from '../models/entities/user';
-import { Users } from '../models';
-import { ensure } from '../prelude/ensure';
+import { ILocalUser } from '~/models/entities/user';
+import { Users } from '~/models';
+import { ensure } from '~/prelude/ensure';
 
 export async function fetchProxyAccount(): Promise<ILocalUser> {
 	const meta = await fetchMeta();

src/misc/gen-id.ts

@@ -3,7 +3,7 @@ import { genAid } from './id/aid';
 import { genMeid } from './id/meid';
 import { genMeidg } from './id/meidg';
 import { genObjectId } from './id/object-id';
-import config from '../config';
+import config from '~/config';
 
 const metohd = config.id.toLowerCase();
 

src/misc/get-user-name.ts

@@ -1,4 +1,4 @@
-import { User } from '../models/entities/user';
+import { User } from '~/models/entities/user';
 
 export default function(user: User): string {
 	return user.name || user.username;

src/misc/is-quote.ts

@@ -1,4 +1,4 @@
-import { Note } from '../models/entities/note';
+import { Note } from '~/models/entities/note';
 
 export default function(note: Note): boolean {
 	return note.renoteId != null && (note.text != null || note.hasPoll || (note.fileIds != null && note.fileIds.length > 0));

src/misc/reaction-lib.ts

@@ -1,6 +1,6 @@
 import { emojiRegex } from './emoji-regex';
 import { fetchMeta } from './fetch-meta';
-import { Emojis } from '../models';
+import { Emojis } from '~/models';
 
 const basic10: Record<string, string> = {
 	'👍': 'like',

src/misc/show-machine-info.ts

@@ -1,6 +1,6 @@
 import * as os from 'os';
 import * as sysUtils from 'systeminformation';
-import Logger from '../services/logger';
+import Logger from '~/services/logger';
 
 export async function showMachineInfo(parentLogger: Logger) {
 	const logger = parentLogger.createSubLogger('machine');

src/models/entities/abuse-user-report.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['userId', 'reporterId'], { unique: true })

src/models/entities/access-token.ts

@@ -1,7 +1,7 @@
 import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm';
 import { User } from './user';
 import { App } from './app';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class AccessToken {

src/models/entities/app.ts

@@ -1,6 +1,6 @@
 import { Entity, PrimaryColumn, Column, Index, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class App {

src/models/entities/attestation-challenge.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne, Index } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class AttestationChallenge {

src/models/entities/auth-session.ts

@@ -1,7 +1,7 @@
 import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm';
 import { User } from './user';
 import { App } from './app';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class AuthSession {

src/models/entities/blocking.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['blockerId', 'blockeeId'], { unique: true })

src/models/entities/drive-file.ts

@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
 import { DriveFolder } from './drive-folder';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class DriveFile {

src/models/entities/drive-folder.ts

@@ -1,6 +1,6 @@
 import { JoinColumn, ManyToOne, Entity, PrimaryColumn, Index, Column } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class DriveFolder {

src/models/entities/emoji.ts

@@ -1,5 +1,5 @@
 import { PrimaryColumn, Entity, Index, Column } from 'typeorm';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['name', 'host'], { unique: true })

src/models/entities/follow-request.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['followerId', 'followeeId'], { unique: true })

src/models/entities/following.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['followerId', 'followeeId'], { unique: true })

src/models/entities/games/reversi/game.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from '../../user';
-import { id } from '../../../id';
+import { User } from '~/models/entities/user';
+import { id } from '~/models/id';
 
 @Entity()
 export class ReversiGame {

src/models/entities/games/reversi/matching.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from '../../user';
-import { id } from '../../../id';
+import { User } from '~/models/entities/user';
+import { id } from '~/models/id';
 
 @Entity()
 export class ReversiMatching {

src/models/entities/hashtag.ts

@@ -1,6 +1,6 @@
 import { Entity, PrimaryColumn, Index, Column } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class Hashtag {

src/models/entities/instance.ts

@@ -1,5 +1,5 @@
 import { Entity, PrimaryColumn, Index, Column } from 'typeorm';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class Instance {

src/models/entities/log.ts

@@ -1,5 +1,5 @@
 import { Entity, PrimaryColumn, Index, Column } from 'typeorm';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class Log {

src/models/entities/messaging-message.ts

@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
 import { DriveFile } from './drive-file';
-import { id } from '../id';
+import { id } from '~/models/id';
 import { UserGroup } from './user-group';
 
 @Entity()

src/models/entities/moderation-log.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class ModerationLog {

src/models/entities/muting.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['muterId', 'muteeId'], { unique: true })

src/models/entities/note-favorite.ts

@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { Note } from './note';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['userId', 'noteId'], { unique: true })

src/models/entities/note-reaction.ts

@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
 import { Note } from './note';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['userId', 'noteId'], { unique: true })

src/models/entities/note-unread.ts

@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
 import { Note } from './note';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['userId', 'noteId'], { unique: true })

src/models/entities/note-watching.ts

@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
 import { Note } from './note';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['userId', 'noteId'], { unique: true })

src/models/entities/note.ts

@@ -2,7 +2,7 @@ import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typ
 import { User } from './user';
 import { App } from './app';
 import { DriveFile } from './drive-file';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class Note {

src/models/entities/notification.ts

@@ -1,6 +1,6 @@
 import { Entity, Index, JoinColumn, ManyToOne, Column, PrimaryColumn } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 import { Note } from './note';
 
 @Entity()

src/models/entities/page-like.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 import { Page } from './page';
 
 @Entity()

src/models/entities/page.ts

@@ -1,6 +1,6 @@
 import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 import { DriveFile } from './drive-file';
 
 @Entity()

src/models/entities/poll-vote.ts

@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
 import { Note } from './note';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['userId', 'noteId', 'choice'], { unique: true })

src/models/entities/poll.ts

@@ -1,5 +1,5 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm';
-import { id } from '../id';
+import { id } from '~/models/id';
 import { Note } from './note';
 import { User } from './user';
 

src/models/entities/registration-tickets.ts

@@ -1,5 +1,5 @@
 import { PrimaryColumn, Entity, Index, Column } from 'typeorm';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class RegistrationTicket {

src/models/entities/signin.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class Signin {

src/models/entities/sw-subscription.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class SwSubscription {

src/models/entities/user-group-invite.ts

@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
 import { UserGroup } from './user-group';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['userId', 'userGroupId'], { unique: true })

src/models/entities/user-group-joining.ts

@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
 import { UserGroup } from './user-group';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['userId', 'userGroupId'], { unique: true })

src/models/entities/user-group.ts

@@ -1,6 +1,6 @@
 import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class UserGroup {

src/models/entities/user-keypair.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, JoinColumn, Column, OneToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class UserKeypair {

src/models/entities/user-list-joining.ts

@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
 import { UserList } from './user-list';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['userId', 'userListId'], { unique: true })

src/models/entities/user-list.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class UserList {

src/models/entities/user-note-pinings.ts

@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
 import { Note } from './note';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['userId', 'noteId'], { unique: true })

src/models/entities/user-profile.ts

@@ -1,5 +1,5 @@
 import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm';
-import { id } from '../id';
+import { id } from '~/models/id';
 import { User } from './user';
 import { Page } from './page';
 

src/models/entities/user-publickey.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class UserPublickey {

src/models/entities/user-security-key.ts

@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne, Index } from 'typeorm';
 import { User } from './user';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 export class UserSecurityKey {

src/models/entities/user.ts

@@ -1,6 +1,6 @@
 import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm';
 import { DriveFile } from './drive-file';
-import { id } from '../id';
+import { id } from '~/models/id';
 
 @Entity()
 @Index(['usernameLower', 'host'], { unique: true })

src/models/repositories/abuse-user-report.ts

@@ -1,8 +1,8 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Users } from '..';
-import { AbuseUserReport } from '../entities/abuse-user-report';
-import { ensure } from '../../prelude/ensure';
-import { awaitAll } from '../../prelude/await-all';
+import { Users } from '~/models';
+import { AbuseUserReport } from '~/models/entities/abuse-user-report';
+import { ensure } from '~/prelude/ensure';
+import { awaitAll } from '~/prelude/await-all';
 
 @EntityRepository(AbuseUserReport)
 export class AbuseUserReportRepository extends Repository<AbuseUserReport> {

src/models/repositories/app.ts

@@ -1,8 +1,8 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { App } from '../entities/app';
-import { AccessTokens } from '..';
-import { ensure } from '../../prelude/ensure';
-import { SchemaType } from '../../misc/schema';
+import { App } from '~/models/entities/app';
+import { AccessTokens } from '~/models';
+import { ensure } from '~/prelude/ensure';
+import { SchemaType } from '~/misc/schema';
 
 export type PackedApp = SchemaType<typeof packedAppSchema>;
 

src/models/repositories/auth-session.ts

@@ -1,8 +1,8 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Apps } from '..';
-import { AuthSession } from '../entities/auth-session';
-import { ensure } from '../../prelude/ensure';
-import { awaitAll } from '../../prelude/await-all';
+import { Apps } from '~/models';
+import { AuthSession } from '~/models/entities/auth-session';
+import { ensure } from '~/prelude/ensure';
+import { awaitAll } from '~/prelude/await-all';
 
 @EntityRepository(AuthSession)
 export class AuthSessionRepository extends Repository<AuthSession> {

src/models/repositories/blocking.ts

@@ -1,9 +1,9 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Users } from '..';
-import { Blocking } from '../entities/blocking';
-import { ensure } from '../../prelude/ensure';
-import { awaitAll } from '../../prelude/await-all';
-import { SchemaType } from '../../misc/schema';
+import { Users } from '~/models';
+import { Blocking } from '~/models/entities/blocking';
+import { ensure } from '~/prelude/ensure';
+import { awaitAll } from '~/prelude/await-all';
+import { SchemaType } from '~/misc/schema';
 
 export type PackedBlocking = SchemaType<typeof packedBlockingSchema>;
 

src/models/repositories/drive-file.ts

@@ -1,11 +1,11 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { DriveFile } from '../entities/drive-file';
-import { Users, DriveFolders } from '..';
-import { User } from '../entities/user';
-import { toPuny } from '../../misc/convert-host';
-import { ensure } from '../../prelude/ensure';
-import { awaitAll } from '../../prelude/await-all';
-import { SchemaType } from '../../misc/schema';
+import { DriveFile } from '~/models/entities/drive-file';
+import { Users, DriveFolders } from '~/models';
+import { User } from '~/models/entities/user';
+import { toPuny } from '~/misc/convert-host';
+import { ensure } from '~/prelude/ensure';
+import { awaitAll } from '~/prelude/await-all';
+import { SchemaType } from '~/misc/schema';
 
 export type PackedDriveFile = SchemaType<typeof packedDriveFileSchema>;
 

src/models/repositories/drive-folder.ts

@@ -1,9 +1,9 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { DriveFolders, DriveFiles } from '..';
-import { DriveFolder } from '../entities/drive-folder';
-import { ensure } from '../../prelude/ensure';
-import { awaitAll } from '../../prelude/await-all';
-import { SchemaType } from '../../misc/schema';
+import { DriveFolders, DriveFiles } from '~/models';
+import { DriveFolder } from '~/models/entities/drive-folder';
+import { ensure } from '~/prelude/ensure';
+import { awaitAll } from '~/prelude/await-all';
+import { SchemaType } from '~/misc/schema';
 
 export type PackedDriveFolder = SchemaType<typeof packedDriveFolderSchema>;
 

src/models/repositories/follow-request.ts

@@ -1,7 +1,7 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { FollowRequest } from '../entities/follow-request';
-import { Users } from '..';
-import { ensure } from '../../prelude/ensure';
+import { FollowRequest } from '~/models/entities/follow-request';
+import { Users } from '~/models';
+import { ensure } from '~/prelude/ensure';
 
 @EntityRepository(FollowRequest)
 export class FollowRequestRepository extends Repository<FollowRequest> {

src/models/repositories/following.ts

@@ -1,9 +1,9 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Users } from '..';
-import { Following } from '../entities/following';
-import { ensure } from '../../prelude/ensure';
-import { awaitAll } from '../../prelude/await-all';
-import { SchemaType } from '../../misc/schema';
+import { Users } from '~/models';
+import { Following } from '~/models/entities/following';
+import { ensure } from '~/prelude/ensure';
+import { awaitAll } from '~/prelude/await-all';
+import { SchemaType } from '~/misc/schema';
 
 type LocalFollowerFollowing = Following & {
 	followerHost: null;

src/models/repositories/games/reversi/game.ts

@@ -1,7 +1,7 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Users } from '../../..';
-import { ReversiGame } from '../../../entities/games/reversi/game';
-import { ensure } from '../../../../prelude/ensure';
+import { Users } from '~/models';
+import { ReversiGame } from '~/models/entities/games/reversi/game';
+import { ensure } from '~/prelude/ensure';
 
 @EntityRepository(ReversiGame)
 export class ReversiGameRepository extends Repository<ReversiGame> {

src/models/repositories/games/reversi/matching.ts

@@ -1,8 +1,8 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { ReversiMatching } from '../../../entities/games/reversi/matching';
-import { Users } from '../../..';
-import { ensure } from '../../../../prelude/ensure';
-import { awaitAll } from '../../../../prelude/await-all';
+import { ReversiMatching } from '~/models/entities/games/reversi/matching';
+import { Users } from '~/models';
+import { ensure } from '~/prelude/ensure';
+import { awaitAll } from '~/prelude/await-all';
 
 @EntityRepository(ReversiMatching)
 export class ReversiMatchingRepository extends Repository<ReversiMatching> {

src/models/repositories/hashtag.ts

@@ -1,6 +1,6 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Hashtag } from '../entities/hashtag';
-import { SchemaType } from '../../misc/schema';
+import { Hashtag } from '~/models/entities/hashtag';
+import { SchemaType } from '~/misc/schema';
 
 export type PackedHashtag = SchemaType<typeof packedHashtagSchema>;
 

src/models/repositories/messaging-message.ts

@@ -1,8 +1,8 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { MessagingMessage } from '../entities/messaging-message';
-import { Users, DriveFiles, UserGroups } from '..';
-import { ensure } from '../../prelude/ensure';
-import { SchemaType } from '../../misc/schema';
+import { MessagingMessage } from '~/models/entities/messaging-message';
+import { Users, DriveFiles, UserGroups } from '~/models';
+import { ensure } from '~/prelude/ensure';
+import { SchemaType } from '~/misc/schema';
 
 export type PackedMessagingMessage = SchemaType<typeof packedMessagingMessageSchema>;
 

src/models/repositories/moderation-logs.ts

@@ -1,8 +1,8 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Users } from '..';
-import { ModerationLog } from '../entities/moderation-log';
-import { ensure } from '../../prelude/ensure';
-import { awaitAll } from '../../prelude/await-all';
+import { Users } from '~/models';
+import { ModerationLog } from '~/models/entities/moderation-log';
+import { ensure } from '~/prelude/ensure';
+import { awaitAll } from '~/prelude/await-all';
 
 @EntityRepository(ModerationLog)
 export class ModerationLogRepository extends Repository<ModerationLog> {

src/models/repositories/muting.ts

@@ -1,9 +1,9 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Users } from '..';
-import { Muting } from '../entities/muting';
-import { ensure } from '../../prelude/ensure';
-import { awaitAll } from '../../prelude/await-all';
-import { SchemaType } from '../../misc/schema';
+import { Users } from '~/models';
+import { Muting } from '~/models/entities/muting';
+import { ensure } from '~/prelude/ensure';
+import { awaitAll } from '~/prelude/await-all';
+import { SchemaType } from '~/misc/schema';
 
 export type PackedMuting = SchemaType<typeof packedMutingSchema>;
 

src/models/repositories/note-favorite.ts

@@ -1,7 +1,7 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { NoteFavorite } from '../entities/note-favorite';
-import { Notes } from '..';
-import { ensure } from '../../prelude/ensure';
+import { NoteFavorite } from '~/models/entities/note-favorite';
+import { Notes } from '~/models';
+import { ensure } from '~/prelude/ensure';
 
 @EntityRepository(NoteFavorite)
 export class NoteFavoriteRepository extends Repository<NoteFavorite> {

src/models/repositories/note-reaction.ts

@@ -1,8 +1,8 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { NoteReaction } from '../entities/note-reaction';
-import { Users } from '..';
-import { ensure } from '../../prelude/ensure';
-import { SchemaType } from '../../misc/schema';
+import { NoteReaction } from '~/models/entities/note-reaction';
+import { Users } from '~/models';
+import { ensure } from '~/prelude/ensure';
+import { SchemaType } from '~/misc/schema';
 
 export type PackedNoteReaction = SchemaType<typeof packedNoteReactionSchema>;
 

src/models/repositories/note.ts

@@ -1,12 +1,12 @@
 import { EntityRepository, Repository, In } from 'typeorm';
-import { Note } from '../entities/note';
-import { User } from '../entities/user';
-import { unique, concat } from '../../prelude/array';
-import { nyaize } from '../../misc/nyaize';
-import { Emojis, Users, Apps, PollVotes, DriveFiles, NoteReactions, Followings, Polls } from '..';
-import { ensure } from '../../prelude/ensure';
-import { SchemaType } from '../../misc/schema';
-import { awaitAll } from '../../prelude/await-all';
+import { Note } from '~/models/entities/note';
+import { User } from '~/models/entities/user';
+import { unique, concat } from '~/prelude/array';
+import { nyaize } from '~/misc/nyaize';
+import { Emojis, Users, Apps, PollVotes, DriveFiles, NoteReactions, Followings, Polls } from '~/models';
+import { ensure } from '~/prelude/ensure';
+import { SchemaType } from '~/misc/schema';
+import { awaitAll } from '~/prelude/await-all';
 
 export type PackedNote = SchemaType<typeof packedNoteSchema>;
 

src/models/repositories/notification.ts

@@ -1,9 +1,9 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Users, Notes } from '..';
-import { Notification } from '../entities/notification';
-import { ensure } from '../../prelude/ensure';
-import { awaitAll } from '../../prelude/await-all';
-import { SchemaType } from '../../misc/schema';
+import { Users, Notes } from '~/models';
+import { Notification } from '~/models/entities/notification';
+import { ensure } from '~/prelude/ensure';
+import { awaitAll } from '~/prelude/await-all';
+import { SchemaType } from '~/misc/schema';
 
 export type PackedNotification = SchemaType<typeof packedNotificationSchema>;
 

src/models/repositories/page-like.ts

@@ -1,7 +1,7 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { PageLike } from '../entities/page-like';
-import { Pages } from '..';
-import { ensure } from '../../prelude/ensure';
+import { PageLike } from '~/models/entities/page-like';
+import { Pages } from '~/models';
+import { ensure } from '~/prelude/ensure';
 
 @EntityRepository(PageLike)
 export class PageLikeRepository extends Repository<PageLike> {

src/models/repositories/page.ts

@@ -1,11 +1,11 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { Page } from '../entities/page';
-import { SchemaType } from '../../misc/schema';
-import { Users, DriveFiles, PageLikes } from '..';
-import { awaitAll } from '../../prelude/await-all';
-import { DriveFile } from '../entities/drive-file';
-import { User } from '../entities/user';
-import { ensure } from '../../prelude/ensure';
+import { Page } from '~/models/entities/page';
+import { SchemaType } from '~/misc/schema';
+import { Users, DriveFiles, PageLikes } from '~/models';
+import { awaitAll } from '~/prelude/await-all';
+import { DriveFile } from '~/models/entities/drive-file';
+import { User } from '~/models/entities/user';
+import { ensure } from '~/prelude/ensure';
 
 export type PackedPage = SchemaType<typeof packedPageSchema>;
 

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> {

src/models/repositories/user-group-invite.ts

@@ -1,7 +1,7 @@
 import { EntityRepository, Repository } from 'typeorm';
-import { UserGroupInvite } from '../entities/user-group-invite';
-import { UserGroups } from '..';
-import { ensure } from '../../prelude/ensure';
+import { UserGroupInvite } from '~/models/entities/user-group-invite';
+import { UserGroups } from '~/models';
+import { ensure } from '~/prelude/ensure';
 
 @EntityRepository(UserGroupInvite)
 export class UserGroupInviteRepository extends Repository<UserGroupInvite> {