Merge branch 'develop'

5 files changed, 24 insertions, 110 deletions

diff --git a/src/tools/add-emoji.ts b/src/tools/add-emoji.ts
index 2aa99e37ae..3745b48889 100644
--- a/src/tools/add-emoji.ts
+++ b/src/tools/add-emoji.ts
@@ -1,9 +1,11 @@
-import Emoji from '../models/emoji';
+import { Emojis } from '../models';
+import { genId } from '../misc/gen-id';
 
 async function main(name: string, url: string, alias?: string): Promise<any> {
 	const aliases = alias != null ? [ alias ] : [];
 
-	await Emoji.insert({
+	await Emojis.save({
+		id: genId(),
 		host: null,
 		name,
 		url,
@@ -16,8 +18,8 @@ const args = process.argv.slice(2);
 const name = args[0];
 const url = args[1];
 
-if (!name) throw 'require name';
-if (!url) throw 'require url';
+if (!name) throw new Error('require name');
+if (!url) throw new Error('require url');
 
 main(name, url).then(() => {
 	console.log('success');
diff --git a/src/tools/clean-remote-files.ts b/src/tools/clean-remote-files.ts
index 28c76345c7..e722552e14 100644
--- a/src/tools/clean-remote-files.ts
+++ b/src/tools/clean-remote-files.ts
@@ -1,18 +1,14 @@
 import * as promiseLimit from 'promise-limit';
-import DriveFile, { IDriveFile } from '../models/drive-file';
 import del from '../services/drive/delete-file';
+import { DriveFiles } from '../models';
+import { Not } from 'typeorm';
+import { DriveFile } from '../models/entities/drive-file';
+import { ensure } from '../prelude/ensure';
 
 const limit = promiseLimit(16);
 
-DriveFile.find({
-	'metadata._user.host': {
-		$ne: null
-	},
-	'metadata.deletedAt': { $exists: false }
-}, {
-	fields: {
-		_id: true
-	}
+DriveFiles.find({
+	userHost: Not(null)
 }).then(async files => {
 	console.log(`there is ${files.length} files`);
 
@@ -21,10 +17,10 @@ DriveFile.find({
 	console.log('ALL DONE');
 });
 
-async function job(file: IDriveFile): Promise<any> {
-	file = await DriveFile.findOne({ _id: file._id });
+async function job(file: DriveFile): Promise<any> {
+	file = await DriveFiles.findOne(file.id).then(ensure);
 
 	await del(file, true);
 
-	console.log('done', file._id);
+	console.log('done', file.id);
 }
diff --git a/src/tools/move-drive-files.ts b/src/tools/move-drive-files.ts
deleted file mode 100644
index 8a1e944503..0000000000
--- a/src/tools/move-drive-files.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import * as Minio from 'minio';
-import * as uuid from 'uuid';
-import * as promiseLimit from 'promise-limit';
-import DriveFile, { DriveFileChunk, getDriveFileBucket, IDriveFile } from '../models/drive-file';
-import DriveFileThumbnail, { DriveFileThumbnailChunk } from '../models/drive-file-thumbnail';
-import config from '../config';
-
-const limit = promiseLimit(16);
-
-DriveFile.find({
-	$or: [{
-		'metadata.withoutChunks': { $exists: false }
-	}, {
-		'metadata.withoutChunks': false
-	}],
-	'metadata.deletedAt': { $exists: false }
-}, {
-	fields: {
-		_id: true
-	}
-}).then(async files => {
-	console.log(`there is ${files.length} files`);
-
-	await Promise.all(files.map(file => limit(() => job(file))));
-
-	console.log('ALL DONE');
-});
-
-async function job(file: IDriveFile): Promise<any> {
-	file = await DriveFile.findOne({ _id: file._id });
-
-	const minio = new Minio.Client(config.drive.config);
-
-	const name = file.filename.substr(0, 50);
-	const keyDir = `${config.drive.prefix}/${uuid.v4()}`;
-	const key = `${keyDir}/${name}`;
-	const thumbnailKeyDir = `${config.drive.prefix}/${uuid.v4()}`;
-	const thumbnailKey = `${thumbnailKeyDir}/${name}.thumbnail.jpg`;
-
-	const baseUrl = config.drive.baseUrl
-		|| `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`;
-
-	const bucket = await getDriveFileBucket();
-	const readable = bucket.openDownloadStream(file._id);
-
-	await minio.putObject(config.drive.bucket, key, readable, file.length, {
-		'Content-Type': file.contentType,
-		'Cache-Control': 'max-age=31536000, immutable'
-	});
-
-	await DriveFile.findOneAndUpdate({ _id: file._id }, {
-		$set: {
-			'metadata.withoutChunks': true,
-			'metadata.storage': 'minio',
-			'metadata.storageProps': {
-				key: key,
-				thumbnailKey: thumbnailKey
-			},
-			'metadata.url': `${ baseUrl }/${ keyDir }/${ encodeURIComponent(name) }`,
-		}
-	});
-
-	// チャンクをすべて削除
-	await DriveFileChunk.remove({
-		files_id: file._id
-	});
-
-	//#region サムネイルもあれば削除
-	const thumbnail = await DriveFileThumbnail.findOne({
-		'metadata.originalId': file._id
-	});
-
-	if (thumbnail) {
-		await DriveFileThumbnailChunk.remove({
-			files_id: thumbnail._id
-		});
-
-		await DriveFileThumbnail.remove({ _id: thumbnail._id });
-	}
-	//#endregion
-
-	console.log('done', file._id);
-}
diff --git a/src/tools/resync-remote-user.ts b/src/tools/resync-remote-user.ts
index 7db5fe82ef..52f63cf1f1 100644
--- a/src/tools/resync-remote-user.ts
+++ b/src/tools/resync-remote-user.ts
@@ -1,5 +1,5 @@
 import parseAcct from '../misc/acct/parse';
-import resolveUser from '../remote/resolve-user';
+import { resolveUser } from '../remote/resolve-user';
 
 async function main(acct: string): Promise<any> {
 	const { username, host } = parseAcct(acct);
diff --git a/src/tools/show-signin-history.ts b/src/tools/show-signin-history.ts
index e770710322..fd7cd39e38 100644
--- a/src/tools/show-signin-history.ts
+++ b/src/tools/show-signin-history.ts
@@ -1,3 +1,5 @@
+import { Users, Signins } from '../models';
+
 // node built/tools/show-signin-history username
 //  => {Success} {Date} {IPAddrsss}
 
@@ -7,19 +9,16 @@
 // node built/tools/show-signin-history username all
 //  with full request headers
 
-import User from '../models/user';
-import Signin from '../models/signin';
-
-async function main(username: string, headers: string[]) {
-	const user = await User.findOne({
+async function main(username: string, headers?: string[]) {
+	const user = await Users.findOne({
 		host: null,
 		usernameLower: username.toLowerCase(),
 	});
 
-	if (user === null) throw 'User not found';
+	if (user == null) throw new Error('User not found');
 
-	const history = await Signin.find({
-		userId: user._id
+	const history = await Signins.find({
+		userId: user.id
 	});
 
 	for (const signin of history) {
@@ -40,7 +39,7 @@ async function main(username: string, headers: string[]) {
 const args = process.argv.slice(2);
 
 let username = args[0];
-let headers: string[];
+let headers: string[] | undefined;
 
 if (args[1] != null) {
 	headers = args[1].split(/,/).map(header => header.toLowerCase());