Merge pull request #527 from nextcloud/bugfix/noid/follow-process

small bugfixes during the follow process

lib/Db/FollowsRequest.php

@@ -61,7 +61,8 @@ class FollowsRequest extends FollowsRequestBuilder {
 		   ->setValue('actor_id', $qb->createNamedParameter($follow->getActorId()))
 		   ->setValue('type', $qb->createNamedParameter($follow->getType()))
 		   ->setValue('object_id', $qb->createNamedParameter($follow->getObjectId()))
-		   ->setValue('follow_id', $qb->createNamedParameter($follow->getFollowId()));
+		   ->setValue('follow_id', $qb->createNamedParameter($follow->getFollowId()))
+		   ->setValue('accepted', $qb->createNamedParameter(($follow->isAccepted()) ? '1' : '0'));
 
 		try {
 			$qb->setValue(
@@ -98,7 +99,7 @@ class FollowsRequest extends FollowsRequestBuilder {
 	 * @return Follow
 	 * @throws FollowDoesNotExistException
 	 */
-	public function getByPersons(string $actorId, string $remoteActorId) {
+	public function getByPersons(string $actorId, string $remoteActorId): Follow {
 		$qb = $this->getFollowsSelectSql();
 		$this->limitToActorId($qb, $actorId);
 		$this->limitToObjectId($qb, $remoteActorId);

lib/Model/ActivityPub/Object/Follow.php

@@ -129,7 +129,7 @@ class Follow extends ACore implements JsonSerializable {
 		$result = parent::jsonSerialize();
 
 		if ($this->isCompleteDetails()) {
-			array_merge(
+			$result = array_merge(
 				$result,
 				[
 					'follow_id' => $this->getFollowId(),

lib/Model/ActivityPub/Stream.php

@@ -48,7 +48,7 @@ class Stream extends ACore implements JsonSerializable {
 
 
 	/** @var string */
-	private $activityId;
+	private $activityId = '';
 
 	/** @var string */
 	private $content = '';

lib/Service/FollowService.php

@@ -149,8 +149,6 @@ class FollowService {
 			$this->followsRequest->getByPersons($actor->getId(), $remoteActor->getId());
 		} catch (FollowDoesNotExistException $e) {
 			$this->followsRequest->save($follow);
-			// TODO - Remove this auto-accepted.
-			$this->followsRequest->accepted($follow);
 
 			$follow->addInstancePath(
 				new InstancePath(