From 7a6534f30bae2f3321c20b853853da4fb97d8d6e Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 22 Jan 2023 17:29:31 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=A0?= =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=AEURL=E3=81=8C=E7=A9=BA?= =?UTF-8?q?=E6=96=87=E5=AD=97=E5=88=97=E3=81=AB=E3=81=AA=E3=82=8B=E5=A0=B4?= =?UTF-8?q?=E5=90=88=E3=81=8C=E3=81=82=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/core/entities/EmojiEntityService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/core/entities/EmojiEntityService.ts b/packages/backend/src/core/entities/EmojiEntityService.ts index cee85a568..611552d89 100644 --- a/packages/backend/src/core/entities/EmojiEntityService.ts +++ b/packages/backend/src/core/entities/EmojiEntityService.ts @@ -32,8 +32,8 @@ export class EmojiEntityService { name: emoji.name, category: emoji.category, host: opts.omitHost ? undefined : emoji.host, - // ?? emoji.originalUrl してるのは後方互換性のため - url: opts.withUrl ? (emoji.publicUrl ?? emoji.originalUrl) : undefined, + // || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ） + url: opts.withUrl ? (emoji.publicUrl || emoji.originalUrl) : undefined, }; } From 80a400a67ca0f602e07edb089deb9c41e463dfb8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 22 Jan 2023 17:30:04 +0900 Subject: [PATCH 2/2] 13.1.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b0a64b035..7c1db9cc6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "13.1.5", + "version": "13.1.6", "codename": "nasubi", "repository": { "type": "git",