From ea06665c51c86f8cdde4ed1f7114e2963d59c767 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 9 Apr 2019 23:07:08 +0900
Subject: [PATCH] isRemote --> isLink

---
 src/models/entities/drive-file.ts      | 2 +-
 src/remote/activitypub/models/image.ts | 2 +-
 src/services/drive/add-file.ts         | 2 +-
 src/services/drive/delete-file.ts      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/models/entities/drive-file.ts b/src/models/entities/drive-file.ts
index 21db4bd71..130af39ed 100644
--- a/src/models/entities/drive-file.ts
+++ b/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;
 }
diff --git a/src/remote/activitypub/models/image.ts b/src/remote/activitypub/models/image.ts
index 87095acd8..c9991dba3 100644
--- a/src/remote/activitypub/models/image.ts
+++ b/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) {
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index 16f3340ec..0a84b88fb 100644
--- a/src/services/drive/add-file.ts
+++ b/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
diff --git a/src/services/drive/delete-file.ts b/src/services/drive/delete-file.ts
index 9c23b39bf..b7fa99391 100644
--- a/src/services/drive/delete-file.ts
+++ b/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