From 487a3079cd38e6332fd970ab825c569f9f660822 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 14 Apr 2019 17:12:04 +0900 Subject: Improve post form attaches; Fix #4673, Resolve #2327, Resolve #2145 [v11] (#4674) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * improve post form attaches * Fix * chain * 右クリックでも反応するように --- src/models/repositories/drive-file.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/models') diff --git a/src/models/repositories/drive-file.ts b/src/models/repositories/drive-file.ts index 003e350713..7dd794d031 100644 --- a/src/models/repositories/drive-file.ts +++ b/src/models/repositories/drive-file.ts @@ -18,12 +18,8 @@ export class DriveFileRepository extends Repository { ); } - public getPublicUrl(file: DriveFile, thumbnail = false): string { - if (thumbnail) { - return file.thumbnailUrl || file.webpublicUrl || file.url; - } else { - return file.webpublicUrl || file.thumbnailUrl || file.url; - } + public getPublicUrl(file: DriveFile, thumbnail = false): string | null { + return thumbnail ? (file.thumbnailUrl || file.webpublicUrl || null) : (file.webpublicUrl || file.thumbnailUrl || file.url); } public async clacDriveUsageOf(user: User['id'] | User): Promise { -- cgit v1.2.3-freya