laoxong/misskey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve #5116

Browse Source
This commit is contained in:
syuilo 2019-07-08 16:03:17 +09:00
parent c2c06694da
commit ec1f2a285b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/drive/add-file.ts
View File

@ -71,7 +71,7 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
]; ];
if (alts.webpublic) { if (alts.webpublic) {
webpublicKey = `${meta.objectStoragePrefix}/${uuid.v4()}.${alts.webpublic.ext}`; webpublicKey = `${meta.objectStoragePrefix}/webpublic-${uuid.v4()}.${alts.webpublic.ext}`;
webpublicUrl = `${ baseUrl }/${ webpublicKey }`; webpublicUrl = `${ baseUrl }/${ webpublicKey }`;
logger.info(`uploading webpublic: ${webpublicKey}`); logger.info(`uploading webpublic: ${webpublicKey}`);
@ -79,7 +79,7 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
} }
if (alts.thumbnail) { if (alts.thumbnail) {
thumbnailKey = `${meta.objectStoragePrefix}/${uuid.v4()}.${alts.thumbnail.ext}`; thumbnailKey = `${meta.objectStoragePrefix}/thumbnail-${uuid.v4()}.${alts.thumbnail.ext}`;
thumbnailUrl = `${ baseUrl }/${ thumbnailKey }`; thumbnailUrl = `${ baseUrl }/${ thumbnailKey }`;
logger.info(`uploading thumbnail: ${thumbnailKey}`); logger.info(`uploading thumbnail: ${thumbnailKey}`);
@ -104,8 +104,8 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
return await DriveFiles.save(file); return await DriveFiles.save(file);
} else { // use internal storage } else { // use internal storage
const accessKey = uuid.v4(); const accessKey = uuid.v4();
const thumbnailAccessKey = uuid.v4(); const thumbnailAccessKey = 'thumbnail-' + uuid.v4();
const webpublicAccessKey = uuid.v4(); const webpublicAccessKey = 'webpublic-' + uuid.v4();
const url = InternalStorage.saveFromPath(accessKey, path); const url = InternalStorage.saveFromPath(accessKey, path);