summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/FileServerService.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-02-12 10:21:20 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-02-12 10:21:20 +0900
commita8feed1effd83d4940a84093de95d0aaa88f1c6c (patch)
tree037d4df6e1b27288e33e96983200ab9f68f4da28 /packages/backend/src/server/FileServerService.ts
parentenhance(client): improve api error handling (diff)
parentenhance(server): videoThumbnailGenerator config (#9845) (diff)
downloadsharkey-a8feed1effd83d4940a84093de95d0aaa88f1c6c.tar.gz
sharkey-a8feed1effd83d4940a84093de95d0aaa88f1c6c.tar.bz2
sharkey-a8feed1effd83d4940a84093de95d0aaa88f1c6c.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/backend/src/server/FileServerService.ts')
-rw-r--r--packages/backend/src/server/FileServerService.ts6
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/backend/src/server/FileServerService.ts b/packages/backend/src/server/FileServerService.ts
index 49ded6c28e..f4bc568fdc 100644
--- a/packages/backend/src/server/FileServerService.ts
+++ b/packages/backend/src/server/FileServerService.ts
@@ -150,6 +150,12 @@ export class FileServerService {
file.cleanup();
return await reply.redirect(301, url.toString());
} else if (file.mime.startsWith('video/')) {
+ const externalThumbnail = this.videoProcessingService.getExternalVideoThumbnailUrl(file.url);
+ if (externalThumbnail) {
+ file.cleanup();
+ return await reply.redirect(301, externalThumbnail);
+ }
+
image = await this.videoProcessingService.generateVideoThumbnail(file.path);
}
}