diff options
| author | anatawa12 <anatawa12@icloud.com> | 2025-04-15 16:10:17 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-15 16:10:17 +0900 |
| commit | d5fe6e36aecd2551fb2f3b80af4d1c42e0010fc7 (patch) | |
| tree | 5907b1cd59fe1bc6c09a7bfc6adfa0187d3d2016 /packages/backend/src/core/entities | |
| parent | fix: フォルダを開いた状態でメニューからアップロードし... (diff) | |
| download | sharkey-d5fe6e36aecd2551fb2f3b80af4d1c42e0010fc7.tar.gz sharkey-d5fe6e36aecd2551fb2f3b80af4d1c42e0010fc7.tar.bz2 sharkey-d5fe6e36aecd2551fb2f3b80af4d1c42e0010fc7.zip | |
fix: avatarId が null のときにも avatarUrl が non null 担ってることがある問題 (#15833)
Diffstat (limited to 'packages/backend/src/core/entities')
| -rw-r--r-- | packages/backend/src/core/entities/UserEntityService.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index e252ff509e..d4769d24d4 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -486,8 +486,8 @@ export class UserEntityService implements OnModuleInit { name: user.name, username: user.username, host: user.host, - avatarUrl: user.avatarUrl ?? this.getIdenticonUrl(user), - avatarBlurhash: user.avatarBlurhash, + avatarUrl: (user.avatarId == null ? null : user.avatarUrl) ?? this.getIdenticonUrl(user), + avatarBlurhash: (user.avatarId == null ? null : user.avatarBlurhash), avatarDecorations: user.avatarDecorations.length > 0 ? this.avatarDecorationService.getAll().then(decorations => user.avatarDecorations.filter(ud => decorations.some(d => d.id === ud.id)).map(ud => ({ id: ud.id, angle: ud.angle || undefined, @@ -533,8 +533,8 @@ export class UserEntityService implements OnModuleInit { createdAt: this.idService.parse(user.id).date.toISOString(), updatedAt: user.updatedAt ? user.updatedAt.toISOString() : null, lastFetchedAt: user.lastFetchedAt ? user.lastFetchedAt.toISOString() : null, - bannerUrl: user.bannerUrl, - bannerBlurhash: user.bannerBlurhash, + bannerUrl: user.bannerId == null ? null : user.bannerUrl, + bannerBlurhash: user.bannerId == null ? null : user.bannerBlurhash, isLocked: user.isLocked, isSilenced: this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote), isSuspended: user.isSuspended, |