diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2023-02-28 17:14:23 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-28 17:14:23 +0900 |
| commit | 12932d2831213bb2a60949f8d388fc2f6bd64ba3 (patch) | |
| tree | 0120eea59a447dbe569d7254a1043d6f675ed9d4 /packages/backend/src/server | |
| parent | dev: introduce Reviewer lottery (diff) | |
| download | sharkey-12932d2831213bb2a60949f8d388fc2f6bd64ba3.tar.gz sharkey-12932d2831213bb2a60949f8d388fc2f6bd64ba3.tar.bz2 sharkey-12932d2831213bb2a60949f8d388fc2f6bd64ba3.zip | |
fix: 外部メディアプロキシ使用時にアバタークロップができない問題を修正 (#10142)
* wip
* fix
* Update packages/frontend/src/scripts/media-proxy.ts
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src/server')
| -rw-r--r-- | packages/backend/src/server/FileServerService.ts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/backend/src/server/FileServerService.ts b/packages/backend/src/server/FileServerService.ts index c12ae9b824..e5eefac1fa 100644 --- a/packages/backend/src/server/FileServerService.ts +++ b/packages/backend/src/server/FileServerService.ts @@ -226,7 +226,10 @@ export class FileServerService { return; } - if (this.config.externalMediaProxyEnabled) { + // アバタークロップなど、どうしてもオリジンである必要がある場合 + const mustOrigin = 'origin' in request.query; + + if (this.config.externalMediaProxyEnabled && !mustOrigin) { // 外部のメディアプロキシが有効なら、そちらにリダイレクト reply.header('Cache-Control', 'public, max-age=259200'); // 3 days |