graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 19:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

isRemote --> isLink

Browse source
This commit is contained in:
syuilo 2019-04-09 23:07:08 +09:00
parent 74a4bd704c
commit ea06665c51
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/models/entities/drive-file.ts
View file

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

2
src/remote/activitypub/models/image.ts
View file

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

2
src/services/drive/add-file.ts
View file

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

4
src/services/drive/delete-file.ts
View file

@ -16,7 +16,7 @@ export default async function(file: DriveFile, isExpired = false) {
if (file.webpublicUrl) { if (file.webpublicUrl) {
InternalStorage.del(file.webpublicAccessKey); InternalStorage.del(file.webpublicAccessKey);
} }
} else if (!file.isRemote) { } else if (!file.isLink) {
const minio = new Minio.Client(config.drive.config); const minio = new Minio.Client(config.drive.config);
await minio.removeObject(config.drive.bucket, file.accessKey); 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) { if (isExpired && file.userHost !== null) {
DriveFiles.update(file.id, { DriveFiles.update(file.id, {
isRemote: true, isLink: true,
url: file.uri, url: file.uri,
thumbnailUrl: null, thumbnailUrl: null,
webpublicUrl: null webpublicUrl: null