summaryrefslogtreecommitdiff
path: root/src/models
diff options
context:
space:
mode:
Diffstat (limited to 'src/models')
-rw-r--r--src/models/repositories/drive-file.ts7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/models/repositories/drive-file.ts b/src/models/repositories/drive-file.ts
index 702f195e9d..a20d393044 100644
--- a/src/models/repositories/drive-file.ts
+++ b/src/models/repositories/drive-file.ts
@@ -6,6 +6,7 @@ import { toPuny } from '../../misc/convert-host';
import { ensure } from '../../prelude/ensure';
import { awaitAll } from '../../prelude/await-all';
import { SchemaType } from '../../misc/schema';
+import config from '../../config';
export type PackedDriveFile = SchemaType<typeof packedDriveFileSchema>;
@@ -22,7 +23,11 @@ export class DriveFileRepository extends Repository<DriveFile> {
}
public getPublicUrl(file: DriveFile, thumbnail = false): string | null {
- return thumbnail ? (file.thumbnailUrl || file.webpublicUrl || null) : (file.webpublicUrl || file.url);
+ let url = thumbnail ? (file.thumbnailUrl || file.webpublicUrl || null) : (file.webpublicUrl || file.url);
+ if (file.src !== null && file.userHost !== null && config.mediaProxy !== null) {
+ url = `${config.mediaProxy}/${thumbnail ? 'thumbnail' : ''}?url=${file.src}`;
+ }
+ return url;
}
public async clacDriveUsageOf(user: User['id'] | User): Promise<number> {