Merge pull request #1377 from akihikodaki/misc

src/remote/activitypub/act/follow.ts

@@ -4,11 +4,13 @@ import Following from '../../../models/following';
 import User from '../../../models/user';
 import config from '../../../config';
 import queue from '../../../queue';
+import context from '../renderer/context';
+import renderAccept from '../renderer/accept';
+import request from '../../request';
 
 export default async (actor, activity) => {
 	const prefix = config.url + '/@';
 	const id = activity.object.id || activity.object;
-	let following;
 
 	if (!id.startsWith(prefix)) {
 		return null;
@@ -24,28 +26,33 @@ export default async (actor, activity) => {
 		throw new Error();
 	}
 
-	try {
+	const accept = renderAccept(activity);
-		following = await Following.insert({
+	accept['@context'] = context;
+
+	await Promise.all([
+		request(followee, actor.account.inbox, accept),
+
+		Following.insert({
 			createdAt: new Date(),
 			followerId: actor._id,
 			followeeId: followee._id
-		});
+		}).then(following => new Promise((resolve, reject) => {
-	} catch (exception) {
+			queue.create('http', { type: 'follow', following: following._id }).save(error => {
-		// duplicate key error
+				if (error) {
-		if (exception instanceof MongoError && exception.code === 11000) {
+					reject(error);
-			return null;
+				} else {
-		}
+					resolve();
-
+				}
-		throw exception;
+			});
-	}
+		}), error => {
-
+			// duplicate key error
-	await new Promise((resolve, reject) => {
+			if (error instanceof MongoError && error.code === 11000) {
-		queue.create('http', { type: 'follow', following: following._id }).save(error => {
+				return;
-			if (error) {
-				reject(error);
-			} else {
-				resolve(null);
 			}
-		});
+
-	});
+			throw error;
+		})
+	]);
+
+	return null;
 };

src/remote/activitypub/renderer/accept.ts

@@ -0,0 +1,4 @@
+export default object => ({
+	type: 'Accept',
+	object
+});