profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make HTTP request first in unfollow job

Browse source
This commit is contained in:
Akihiko Odaki 2018-04-04 22:05:12 +09:00
parent 1b6bae72c2
commit 86b1345c17
1 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/processor/http/unfollow.ts
View file

@ -1,56 +1,63 @@
import FollowedLog from '../../models/followed-log'; import FollowedLog from '../../models/followed-log';
import Following from '../../models/following'; import Following from '../../models/following';
import FollowingLog from '../../models/following-log'; import FollowingLog from '../../models/following-log';
import User, { isRemoteUser, pack as packUser } from '../../models/user'; import User, { isLocalUser, isRemoteUser, pack as packUser } from '../../models/user';
import stream from '../../publishers/stream'; import stream from '../../publishers/stream';
import renderFollow from '../../remote/activitypub/renderer/follow'; import renderFollow from '../../remote/activitypub/renderer/follow';
import renderUndo from '../../remote/activitypub/renderer/undo'; import renderUndo from '../../remote/activitypub/renderer/undo';
import context from '../../remote/activitypub/renderer/context'; import context from '../../remote/activitypub/renderer/context';
import request from '../../remote/request'; import request from '../../remote/request';
import Logger from '../../utils/logger';
export default async ({ data }) => { export default async ({ data }) => {
// Delete following const following = await Following.findOne({ _id: data.id });
const following = await Following.findOneAndDelete({ _id: data.id });
if (following === null) { if (following === null) {
return; return;
} }
const promisedFollower = User.findOne({ _id: following.followerId }); const [follower, followee] = await Promise.all([
const promisedFollowee = User.findOne({ _id: following.followeeId }); User.findOne({ _id: following.followerId }),
User.findOne({ _id: following.followeeId })
]);
await Promise.all([ if (isLocalUser(follower) && isRemoteUser(followee)) {
// Decrement following count const undo = renderUndo(renderFollow(follower, followee));
User.update({ _id: following.followerId }, { $inc: { followingCount: -1 } }), undo['@context'] = context;
promisedFollower.then(({ followingCount }) => FollowingLog.insert({
createdAt: new Date(),
userId: following.followerId,
count: followingCount - 1
})),
// Decrement followers count await request(follower, followee.account.inbox, undo);
User.update({ _id: following.followeeId }, { $inc: { followersCount: -1 } }), }
promisedFollowee.then(({ followersCount }) => FollowedLog.insert({
createdAt: new Date(), try {
userId: following.followeeId, await Promise.all([
count: followersCount - 1 // Delete following
})), Following.findOneAndDelete({ _id: data.id }),
// Decrement following count
User.update({ _id: follower._id }, { $inc: { followingCount: -1 } }),
FollowingLog.insert({
createdAt: new Date(),
userId: follower._id,
count: follower.followingCount - 1
}),
// Decrement followers count
User.update({ _id: followee._id }, { $inc: { followersCount: -1 } }),
FollowedLog.insert({
createdAt: new Date(),
userId: followee._id,
count: followee.followersCount - 1
})
]);
if (isLocalUser(follower)) {
return;
}
const promisedPackedUser = packUser(followee, follower);
// Publish follow event // Publish follow event
Promise.all([promisedFollower, promisedFollowee]).then(async ([follower, followee]) => { stream(follower._id, 'unfollow', promisedPackedUser);
if (isRemoteUser(follower)) { } catch (error) {
return; Logger.error(error.toString());
} }
const promisedPackedUser = packUser(followee, follower);
if (isRemoteUser(followee)) {
const undo = renderUndo(renderFollow(follower, followee));
undo['@context'] = context;
await request(follower, followee.account.inbox, undo);
}
stream(follower._id, 'unfollow', promisedPackedUser);
})
]);
}; };