usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

This commit is contained in:
syuilo 2023-01-22 17:30:12 +09:00
parent 68a523ec6d 80a400a67c
commit a35e0e9261
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "13.1.5", "version": "13.1.6",
"codename": "nasubi", "codename": "nasubi",
"repository": { "repository": {
"type": "git", "type": "git",

4
packages/backend/src/core/entities/EmojiEntityService.ts
View File

@ -32,8 +32,8 @@ export class EmojiEntityService {
name: emoji.name, name: emoji.name,
category: emoji.category, category: emoji.category,
host: opts.omitHost ? undefined : emoji.host, host: opts.omitHost ? undefined : emoji.host,
// ?? emoji.originalUrl してるのは後方互換性のため // || emoji.originalUrl してるのは後方互換性のため（publicUrlはstringなので??はだめ）
url: opts.withUrl ? (emoji.publicUrl ?? emoji.originalUrl) : undefined, url: opts.withUrl ? (emoji.publicUrl || emoji.originalUrl) : undefined,
}; };
} }