summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/services/drive/add-file.ts10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index f8c54b2af4..4f637f16ee 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -37,10 +37,8 @@ async function save(path: string, name: string, type: string, hash: string, size
if (config.drive && config.drive.storage == 'minio') {
const minio = new Minio.Client(config.drive.config);
- 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 key = `${config.drive.prefix}/${uuid.v4()}`;
+ const thumbnailKey = `${config.drive.prefix}/${uuid.v4()}`;
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 }`;
@@ -64,8 +62,8 @@ async function save(path: string, name: string, type: string, hash: string, size
key: key,
thumbnailKey: thumbnailKey
},
- url: `${ baseUrl }/${ keyDir }/${ encodeURIComponent(name) }`,
- thumbnailUrl: thumbnail ? `${ baseUrl }/${ thumbnailKeyDir }/${ encodeURIComponent(name) }.thumbnail.jpg` : null
+ url: `${ baseUrl }/${ key }`,
+ thumbnailUrl: thumbnail ? `${ baseUrl }/${ thumbnailKey }` : null
});
const file = await DriveFile.insert({