fix

HotoRas · Dec 29, 2023 · 5eefb04 · 5eefb04
1 parent c28685c
commit 5eefb04
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -145,7 +145,7 @@ unsuspend: "解凍"
 blockConfirm: "ブロックしますか？"
 unblockConfirm: "ブロック解除しますか？"
 suspendConfirm: "凍結しますか？"
-approveConfirm: "このアカウントを承認してもよろしいですか？"
+approveConfirm: "登録を承認しますか？"
 unsuspendConfirm: "解凍しますか？"
 selectList: "リストを選択"
 editList: "リストを編集"
@@ -874,7 +874,7 @@ itsOff: "オフになっています"
 on: "オン"
 off: "オフ"
 emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする"
-approvalRequiredForSignup: "新規ユーザーの承認が必要"
+approvalRequiredForSignup: "アカウント登録を承認制にする"
 unread: "未読"
 filter: "フィルタ"
 controlPanel: "コントロールパネル"

diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
@@ -368,7 +368,6 @@ export class UserEntityService implements OnModuleInit {
 			}))) : [],
 			isBot: user.isBot,
 			isCat: user.isCat,
-			approved: user.approved,
 			instance: user.host ? this.federatedInstanceService.federatedInstanceCache.fetch(user.host).then(instance => instance ? {
 				name: instance.name,
 				softwareName: instance.softwareName,
@@ -442,6 +441,7 @@ export class UserEntityService implements OnModuleInit {
 					targetUserId: user.id,
 				}).then(row => row?.memo ?? null),
 				moderationNote: iAmModerator ? (profile!.moderationNote ?? '') : undefined,
+				approved: iAmModerator ? user.approved : undefined,
 			} : {}),
 
 			...(opts.detail && isMe ? {

diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
@@ -353,6 +353,10 @@ export const packedUserDetailedNotMeOnlySchema = {
 			type: 'string',
 			nullable: false, optional: true,
 		},
+		approved: {
+			type: 'boolean',
+			nullable: false, optional: true,
+		},
 		//#region relations
 		isFollowing: {
 			type: 'boolean',

diff --git a/packages/frontend/.storybook/fakes.ts b/packages/frontend/.storybook/fakes.ts
@@ -71,6 +71,7 @@ export function userDetailed(id = 'someuserid', username = 'miskist', host = 'mi
 		username,
 		host,
 		name,
+		approved: true,
 		onlineStatus: 'unknown',
 		avatarUrl: 'https://github.com/misskey-dev/misskey/blob/master/packages/frontend/assets/about-icon.png?raw=true',
 		avatarBlurhash: 'eQFRshof5NWBRi},juayfPju53WB?0ofs;s*a{ofjuay^SoMEJR%ay',