populate userProfile in more places

2 files changed, 21 insertions, 6 deletions

diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 7ddf0abc3e..327b702e7e 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -589,9 +589,24 @@ export class NoteEntityService implements OnModuleInit {
 					id: In(targetNotesToFetch),
 				},
 				relations: {
-					user: true,
-					reply: true,
-					renote: true,
+					user: {
+						userProfile: true,
+					},
+					reply: {
+						user: {
+							userProfile: true,
+						},
+					},
+					renote: {
+						user: {
+							userProfile: true,
+						},
+						reply: {
+							user: {
+								userProfile: true,
+							},
+						},
+					},
 					channel: true,
 				},
 			});
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 7e3a55e155..84b6a4a021 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -789,11 +789,11 @@ export class UserEntityService implements OnModuleInit {
 			.map(user => user.host)
 			.filter((host): host is string => host != null));
 
-		const _profiles: MiUserProfile[] = [];
+		const _profilesFromUsers: MiUserProfile[] = [];
 		const _profilesToFetch: string[] = [];
 		for (const user of _users) {
 			if (user.userProfile) {
-				_profiles.push(user.userProfile);
+				_profilesFromUsers.push(user.userProfile);
 			} else {
 				_profilesToFetch.push(user.id);
 			}
@@ -805,7 +805,7 @@ export class UserEntityService implements OnModuleInit {
 			// profilesMap
 			this.cacheService.getUserProfiles(_profilesToFetch)
 				.then(profiles => {
-					for (const profile of _profiles) {
+					for (const profile of _profilesFromUsers) {
 						profiles.set(profile.userId, profile);
 					}
 					return profiles;