diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2023-04-12 10:58:56 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-12 10:58:56 +0900 |
| commit | 81d2c5a4a7355af8a385893136e12e618a8b92d2 (patch) | |
| tree | c9276e4468000c4d07262f13154a69852b56d57d /packages/backend/src/core/CustomEmojiService.ts | |
| parent | refactor: サウンド関連の設定をpizzaxに移行 (#8105) (diff) | |
| download | sharkey-81d2c5a4a7355af8a385893136e12e618a8b92d2.tar.gz sharkey-81d2c5a4a7355af8a385893136e12e618a8b92d2.tar.bz2 sharkey-81d2c5a4a7355af8a385893136e12e618a8b92d2.zip | |
enhance: カスタム絵文字関連の変更 (#9794)
* PackedNoteなどのemojisはプロキシしていないURLを返すように
* MFMでx3/x4もしくはscale.x/yが2.5以上に指定されていた場合にはオリジナル品質の絵文字を使用する
* update CHANGELOG.md
* fix changelog
* ??
* wip
* fix
* merge
* Update packages/frontend/src/scripts/media-proxy.ts
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* merge
* calc scale
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages/backend/src/core/CustomEmojiService.ts')
| -rw-r--r-- | packages/backend/src/core/CustomEmojiService.ts | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts index 3de936dd65..416c3de5a8 100644 --- a/packages/backend/src/core/CustomEmojiService.ts +++ b/packages/backend/src/core/CustomEmojiService.ts @@ -267,16 +267,7 @@ export class CustomEmojiService { const emoji = await this.cache.fetch(`${name} ${host}`, queryOrNull); if (emoji == null) return null; - - const isLocal = emoji.host == null; - const emojiUrl = emoji.publicUrl || emoji.originalUrl; // || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ） - const url = isLocal - ? emojiUrl - : this.config.proxyRemoteFiles - ? `${this.config.mediaProxy}/emoji.webp?${query({ url: emojiUrl })}` - : emojiUrl; - - return url; + return emoji.publicUrl || emoji.originalUrl; // || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ） } /** |