diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2018-09-04 18:33:16 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-09-04 18:33:16 +0900 |
| commit | eaec936fa6a53d0fd1004a613ea09f482198f366 (patch) | |
| tree | ce7f4b15378eeb4dc3f8b4f17de5f86355cb118e /src/services/following/create.ts | |
| parent | fix(package): update webpack to version 4.17.2 (#2599) (diff) | |
| download | sharkey-eaec936fa6a53d0fd1004a613ea09f482198f366.tar.gz sharkey-eaec936fa6a53d0fd1004a613ea09f482198f366.tar.bz2 sharkey-eaec936fa6a53d0fd1004a613ea09f482198f366.zip | |
Fix remote follow (#2606)
Diffstat (limited to 'src/services/following/create.ts')
| -rw-r--r-- | src/services/following/create.ts | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/services/following/create.ts b/src/services/following/create.ts index bd39b8e183..dd2fa544dc 100644 --- a/src/services/following/create.ts +++ b/src/services/following/create.ts @@ -11,7 +11,7 @@ import { deliver } from '../../queue'; import createFollowRequest from './requests/create'; export default async function(follower: IUser, followee: IUser) { - if (followee.isLocked) { + if (followee.isLocked || isLocalUser(follower) && isRemoteUser(followee)) { await createFollowRequest(follower, followee); } else { const following = await Following.insert({ @@ -72,11 +72,6 @@ export default async function(follower: IUser, followee: IUser) { notify(followee._id, follower._id, 'follow'); } - if (isLocalUser(follower) && isRemoteUser(followee)) { - const content = pack(renderFollow(follower, followee)); - deliver(follower, content, followee.inbox); - } - if (isRemoteUser(follower) && isLocalUser(followee)) { const content = pack(renderAccept(renderFollow(follower, followee))); deliver(followee, content, follower.inbox); |