Merge branch 'develop'

21 files changed, 40 insertions, 33 deletions

diff --git a/src/misc/antenna-cache.ts b/src/misc/antenna-cache.ts
index 6be1c18db5..a23eeb45ec 100644
--- a/src/misc/antenna-cache.ts
+++ b/src/misc/antenna-cache.ts
@@ -1,5 +1,5 @@
-import { Antennas } from '../models';
-import { Antenna } from '../models/entities/antenna';
+import { Antennas } from '@/models/index';
+import { Antenna } from '@/models/entities/antenna';
 import { subsdcriber } from '../db/redis';
 
 let antennasFetched = false;
diff --git a/src/misc/app-lock.ts b/src/misc/app-lock.ts
index 9ae2cba478..a32b600612 100644
--- a/src/misc/app-lock.ts
+++ b/src/misc/app-lock.ts
@@ -1,5 +1,6 @@
 import { redisClient } from '../db/redis';
 import { promisify } from 'util';
+import * as redisLock from 'redis-lock';
 
 /**
  * Retry delay (ms) for lock acquisition
@@ -8,7 +9,7 @@ const retryDelay = 100;
 
 const lock: (key: string, timeout?: number) => Promise<() => void>
 	= redisClient
-	? promisify(require('redis-lock')(redisClient, retryDelay))
+	? promisify(redisLock(redisClient, retryDelay))
 	: async () => () => { };
 
 /**
diff --git a/src/misc/captcha.ts b/src/misc/captcha.ts
index 727c86af0f..f36943b589 100644
--- a/src/misc/captcha.ts
+++ b/src/misc/captcha.ts
@@ -1,7 +1,7 @@
 import fetch from 'node-fetch';
 import { URLSearchParams } from 'url';
 import { getAgentByUrl } from './fetch';
-import config from '@/config';
+import config from '@/config/index';
 
 export async function verifyRecaptcha(secret: string, response: string) {
 	const result = await getCaptchaResponse('https://www.recaptcha.net/recaptcha/api/siteverify', secret, response).catch(e => {
diff --git a/src/misc/check-hit-antenna.ts b/src/misc/check-hit-antenna.ts
index 3dfcb54c49..38965f4b0d 100644
--- a/src/misc/check-hit-antenna.ts
+++ b/src/misc/check-hit-antenna.ts
@@ -1,7 +1,7 @@
-import { Antenna } from '../models/entities/antenna';
-import { Note } from '../models/entities/note';
-import { User } from '../models/entities/user';
-import { UserListJoinings, UserGroupJoinings } from '../models';
+import { Antenna } from '@/models/entities/antenna';
+import { Note } from '@/models/entities/note';
+import { User } from '@/models/entities/user';
+import { UserListJoinings, UserGroupJoinings } from '@/models/index';
 import { getFullApAccount } from './convert-host';
 import { PackedNote } from '../models/repositories/note';
 import { parseAcct } from '@/misc/acct';
diff --git a/src/misc/check-word-mute.ts b/src/misc/check-word-mute.ts
index 5af267d75d..e2e871dd2b 100644
--- a/src/misc/check-word-mute.ts
+++ b/src/misc/check-word-mute.ts
@@ -1,6 +1,6 @@
 const RE2 = require('re2');
-import { Note } from '../models/entities/note';
-import { User } from '../models/entities/user';
+import { Note } from '@/models/entities/note';
+import { User } from '@/models/entities/user';
 
 type NoteLike = {
 	userId: Note['userId'];
diff --git a/src/misc/convert-host.ts b/src/misc/convert-host.ts
index 7b0b0acf10..6e9f6ed3e9 100644
--- a/src/misc/convert-host.ts
+++ b/src/misc/convert-host.ts
@@ -1,5 +1,5 @@
 import { URL } from 'url';
-import config from '@/config';
+import config from '@/config/index';
 import { toASCII } from 'punycode/';
 
 export function getFullApAccount(username: string, host: string | null) {
diff --git a/src/misc/count-same-renotes.ts b/src/misc/count-same-renotes.ts
index bc1072080a..6628761182 100644
--- a/src/misc/count-same-renotes.ts
+++ b/src/misc/count-same-renotes.ts
@@ -1,4 +1,4 @@
-import { Notes } from '../models';
+import { Notes } from '@/models/index';
 
 export async function countSameRenotes(userId: string, renoteId: string, excludeNoteId: string | undefined): Promise<number> {
 	// 指定したユーザーの指定したノートのリノートがいくつあるか数える
diff --git a/src/misc/download-text-file.ts b/src/misc/download-text-file.ts
index d6fd17fc13..e8e23cc120 100644
--- a/src/misc/download-text-file.ts
+++ b/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 './download-url';
 
diff --git a/src/misc/download-url.ts b/src/misc/download-url.ts
index dafeff6fc8..43e061c715 100644
--- a/src/misc/download-url.ts
+++ b/src/misc/download-url.ts
@@ -5,9 +5,9 @@ import { URL } from 'url';
 import fetch from 'node-fetch';
 import { getAgentByUrl } from './fetch';
 import { AbortController } from 'abort-controller';
-import config from '@/config';
+import config from '@/config/index';
 import * as chalk from 'chalk';
-import Logger from '../services/logger';
+import Logger from '@/services/logger';
 
 const pipeline = util.promisify(stream.pipeline);
 
diff --git a/src/misc/fetch-meta.ts b/src/misc/fetch-meta.ts
index e7a945dc9e..a0bcdd4d48 100644
--- a/src/misc/fetch-meta.ts
+++ b/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;
diff --git a/src/misc/fetch-proxy-account.ts b/src/misc/fetch-proxy-account.ts
index 537edf2891..e0eedea4c8 100644
--- a/src/misc/fetch-proxy-account.ts
+++ b/src/misc/fetch-proxy-account.ts
@@ -1,6 +1,6 @@
 import { fetchMeta } from './fetch-meta';
-import { ILocalUser } from '../models/entities/user';
-import { Users } from '../models';
+import { ILocalUser } from '@/models/entities/user';
+import { Users } from '@/models/index';
 
 export async function fetchProxyAccount(): Promise<ILocalUser | null> {
 	const meta = await fetchMeta();
diff --git a/src/misc/fetch.ts b/src/misc/fetch.ts
index f7756f9256..82db2f2f8c 100644
--- a/src/misc/fetch.ts
+++ b/src/misc/fetch.ts
@@ -3,7 +3,7 @@ import * as https from 'https';
 import CacheableLookup from 'cacheable-lookup';
 import fetch, { HeadersInit } from 'node-fetch';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
-import config from '@/config';
+import config from '@/config/index';
 import { URL } from 'url';
 
 export async function getJson(url: string, accept = 'application/json, */*', timeout = 10000, headers?: HeadersInit) {
diff --git a/src/misc/gen-avatar.ts b/src/misc/gen-avatar.ts
index 7ff28b2e88..f03ca9f96d 100644
--- a/src/misc/gen-avatar.ts
+++ b/src/misc/gen-avatar.ts
@@ -2,7 +2,7 @@
  * Random avatar generator
  */
 
-const p = require('pureimage');
+import * as p from 'pureimage';
 import * as gen from 'random-seed';
 import { WriteStream } from 'fs';
 
diff --git a/src/misc/gen-id.ts b/src/misc/gen-id.ts
index 8e7e0b6113..b1b542dc4b 100644
--- a/src/misc/gen-id.ts
+++ b/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/index';
 
 const metohd = config.id.toLowerCase();
 
diff --git a/src/misc/get-user-name.ts b/src/misc/get-user-name.ts
index b6b45118b0..3545e986e8 100644
--- a/src/misc/get-user-name.ts
+++ b/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;
diff --git a/src/misc/is-quote.ts b/src/misc/is-quote.ts
index 0a2a72f4a0..2b57f036a2 100644
--- a/src/misc/is-quote.ts
+++ b/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));
diff --git a/src/misc/keypair-store.ts b/src/misc/keypair-store.ts
index c78fdd7555..c018013b7b 100644
--- a/src/misc/keypair-store.ts
+++ b/src/misc/keypair-store.ts
@@ -1,6 +1,6 @@
-import { UserKeypairs } from '../models';
-import { User } from '../models/entities/user';
-import { UserKeypair } from '../models/entities/user-keypair';
+import { UserKeypairs } from '@/models/index';
+import { User } from '@/models/entities/user';
+import { UserKeypair } from '@/models/entities/user-keypair';
 import { Cache } from './cache';
 
 const cache = new Cache<UserKeypair>(Infinity);
diff --git a/src/misc/license.ts b/src/misc/license.ts
index d36af665cd..8b12923ca1 100644
--- a/src/misc/license.ts
+++ b/src/misc/license.ts
@@ -1,6 +1,12 @@
 import * as fs from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
 
-const license = fs.readFileSync(__dirname + '/../../LICENSE', 'utf-8');
+//const _filename = fileURLToPath(import.meta.url);
+const _filename = __filename;
+const _dirname = dirname(_filename);
+
+const license = fs.readFileSync(_dirname + '/../../LICENSE', 'utf-8');
 
 const licenseHtml = license
 	.replace(/\r\n/g, '\n')
diff --git a/src/misc/populate-emojis.ts b/src/misc/populate-emojis.ts
index 42aaaf0705..f0a8bde31e 100644
--- a/src/misc/populate-emojis.ts
+++ b/src/misc/populate-emojis.ts
@@ -1,11 +1,11 @@
 import { In } from 'typeorm';
-import { Emojis } from '../models';
-import { Emoji } from '../models/entities/emoji';
-import { Note } from '../models/entities/note';
+import { Emojis } from '@/models/index';
+import { Emoji } from '@/models/entities/emoji';
+import { Note } from '@/models/entities/note';
 import { Cache } from './cache';
 import { isSelfHost, toPunyNullable } from './convert-host';
 import { decodeReaction } from './reaction-lib';
-import config from '@/config';
+import config from '@/config/index';
 import { query } from '@/prelude/url';
 
 const cache = new Cache<Emoji | null>(1000 * 60 * 60 * 12);
diff --git a/src/misc/reaction-lib.ts b/src/misc/reaction-lib.ts
index b393154d9c..46dedfa24b 100644
--- a/src/misc/reaction-lib.ts
+++ b/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/index';
 import { toPunyNullable } from './convert-host';
 
 const legacies: Record<string, string> = {
diff --git a/src/misc/show-machine-info.ts b/src/misc/show-machine-info.ts
index 2aae019be2..58747c1152 100644
--- a/src/misc/show-machine-info.ts
+++ b/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');