diff --git a/locales/en-US.yml b/locales/en-US.yml index 69d642419..e33999d6d 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -922,6 +922,7 @@ recentNHours: "Last {n} hours" recentNDays: "Last {n} days" noEmailServerWarning: "Email server not configured." thereIsUnresolvedAbuseReportWarning: "There are unsolved reports." +pendingUserApprovals: "There are users awaiting approval." recommended: "Recommended" check: "Check" driveCapOverrideLabel: "Change the drive capacity for this user" diff --git a/locales/index.d.ts b/locales/index.d.ts index be6ad7782..93f5e65af 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -925,6 +925,7 @@ export interface Locale { "recentNDays": string; "noEmailServerWarning": string; "thereIsUnresolvedAbuseReportWarning": string; + "pendingUserApprovals": string; "recommended": string; "check": string; "driveCapOverrideLabel": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index e8a9d980b..0d43a5d5a 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -922,6 +922,7 @@ recentNHours: "直近{n}時間" recentNDays: "直近{n}日" noEmailServerWarning: "メールサーバーの設定がされていません。" thereIsUnresolvedAbuseReportWarning: "未対応の通報があります。" +pendingUserApprovals: "承認待ちのユーザーがいる。" recommended: "推奨" check: "チェック" driveCapOverrideLabel: "このユーザーのドライブ容量上限を変更" diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts index b02b0af23..02fbd50ee 100644 --- a/packages/backend/src/core/entities/UserEntityService.ts +++ b/packages/backend/src/core/entities/UserEntityService.ts @@ -370,6 +370,7 @@ export class UserEntityService implements OnModuleInit { isCat: user.isCat, isSilenced: user.isSilenced || this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote), speakAsCat: user.speakAsCat ?? falsy, + approved: user.approved, instance: user.host ? this.federatedInstanceService.federatedInstanceCache.fetch(user.host).then(instance => instance ? { name: instance.name, softwareName: instance.softwareName, @@ -489,7 +490,6 @@ export class UserEntityService implements OnModuleInit { ...(opts.includeSecrets ? { email: profile!.email, emailVerified: profile!.emailVerified, - approved: user.approved, signupReason: user.signupReason, securityKeysList: profile!.twoFactorEnabled ? this.userSecurityKeysRepository.find({ diff --git a/packages/frontend/src/components/MkUserCardMini.vue b/packages/frontend/src/components/MkUserCardMini.vue index 465a10988..70c2a37b5 100644 --- a/packages/frontend/src/components/MkUserCardMini.vue +++ b/packages/frontend/src/components/MkUserCardMini.vue @@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only -->