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/server/web | |
| 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/server/web')
| -rw-r--r-- | packages/backend/src/server/web/ClientServerService.ts | 2 | ||||
| -rw-r--r-- | packages/backend/src/server/web/FeedService.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index 927970e2e2..30a911088e 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -534,7 +534,7 @@ export class ClientServerService { return await reply.view('user', { user, profile, me, - avatarUrl: user.avatarUrl ?? this.userEntityService.getIdenticonUrl(user), + avatarUrl: _user.avatarUrl, sub: request.params.sub, ...await this.generateCommonPugData(this.meta), clientCtx: htmlSafeJsonStringify({ diff --git a/packages/backend/src/server/web/FeedService.ts b/packages/backend/src/server/web/FeedService.ts index 9d810ddc84..eae7645321 100644 --- a/packages/backend/src/server/web/FeedService.ts +++ b/packages/backend/src/server/web/FeedService.ts @@ -65,7 +65,7 @@ export class FeedService { generator: 'Misskey', description: `${user.notesCount} Notes, ${profile.followingVisibility === 'public' ? user.followingCount : '?'} Following, ${profile.followersVisibility === 'public' ? user.followersCount : '?'} Followers${profile.description ? ` · ${profile.description}` : ''}`, link: author.link, - image: user.avatarUrl ?? this.userEntityService.getIdenticonUrl(user), + image: (user.avatarId == null ? null : user.avatarUrl) ?? this.userEntityService.getIdenticonUrl(user), feedLinks: { json: `${author.link}.json`, atom: `${author.link}.atom`, |