From 1a408db3b1abb1624448976e8340abccaa31a702 Mon Sep 17 00:00:00 2001 From: tamaina Date: Fri, 30 Dec 2022 13:37:58 +0000 Subject: fix: use || for emoji url fallback instead of ?? --- packages/backend/src/server/web/ClientServerService.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/backend/src/server/web/ClientServerService.ts') diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index 83a30dbe0b..02b779d741 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -245,7 +245,8 @@ export class ClientServerService { reply.header('Content-Security-Policy', 'default-src \'none\'; style-src \'unsafe-inline\''); const url = new URL("/proxy/emoji.webp", this.config.url); - url.searchParams.set('url', emoji.publicUrl ?? emoji.originalUrl); // ?? emoji.originalUrl してるのは後方互換性のため + // || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ） + url.searchParams.set('url', emoji.publicUrl || emoji.originalUrl); url.searchParams.set('emoji', '1'); if ('static' in request.query) url.searchParams.set('static', '1'); -- cgit v1.2.3-freya