graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-09-21 00:42:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
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",
"version": "13.1.5",
"version": "13.1.6",
"codename": "nasubi",
"repository": {
"type": "git",

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

@ -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,
};
}