Fix following from Preroma does not complete (#2905)

* In Follow Accept/Reject, send previous received id

* In Follow Accept/Reject, send Activity.actor

3 files changed, 21 insertions, 7 deletions

diff --git a/src/remote/activitypub/renderer/accept.ts b/src/remote/activitypub/renderer/accept.ts
index 76326285fd..fdbdff3f12 100644
--- a/src/remote/activitypub/renderer/accept.ts
+++ b/src/remote/activitypub/renderer/accept.ts
@@ -1,4 +1,8 @@
-export default (object: any) => ({
+import config from '../../../config';
+import { ILocalUser } from '../../../models/user';
+
+export default (object: any, user: ILocalUser) => ({
 	type: 'Accept',
+	actor: `${config.url}/users/${user._id}`,
 	object
 });
diff --git a/src/remote/activitypub/renderer/follow.ts b/src/remote/activitypub/renderer/follow.ts
index 522422bcff..98d4cdd020 100644
--- a/src/remote/activitypub/renderer/follow.ts
+++ b/src/remote/activitypub/renderer/follow.ts
@@ -1,8 +1,14 @@
 import config from '../../../config';
 import { IUser, isLocalUser } from '../../../models/user';
 
-export default (follower: IUser, followee: IUser) => ({
-	type: 'Follow',
-	actor: isLocalUser(follower) ? `${config.url}/users/${follower._id}` : follower.uri,
-	object: isLocalUser(followee) ? `${config.url}/users/${followee._id}` : followee.uri
-});
+export default (follower: IUser, followee: IUser, requestId?: string) => {
+	const follow = {
+		type: 'Follow',
+		actor: isLocalUser(follower) ? `${config.url}/users/${follower._id}` : follower.uri,
+		object: isLocalUser(followee) ? `${config.url}/users/${followee._id}` : followee.uri
+	} as any;
+
+	if (requestId) follow.id = requestId;
+
+	return follow;
+};
diff --git a/src/remote/activitypub/renderer/reject.ts b/src/remote/activitypub/renderer/reject.ts
index 2464486c2f..6d7d23708a 100644
--- a/src/remote/activitypub/renderer/reject.ts
+++ b/src/remote/activitypub/renderer/reject.ts
@@ -1,4 +1,8 @@
-export default (object: any) => ({
+import config from '../../../config';
+import { ILocalUser } from '../../../models/user';
+
+export default (object: any, user: ILocalUser) => ({
 	type: 'Reject',
+	actor: `${config.url}/users/${user._id}`,
 	object
 });