11.0.0-alpha.6

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.0.0-alpha.5",
+	"version": "11.0.0-alpha.6",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",

src/init.ts

@@ -1,16 +1,10 @@
 import { initDb } from './db/postgre';
 
-async function main() {
+console.log('Init database...');
-	try {
-		console.log('Connecting database...');
-		await initDb(false, true, true);
-	} catch (e) {
-		console.error('Cannot connect to database', null, true);
-		console.error(e);
-		process.exit(1);
-	}
 
+initDb(false, true, true).then(() => {
 	console.log('Done :)');
-}
+}, e => {
-
+	console.error('Failed to init database');
-main();
+	console.error(e);
+});

src/migrate.ts

@@ -171,9 +171,9 @@ async function main() {
 				accessKey: file.metadata.storage.key,
 				folderId: file.metadata.folderId ? file.metadata.folderId.toHexString() : null,
 				storedInternal: false,
-				isRemote: false
+				isLink: false
 			});
-		} else if (!file.metadata.isRemote) {
+		} else if (!file.metadata.isLink) {
 			const [temp, clean] = await createTemp();
 			await new Promise(async (res, rej) => {
 				const bucket = await getDriveFileBucket();
@@ -201,9 +201,9 @@ async function main() {
 				url: url,
 				uri: file.metadata.uri,
 				accessKey: key,
-				folderId: file.metadata.folderId,
+				folderId: file.metadata.folderId ? file.metadata.folderId.toHexString() : null,
 				storedInternal: true,
-				isRemote: false
+				isLink: false
 			});
 			clean();
 		} else {
@@ -220,9 +220,9 @@ async function main() {
 				url: file.metadata.url,
 				uri: file.metadata.uri,
 				accessKey: null,
-				folderId: file.metadata.folderId,
+				folderId: file.metadata.folderId ? file.metadata.folderId.toHexString() : null,
 				storedInternal: false,
-				isRemote: true
+				isLink: true
 			});
 		}
 	}
@@ -307,7 +307,7 @@ async function main() {
 	}
 
 	async function migrateEmoji(emoji: any) {
-		await NoteReactions.save({
+		await Emojis.save({
 			id: emoji._id.toHexString(),
 			updatedAt: emoji.createdAt,
 			aliases: emoji.aliases,
@@ -462,6 +462,8 @@ async function main() {
 			console.error(e);
 		}
 	}
+
+	console.log('DONE :)');
 }
 
 main();

src/models/entities/drive-file.ts

@@ -150,5 +150,5 @@ export class DriveFile {
 		default: false,
 		comment: 'Whether the DriveFile is direct link to remote server.'
 	})
-	public isRemote: boolean;
+	public isLink: boolean;
 }

src/remote/activitypub/models/image.ts

@@ -40,7 +40,7 @@ export async function createImage(actor: IRemoteUser, value: any): Promise<Drive
 		throw e;
 	}
 
-	if (file.isRemote) {
+	if (file.isLink) {
 		// URLが異なっている場合、同じ画像が以前に異なるURLで登録されていたということなので、
 		// URLを更新する
 		if (file.url !== image.url) {

src/services/drive/add-file.ts

@@ -375,7 +375,7 @@ export default async function(
 	file.folderId = folder !== null ? folder.id : null;
 	file.comment = comment;
 	file.properties = properties;
-	file.isRemote = isLink;
+	file.isLink = isLink;
 	file.isSensitive = Users.isLocalUser(user) && user.alwaysMarkNsfw ? true :
 		(sensitive !== null && sensitive !== undefined)
 			? sensitive

src/services/drive/delete-file.ts

@@ -16,7 +16,7 @@ export default async function(file: DriveFile, isExpired = false) {
 		if (file.webpublicUrl) {
 			InternalStorage.del(file.webpublicAccessKey);
 		}
-	} else if (!file.isRemote) {
+	} else if (!file.isLink) {
 		const minio = new Minio.Client(config.drive.config);
 
 		await minio.removeObject(config.drive.bucket, file.accessKey);
@@ -33,7 +33,7 @@ export default async function(file: DriveFile, isExpired = false) {
 	// リモートファイル期限切れ削除後は直リンクにする
 	if (isExpired && file.userHost !== null) {
 		DriveFiles.update(file.id, {
-			isRemote: true,
+			isLink: true,
 			url: file.uri,
 			thumbnailUrl: null,
 			webpublicUrl: null