diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-02-20 06:44:40 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-02-20 06:44:40 +0900 |
| commit | d51cafca742920c66b048b88fec99e85ad4a3292 (patch) | |
| tree | 17df9751bc5c2dc05190d5e4dbb220fe12999000 /src/services | |
| parent | :art: (diff) | |
| download | sharkey-d51cafca742920c66b048b88fec99e85ad4a3292.tar.gz sharkey-d51cafca742920c66b048b88fec99e85ad4a3292.tar.bz2 sharkey-d51cafca742920c66b048b88fec99e85ad4a3292.zip | |
Fix #4326
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/following/requests/accept.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/services/following/requests/accept.ts b/src/services/following/requests/accept.ts index ecfe891f4d..284c6d5e19 100644 --- a/src/services/following/requests/accept.ts +++ b/src/services/following/requests/accept.ts @@ -8,14 +8,14 @@ import { publishMainStream } from '../../stream'; import { insertFollowingDoc } from '../create'; export default async function(followee: IUser, follower: IUser) { - await insertFollowingDoc(followee, follower); + const request = await FollowRequest.findOne({ + followeeId: followee._id, + followerId: follower._id + }); - if (isRemoteUser(follower)) { - const request = await FollowRequest.findOne({ - followeeId: followee._id, - followerId: follower._id - }); + await insertFollowingDoc(followee, follower); + if (isRemoteUser(follower) && request) { const content = renderActivity(renderAccept(renderFollow(follower, followee, request.requestId), followee as ILocalUser)); deliver(followee as ILocalUser, content, follower.inbox); } |