summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/backend/src/core/entities/UserEntityService.ts13
1 files changed, 4 insertions, 9 deletions
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 68d30fe174..51e6b1d7ab 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -340,11 +340,6 @@ export class UserEntityService implements OnModuleInit {
const falsy = opts.detail ? false : undefined;
- const memo = meId == null ? null : await this.userMemosRepository.findOneBy({
- userId: meId,
- targetUserId: user.id,
- }).then(row => row?.memo ?? null);
-
const packed = {
id: user.id,
name: user.name,
@@ -417,6 +412,10 @@ export class UserEntityService implements OnModuleInit {
isAdministrator: role.isAdministrator,
displayOrder: role.displayOrder,
}))),
+ memo: meId == null ? null : await this.userMemosRepository.findOneBy({
+ userId: meId,
+ targetUserId: user.id,
+ }).then(row => row?.memo ?? null),
} : {}),
...(opts.detail && isMe ? {
@@ -484,10 +483,6 @@ export class UserEntityService implements OnModuleInit {
isMuted: relation.isMuted,
isRenoteMuted: relation.isRenoteMuted,
} : {}),
-
- ...(memo ? {
- memo,
- } : {}),
} as Promiseable<Packed<'User'>> as Promiseable<IsMeAndIsUserDetailed<ExpectsMe, D>>;
return await awaitAll(packed);