diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-01-26 18:44:43 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-01-26 18:44:43 +0900 |
| commit | 7cb13cf83956b534f806bc6d622e3d4d720d5c9e (patch) | |
| tree | f06eab859707d4c86391c04177ad5510e47127c9 /packages | |
| parent | 絵文字ピッカーでカスタム絵文字が表示されないのを修正 (diff) | |
| download | misskey-7cb13cf83956b534f806bc6d622e3d4d720d5c9e.tar.gz misskey-7cb13cf83956b534f806bc6d622e3d4d720d5c9e.tar.bz2 misskey-7cb13cf83956b534f806bc6d622e3d4d720d5c9e.zip | |
proxyRemoteFilesがfalseならリモートカスタム絵文字は直リンにする
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/backend/src/core/CustomEmojiService.ts | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts index 2610ad5692..39814e1be6 100644 --- a/packages/backend/src/core/CustomEmojiService.ts +++ b/packages/backend/src/core/CustomEmojiService.ts @@ -117,7 +117,11 @@ export class CustomEmojiService { const isLocal = emoji.host == null; const emojiUrl = emoji.publicUrl || emoji.originalUrl; // || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ） - const url = isLocal ? emojiUrl : `${this.config.url}/proxy/${encodeURIComponent((new URL(emojiUrl)).pathname)}?${query({ url: emojiUrl })}`; + const url = isLocal + ? emojiUrl + : this.config.proxyRemoteFiles + ? `${this.config.url}/proxy/${encodeURIComponent((new URL(emojiUrl)).pathname)}?${query({ url: emojiUrl })}` + : emojiUrl; return url; } |