Compare commits

..

2 Commits
6.0.0 ... 6.0.2

Author SHA1 Message Date
9d6641be3a Fix bug 2018-08-16 08:18:41 +09:00
ac15c2e71f Fix bug 2018-08-16 08:11:21 +09:00
3 changed files with 3 additions and 3 deletions

View File

@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
"version": "6.0.0",
"version": "6.0.2",
"clientVersion": "1.0.8367",
"codename": "nighthike",
"main": "./built/index.js",

View File

@ -165,7 +165,7 @@ export const pack = (
_target = Object.assign(_target, _file.metadata);
_target.url = _file.metadata.url ? _file.metadata.url : `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}`;
_target.thumbnailUrl = _file.metadata.thumbnailUrl ? _file.metadata.thumbnailUrl : `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}?thumbnail`;
_target.thumbnailUrl = _file.metadata.thumbnailUrl ? _file.metadata.thumbnailUrl : _file.metadata.url ? _file.metadata.url : `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}?thumbnail`;
_target.isRemote = _file.metadata.isRemote;
if (_target.properties == null) _target.properties = {};

View File

@ -48,7 +48,7 @@ async function save(path: string, name: string, type: string, hash: string, size
});
if (thumbnail) {
await minio.putObject(config.drive.bucket, thumbnailObj, fs.createReadStream(path), size, {
await minio.putObject(config.drive.bucket, thumbnailObj, thumbnail, size, {
'Content-Type': 'image/jpeg',
'Cache-Control': 'max-age=31536000, immutable'
});