Improve post form attaches; Fix #4673, Resolve #2327, Resolve #2145 [v11] (#4674)

* improve post form attaches

* Fix

* chain

* 右クリックでも反応するように

1 files changed, 2 insertions, 6 deletions

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<DriveFile> {
 		);
 	}
 
-	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<number> {