upd: handle email signups properly with approval enabled

packages/backend/src/server/api/SignupApiService.ts

@@ -277,10 +277,14 @@ export class SignupApiService {
 					pendingUserId: null,
 				});
 			}
-			
+
 			if (instance.approvalRequiredForSignup) {
-				reply.code(204);
+				if (pendingUser.email) {
-				return;
+					this.emailService.sendEmail(pendingUser.email, 'Approval pending',
+						'Congratulations! Your account is now pending approval. You will get notified when you have been accepted.',
+						'Congratulations! Your account is now pending approval. You will get notified when you have been accepted.');
+				}
+				return { pendingApproval: true };
 			}
 
 			return this.signinService.signin(request, reply, account as MiLocalUser);

packages/frontend/src/pages/admin-user.vue

@@ -182,7 +182,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div v-else-if="tab === 'approval'" class="_gaps_m">
 				<MkKeyValue oneline>
 					<template #key>{{ i18n.ts.approvalStatus }}</template>
-					<template #value><span class="_monospace">{{ approved ? {{ i18n.ts.approved }} : {{ i18n.ts.notApproved }} }}</span></template>
+					<template #value><span class="_monospace">{{ approved ? i18n.ts.approved : i18n.ts.notApproved }}</span></template>
 				</MkKeyValue>
 
 				<MkTextarea v-model="signupReason" readonly>

packages/frontend/src/pages/signup-complete.vue

@@ -45,6 +45,13 @@ function submit() {
 	os.api('signup-pending', {
 		code: props.code,
 	}).then(res => {
+		if (res.pendingApproval) {
+			return os.alert({
+				type: 'success',
+				title: i18n.ts._signup.almostThere,
+				text: i18n.ts._signup.approvalPending,
+			});
+		}
 		return login(res.i, '/');
 	}).catch(() => {
 		submitting = false;