This commit is contained in:
こぴなたみぽ 2018-04-12 07:13:15 +09:00
parent a5ab80bf02
commit a015524cb5
2 changed files with 34 additions and 1 deletions

View file

@ -11,3 +11,30 @@ export type IFollowing = {
followeeId: mongo.ObjectID; followeeId: mongo.ObjectID;
followerId: mongo.ObjectID; followerId: mongo.ObjectID;
}; };
/**
* Followingを物理削除します
*/
export async function deleteFollowing(following: string | mongo.ObjectID | IFollowing) {
let f: IFollowing;
// Populate
if (mongo.ObjectID.prototype.isPrototypeOf(following)) {
f = await Following.findOne({
_id: following
});
} else if (typeof following === 'string') {
f = await Following.findOne({
_id: new mongo.ObjectID(following)
});
} else {
f = following as IFollowing;
}
if (f == null) return;
// このFollowingを削除
await Following.remove({
_id: f._id
});
}

View file

@ -3,7 +3,7 @@ import deepcopy = require('deepcopy');
import rap from '@prezzemolo/rap'; import rap from '@prezzemolo/rap';
import db from '../db/mongodb'; import db from '../db/mongodb';
import Note, { INote, pack as packNote, deleteNote } from './note'; import Note, { INote, pack as packNote, deleteNote } from './note';
import Following from './following'; import Following, { deleteFollowing } from './following';
import Mute, { deleteMute } from './mute'; import Mute, { deleteMute } from './mute';
import getFriends from '../server/api/common/get-friends'; import getFriends from '../server/api/common/get-friends';
import config from '../config'; import config from '../config';
@ -212,8 +212,14 @@ export async function deleteUser(user: string | mongo.ObjectID | IUser) {
).map(x => deleteMute(x))); ).map(x => deleteMute(x)));
// このユーザーのFollowingをすべて削除 // このユーザーのFollowingをすべて削除
await Promise.all((
await Following.find({ followerId: u._id })
).map(x => deleteFollowing(x)));
// このユーザーへのFollowingをすべて削除 // このユーザーへのFollowingをすべて削除
await Promise.all((
await Following.find({ followeeId: u._id })
).map(x => deleteFollowing(x)));
// このユーザーのFollowingLogをすべて削除 // このユーザーのFollowingLogをすべて削除