summaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-09 23:07:08 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-09 23:07:08 +0900
commitea06665c51c86f8cdde4ed1f7114e2963d59c767 (patch)
tree5b5014e85706638d1df203017276ba5a5bb098cc /src/services
parentUpdate migrate.ts (diff)
downloadmisskey-ea06665c51c86f8cdde4ed1f7114e2963d59c767.tar.gz
misskey-ea06665c51c86f8cdde4ed1f7114e2963d59c767.tar.bz2
misskey-ea06665c51c86f8cdde4ed1f7114e2963d59c767.zip
isRemote --> isLink
Diffstat (limited to 'src/services')
-rw-r--r--src/services/drive/add-file.ts2
-rw-r--r--src/services/drive/delete-file.ts4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index 16f3340ecd..0a84b88fb8 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 9c23b39bfc..b7fa99391e 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