Merge branch 'develop' into swn

src/server/api/endpoints/i/delete-account.ts

@@ -1,9 +1,10 @@
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
 import define from '../../define';
-import { Users, UserProfiles } from '@/models/index';
+import { UserProfiles, Users } from '@/models/index';
 import { doPostSuspend } from '@/services/suspend-user';
 import { publishUserEvent } from '@/services/stream';
+import { createDeleteAccountJob } from '@/queue';
 
 export const meta = {
 	requireCredential: true as const,
@@ -19,6 +20,10 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	const profile = await UserProfiles.findOneOrFail(user.id);
+	const userDetailed = await Users.findOneOrFail(user.id);
+	if (userDetailed.isDeleted) {
+		return;
+	}
 
 	// Compare password
 	const same = await bcrypt.compare(ps.password, profile.password!);
@@ -30,7 +35,11 @@ export default define(meta, async (ps, user) => {
 	// 物理削除する前にDelete activityを送信する
 	await doPostSuspend(user).catch(e => {});
 
-	await Users.delete(user.id);
+	createDeleteAccountJob(user);
+
+	await Users.update(user.id, {
+		isDeleted: true,
+	});
 
 	// Terminate streaming
 	publishUserEvent(user.id, 'terminate', {});

src/server/api/endpoints/sw/unregister.ts

@@ -7,11 +7,6 @@ export const meta = {
 
 	requireCredential: true as const,
 
-	desc: {
-		'ja-JP': 'Push通知の登録を削除します。',
-		'en-US': 'Remove push noticfication registration'
-	},
-
 	params: {
 		endpoint: {
 			validator: $.str