diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-07-27 01:53:42 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-27 01:53:42 +0900 |
| commit | 8dd50512015a70a27ffd71f95f77ac038774a19c (patch) | |
| tree | 8dfb00f7ef99c68f906c90eefe2671f78606a76e /src/services | |
| parent | Merge pull request #1989 from mei23/mei-oscc (diff) | |
| parent | Add S3 examples (diff) | |
| download | misskey-8dd50512015a70a27ffd71f95f77ac038774a19c.tar.gz misskey-8dd50512015a70a27ffd71f95f77ac038774a19c.tar.bz2 misskey-8dd50512015a70a27ffd71f95f77ac038774a19c.zip | |
Merge pull request #1990 from mei23/mei-osurl
オブジェクトストレージの参照URLを上書きできるようにする
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/drive/add-file.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index dd871625ed..d2e7dbd862 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -25,6 +25,8 @@ async function save(readable: stream.Readable, name: string, type: string, hash: const minio = new Minio.Client(config.drive.config); const id = uuid.v4(); const obj = `${config.drive.prefix}/${id}`; + const baseUrl = config.drive.baseUrl + || `${ config.drive.config.secure ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? ':' + config.drive.config.port : '' }/${ config.drive.bucket }`; await minio.putObject(config.drive.bucket, obj, readable, size, { 'Content-Type': type, 'Cache-Control': 'max-age=31536000, immutable' }); Object.assign(metadata, { @@ -33,7 +35,7 @@ async function save(readable: stream.Readable, name: string, type: string, hash: storageProps: { id: id }, - url: `${ config.drive.config.secure ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? ':' + config.drive.config.port : '' }/${ config.drive.bucket }/${ obj }` + url: `${ baseUrl }/${ obj }` }); const file = await DriveFile.insert({ |