diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2018-11-26 04:25:48 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-11-26 04:25:48 +0900 |
| commit | bcb04924ff08cc90d046ec7064fa0b89cbf9219e (patch) | |
| tree | 8ba56067c7be24ca06a833e84f052309773da831 /src/misc | |
| parent | :art: (diff) | |
| download | sharkey-bcb04924ff08cc90d046ec7064fa0b89cbf9219e.tar.gz sharkey-bcb04924ff08cc90d046ec7064fa0b89cbf9219e.tar.bz2 sharkey-bcb04924ff08cc90d046ec7064fa0b89cbf9219e.zip | |
Image for web publish (#3402)
* Image for Web
* Add comment
* Make main to original
Diffstat (limited to 'src/misc')
| -rw-r--r-- | src/misc/get-drive-file-url.ts | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/misc/get-drive-file-url.ts b/src/misc/get-drive-file-url.ts index 0fe467261e..6ab7bfdb1b 100644 --- a/src/misc/get-drive-file-url.ts +++ b/src/misc/get-drive-file-url.ts @@ -6,15 +6,24 @@ export default function(file: IDriveFile, thumbnail = false): string { if (file.metadata.withoutChunks) { if (thumbnail) { - return file.metadata.thumbnailUrl || file.metadata.url; + return file.metadata.thumbnailUrl || file.metadata.webpublicUrl || file.metadata.url; } else { - return file.metadata.url; + return file.metadata.webpublicUrl || file.metadata.url; } } else { if (thumbnail) { return `${config.drive_url}/${file._id}?thumbnail`; } else { - return `${config.drive_url}/${file._id}`; + return `${config.drive_url}/${file._id}?web`; } } } + +export function getOriginalUrl(file: IDriveFile) { + if (file.metadata && file.metadata.url) { + return file.metadata.url; + } + + const accessKey = file.metadata ? file.metadata.accessKey : null; + return `${config.drive_url}/${file._id}${accessKey ? '?original=' + accessKey : ''}`; +} |