diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-02-11 23:37:15 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-02-11 23:37:15 +0900 |
| commit | d82c5dff7191faac73da8bd8106e0245dae73df8 (patch) | |
| tree | 6d07bb045d827f8953af9503045b808e1a8c1000 | |
| parent | New translations ja-JP.yml (English) (#4221) (diff) | |
| download | sharkey-d82c5dff7191faac73da8bd8106e0245dae73df8.tar.gz sharkey-d82c5dff7191faac73da8bd8106e0245dae73df8.tar.bz2 sharkey-d82c5dff7191faac73da8bd8106e0245dae73df8.zip | |
Fix bug
| -rw-r--r-- | src/services/following/create.ts | 10 | ||||
| -rw-r--r-- | src/services/following/requests/accept.ts | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/services/following/create.ts b/src/services/following/create.ts index e6c95a72a4..a050f40b0e 100644 --- a/src/services/following/create.ts +++ b/src/services/following/create.ts @@ -46,11 +46,19 @@ export async function insertFollowingDoc(followee: IUser, follower: IUser) { } }); - await FollowRequest.remove({ + const removed = await FollowRequest.remove({ followeeId: followee._id, followerId: follower._id }); + if (removed.deletedCount === 1) { + await User.update({ _id: followee._id }, { + $inc: { + pendingReceivedFollowRequestsCount: -1 + } + }); + } + if (alreadyFollowed) return; //#region Increment counts diff --git a/src/services/following/requests/accept.ts b/src/services/following/requests/accept.ts index 81ecc74ab7..dec30911a5 100644 --- a/src/services/following/requests/accept.ts +++ b/src/services/following/requests/accept.ts @@ -20,12 +20,6 @@ export default async function(followee: IUser, follower: IUser) { deliver(followee as ILocalUser, content, follower.inbox); } - await User.update({ _id: followee._id }, { - $inc: { - pendingReceivedFollowRequestsCount: -1 - } - }); - packUser(followee, followee, { detail: true }).then(packed => publishMainStream(followee._id, 'meUpdated', packed)); |