Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix remote follow (#2606)

Browse source
This commit is contained in:
MeiMei 2018-09-04 18:33:16 +09:00 • committed by syuilo
parent a0735b0e7a
commit eaec936fa6
8 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/services/following/create.ts
View file

@ -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);