Merge branch 'feat-signup-approval' of https://github.com/kokonect-link/cherrypick into develop

Author: noridev

CHANGELOG_CHERRYPICK.md

@@ -6,6 +6,12 @@
 **기반 Misskey 버전**: 2025.12.0 
 Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2025120](CHANGELOG.md#2025120) 문서를 참고하십시오.
 
+### General
+- Feat: 가입 승인 (TransFem-org/Sharkey [@2f2d88dc](https://activitypub.software/TransFem-org/Sharkey/-/commit/2f2d88dcfc76bac6815d60fa9915b8e797853292#), [@32fc540d](https://activitypub.software/TransFem-org/Sharkey/-/commit/32fc540df4a77076e3365e5471e13ea45a04c508), [@07b72c65](https://activitypub.software/TransFem-org/Sharkey/-/commit/07b72c65b93bff5f13afe28252f4aebf8adac471), [@e1f13f64](https://activitypub.software/TransFem-org/Sharkey/-/commit/e1f13f641e3e0528571e41475cda1718cac4c532), [@288fa114](https://activitypub.software/TransFem-org/Sharkey/-/commit/288fa1143d3a2c8a92a84ee1c4ea7661e0554c4c), [@6e2eabbb](https://activitypub.software/TransFem-org/Sharkey/-/commit/6e2eabbbc9ad02e6e90caa27ce7e1ccb0b8208f6), [@c3f76818](https://activitypub.software/TransFem-org/Sharkey/-/commit/c3f768181ae232a9ac03c69759f5508398b4cd55), [@142f500f](https://activitypub.software/TransFem-org/Sharkey/-/commit/142f500f4bbf3208380b83a4c7764bfe411950ab), [@1d9cb4fa](https://activitypub.software/TransFem-org/Sharkey/-/commit/1d9cb4fad9e825c3389e73f50fa396338b159b5c), [@42530b5a](https://activitypub.software/TransFem-org/Sharkey/-/commit/42530b5a39f0bce386bf408004d1584bf7a36576), [@fea7889e](https://activitypub.software/TransFem-org/Sharkey/-/commit/fea7889e0cd5ed223a4db9cb668be684cead2a52))
+  - 초대 코드를 공유하지 않고도 가입 사유를 확인해 원하는 유저만 가입을 승인할 수 있습니다.
+  - 가입을 승인하면 해당 유저에게 가입이 승인되었음을 알리는 이메일이 전송됩니다.
+  - 가입 사유는 관리자 및 모더레이터 권한이 있는 유저만 확인할 수 있습니다.
+
 ### Client
 - Fix: 답글란의 입력란에서 `입력란 도움말 표시`가 작동하지 않을 수 있음
 - Fix: 화면 크기가 작은 디바이스에서 답글란의 입력란 디자인이 잘못된 디자인으로 표시될 수 있음

locales/en-US.yml

@@ -1,5 +1,17 @@
 ---
 _lang_: "English"
+approveConfirm: "Are you sure that you want to approve this account?"
+approvalRequiredForSignup: "Require approval for new users"
+approveAccount: "Approve"
+denyAccount: "Deny & Delete"
+approved: "Approved"
+notApproved: "Not Approved"
+approvalStatus: "Approval Status"
+approvalRequiredToRegister: "This instance is only accepting users who specify a reason for registration."
+pendingUserApprovals: "There are users awaiting approval."
+approvals: "Sign-up approvals"
+deleteThisAccountConfirm: "This will irreversibly delete this account. Proceed?"
+signupReason: "Sign-up reason"
 compareContent: "Compare content"
 editHistory: "Edit history"
 unRenoteAll: "Remove all renote from notes"
@@ -2445,6 +2457,8 @@ _signup:
   almostThere: "Almost there"
   emailAddressInfo: "Please enter your email address. It will not be made public."
   emailSent: "A confirmation email has been sent to your email address ({email}). Please click the included link to complete account creation.\nIf you do not receive an email, please check your spam folder."
+  approvalPending: "Your account has been created and is awaiting approval."
+  reasonInfo: "Please enter a reason as to why you want to join the instance."
 _accountDelete:
   accountDelete: "Delete account"
   mayTakeTime: "As account deletion is a resource-heavy process, it may take some time to complete depending on how much content you have created and how many files you have uploaded."
@@ -2867,6 +2881,8 @@ _permissions:
   "write:report-abuse": "Report violation"
   "write:chat": "Compose or delete chat messages"
   "read:chat": "Browse Chat"
+  "write:admin:approve-user": "Approve new users"
+  "write:admin:decline-user": "Decline new users"
 _auth:
   shareAccessTitle: "Granting application permissions"
   shareAccess: "Would you like to authorize \"{name}\" to access this account?"
@@ -3328,6 +3344,8 @@ _moderationLogTypes:
   deleteGalleryPost: "Gallery post deleted"
   deleteChatRoom: "Deleted Chat Room"
   updateProxyAccountDescription: "Update the description of the proxy account"
+  approve: "Approved"
+  decline: "Declined"
 _fileViewer:
   title: "File details"
   type: "File type"

locales/ja-JP.yml

@@ -1,5 +1,17 @@
 _lang_: "日本語"
 
+approveConfirm: "このアカウントを承認してもよろしいですか？"
+approvalRequiredForSignup: "新規ユーザーの承認が必要"
+approveAccount: "承認する"
+denyAccount: "拒否と削除"
+approved: "承認済み"
+notApproved: "承認されていない"
+approvalStatus: "承認状況"
+approvalRequiredToRegister: "このインスタンスは、登録理由を指定したユーザーのみを受け入れています。"
+pendingUserApprovals: "承認待ちのユーザーがいる。"
+approvals: "登録承認"
+deleteThisAccountConfirm: "このアカウントは永久に削除されます。続けましょうか？"
+signupReason: "登録理由"
 compareContent: "内容比較"
 editHistory: "修正履歴"
 unRenoteAll: "全リノート解除"
@@ -2484,6 +2496,8 @@ _signup:
   almostThere: "ほとんど完了です"
   emailAddressInfo: "あなたが使っているメールアドレスを入力してください。メールアドレスが公開されることはありません。"
   emailSent: "入力されたメールアドレス({email})宛に確認のメールが送信されました。メールに記載されたリンクにアクセスすると、アカウントの作成が完了します。\nもしメールが来なかったらスパムメールボックスを確認してください。\nメールに記載されているリンクの有効期限は30分です。"
+  approvalPending: "アカウントが作成され、承認待ちの状態です。"
+  reasonInfo: "インスタンスに参加したい理由を入力してください。"
 
 _accountDelete:
   accountDelete: "アカウントの削除"
@@ -2932,6 +2946,8 @@ _permissions:
   "write:report-abuse": "違反を報告する"
   "write:chat": "ダイレクトメッセージを操作する"
   "read:chat": "ダイレクトメッセージを閲覧する"
+  "write:admin:approve-user": "新規ユーザー登録承認"
+  "write:admin:decline-user": "新規ユーザー登録拒否"
 
 _auth:
   shareAccessTitle: "アプリへのアクセス許可"
@@ -3430,6 +3446,8 @@ _moderationLogTypes:
   deleteGalleryPost: "ギャラリーの投稿を削除"
   deleteChatRoom: "ダイレクトメッセージのグループを削除"
   updateProxyAccountDescription: "プロキシアカウントの説明を更新"
+  approve: "承認済み"
+  decline: "拒否"
 
 _fileViewer:
   title: "ファイルの詳細"

locales/ko-KR.yml

@@ -1,5 +1,17 @@
 ---
 _lang_: "한국어"
+approveConfirm: "이 계정을 승인할까요?"
+approvalRequiredForSignup: "가입 시 승인 필요"
+approveAccount: "승인"
+denyAccount: "거부 및 삭제"
+approved: "승인됨"
+notApproved: "승인되지 않음"
+approvalStatus: "승인 상태"
+approvalRequiredToRegister: "이 서버는 가입 목적을 작성한 사용자만 승인하고 있어요."
+pendingUserApprovals: "승인 대기 중인 사용자가 있어요."
+approvals: "가입 승인"
+deleteThisAccountConfirm: "이 계정은 영구적으로 삭제돼요. 계속할까요?"
+signupReason: "가입하려는 목적"
 compareContent: "내용 비교하기"
 editHistory: "편집 기록"
 unRenoteAll: "모든 리노트 삭제"
@@ -2447,6 +2459,8 @@ _signup:
   almostThere: "거의 다 끝났어요!"
   emailAddressInfo: "사용할 메일 주소를 입력해 주세요. 이메일 주소는 다른 사용자에게 공개되지 않아요."
   emailSent: "입력한 메일 주소({email})로 확인 메일을 보내드렸어요! 가입을 완료하려면 보내드린 메일에 있는 링크로 접속해 주세요.\n만약 메일이 오지 않는다면 스팸 메일함을 확인해 주세요!"
+  approvalPending: "계정이 생성되어 승인 대기 중이에요."
+  reasonInfo: "이 서버에 가입하려는 목적을 입력해 주세요."
 _accountDelete:
   accountDelete: "계정 삭제"
   mayTakeTime: "계정 삭제는 서버에 부하를 가하기 때문에, 작성한 콘텐츠나 업로드한 파일의 수가 많으면 완료까지 시간이 걸릴 수 있어요."
@@ -2869,6 +2883,8 @@ _permissions:
   "write:report-abuse": "위반 내용 신고하기"
   "write:chat": "대화를 시작하거나 쪽지 보내기"
   "read:chat": "쪽지 읽기"
+  "write:admin:approve-user": "신규 사용자 가입 승인"
+  "write:admin:decline-user": "신규 사용자 가입 거부"
 _auth:
   shareAccessTitle: "애플리케이션 접근 허가"
   shareAccess: "‘{name}’에서 계정에 접근하는 것을 허용할까요?"
@@ -3330,6 +3346,8 @@ _moderationLogTypes:
   deleteGalleryPost: "갤러리 게시물 삭제"
   deleteChatRoom: "그룹 삭제"
   updateProxyAccountDescription: "프록시 계정 설명 업데이트"
+  approve: "승인됨"
+  decline: "거부됨"
 _fileViewer:
   title: "파일 상세"
   type: "파일 유형"

packages/backend/migration/1768893580518-approvalSignup.js

@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: noridev and cherrypick-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class ApprovalSignup1768893580518 {
+    name = 'ApprovalSignup1768893580518'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "approvalRequiredForSignup" boolean DEFAULT false NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "user" ADD "approved" boolean DEFAULT false NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "user" ADD "signupReason" character varying(1000) NULL`);
+        await queryRunner.query(`ALTER TABLE "user_pending" ADD "reason" character varying(1000) NULL`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "approvalRequiredForSignup"`);
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "approved"`);
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "signupReason"`);
+        await queryRunner.query(`ALTER TABLE "user_pending" DROP COLUMN "reason"`);
+    }
+}

packages/backend/src/core/SignupService.ts

@@ -56,9 +56,11 @@ export class SignupService {
 		passwordHash?: MiUserProfile['password'] | null;
 		host?: string | null;
 		ignorePreservedUsernames?: boolean;
+		reason?: string | null;
 	}) {
-		const { username, password, passwordHash, host } = opts;
+		const { username, password, passwordHash, host, reason } = opts;
 		let hash = passwordHash;
+		const instance = await this.metaService.fetch(true);
 
 		// Validate username
 		if (!this.userEntityService.validateLocalUsername(username)) {
@@ -119,6 +121,9 @@ export class SignupService {
 			));
 
 		let account!: MiUser;
+		let defaultApproval = false;
+
+		if (!instance.approvalRequiredForSignup) defaultApproval = true;
 
 		// Start transaction
 		await this.db.transaction(async transactionalEntityManager => {
@@ -135,6 +140,8 @@ export class SignupService {
 				usernameLower: username.toLowerCase(),
 				host: this.utilityService.toPunyNullable(host),
 				token: secret,
+				approved: defaultApproval,
+				signupReason: reason,
 			}));
 
 			await transactionalEntityManager.save(new MiUserKeypair({

packages/backend/src/core/entities/MetaEntityService.ts

@@ -142,6 +142,7 @@ export class MetaEntityService {
 			noteSearchableScope: (this.config.meilisearch == null || this.config.meilisearch.scope !== 'local') ? 'global' : 'local',
 			maxFileSize: this.config.maxFileSize,
 			federation: this.meta.federation,
+			approvalRequiredForSignup: instance.approvalRequiredForSignup,
 		};
 
 		return packed;

packages/backend/src/core/entities/UserEntityService.ts

@@ -533,6 +533,7 @@ export class UserEntityService implements OnModuleInit {
 			) : undefined,
 			setFederationAvatarShape: user.setFederationAvatarShape ?? undefined,
 			isSquareAvatars: user.isSquareAvatars ?? undefined,
+			approved: user.approved,
 
 			...(isDetailed ? {
 				url: profile!.url,
@@ -645,6 +646,7 @@ export class UserEntityService implements OnModuleInit {
 						},
 					})
 					: [],
+				signupReason: user.signupReason,
 			} : {}),
 
 			...(relation ? {

packages/backend/src/models/Meta.ts

@@ -920,6 +920,11 @@ export class MiMeta {
 		length: 2048, nullable: true,
 	})
 	public customRobotsTxt: string | null;
+
+	@Column('boolean', {
+		default: false,
+	})
+	public approvalRequiredForSignup: boolean;
 }
 
 export type SoftwareSuspension = {

packages/backend/src/models/User.ts

@@ -314,6 +314,16 @@ export class MiUser {
 	})
 	public canChat: boolean | null;
 
+	@Column('boolean', {
+		default: false,
+	})
+	public approved: boolean;
+
+	@Column('varchar', {
+		length: 1000, nullable: true,
+	})
+	public signupReason: string | null;
+
 	constructor(data: Partial<MiUser>) {
 		if (data == null) return;