misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Refactor

Browse source
This commit is contained in:
syuilo 2018-04-13 14:39:08 +09:00
parent cdf13d30f2
commit 17f4dd69a3
7 changed files with 21 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ import FollowingLog from '../../models/following-log';
import FollowedLog from '../../models/followed-log';
import event from '../../publishers/stream';
import notify from '../../publishers/notify';
import context from '../../remote/activitypub/renderer/context';
import pack from '../../remote/activitypub/renderer';
import renderFollow from '../../remote/activitypub/renderer/follow';
import renderAccept from '../../remote/activitypub/renderer/accept';
import { deliver } from '../../queue';
@ -57,16 +57,12 @@ export default async function(follower: IUser, followee: IUser, activity?) {
}
if (isLocalUser(follower) && isRemoteUser(followee)) {
const content = renderFollow(follower, followee);
content['@context'] = context;
const content = pack(renderFollow(follower, followee));
deliver(follower, content, followee.inbox).save();
}
if (isRemoteUser(follower) && isLocalUser(followee)) {
const content = renderAccept(activity);
content['@context'] = context;
const content = pack(renderAccept(activity));
deliver(followee, content, follower.inbox).save();
}
}

6
src/services/following/delete.ts
View file

@ -3,7 +3,7 @@ import Following from '../../models/following';
import FollowingLog from '../../models/following-log';
import FollowedLog from '../../models/followed-log';
import event from '../../publishers/stream';
import context from '../../remote/activitypub/renderer/context';
import pack from '../../remote/activitypub/renderer';
import renderFollow from '../../remote/activitypub/renderer/follow';
import renderUndo from '../../remote/activitypub/renderer/undo';
import { deliver } from '../../queue';
@ -56,9 +56,7 @@ export default async function(follower: IUser, followee: IUser, activity?) {
}
if (isLocalUser(follower) && isRemoteUser(followee)) {
const content = renderUndo(renderFollow(follower, followee));
content['@context'] = context;
const content = pack(renderUndo(renderFollow(follower, followee)));
deliver(follower, content, followee.inbox).save();
}
}