Fix follow duplicate (#3548)

* フォローとリクエスト両方存在しても解除する

* 既にフォローしてても承認できるように
This commit is contained in:
MeiMei
2018-12-08 18:55:00 +09:00
committed by syuilo
parent 28482627f7
commit 1d8fb65959
2 changed files with 21 additions and 4 deletions

View File

@@ -5,6 +5,7 @@ import unfollow from '../../../../services/following/delete';
import cancelRequest from '../../../../services/following/requests/cancel';
import { IFollow } from '../../type';
import FollowRequest from '../../../../models/follow-request';
import Following from '../../../../models/following';
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
@@ -30,9 +31,16 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
followeeId: followee._id
});
const following = await Following.findOne({
followerId: actor._id,
followeeId: followee._id
});
if (req) {
await cancelRequest(followee, actor);
} else {
}
if (following) {
await unfollow(actor, followee);
}
};