Merge pull request #196 from nextcloud/useless-value-while-communicate

Some data are only for internal use.

lib/Model/ActivityPub/Activity/Accept.php

@@ -71,11 +71,7 @@ class Accept extends ACore implements JsonSerializable {
 	 * @return array
 	 */
 	public function jsonSerialize(): array {
-		return array_merge(
+		return parent::jsonSerialize();
-			parent::jsonSerialize(),
-			[
-			]
-		);
 	}
 
 }

lib/Model/ActivityPub/Activity/Create.php

@@ -71,11 +71,7 @@ class Create extends ACore implements JsonSerializable {
 	 * @return array
 	 */
 	public function jsonSerialize(): array {
-		return array_merge(
+		return parent::jsonSerialize();
-			parent::jsonSerialize(),
-			[
-			]
-		);
 	}
 
 }

lib/Model/ActivityPub/Activity/Delete.php

@@ -71,11 +71,7 @@ class Delete extends ACore implements JsonSerializable {
 	 * @return array
 	 */
 	public function jsonSerialize(): array {
-		return array_merge(
+		return parent::jsonSerialize();
-			parent::jsonSerialize(),
-			[
-			]
-		);
 	}
 
 }

lib/Model/ActivityPub/Activity/Reject.php

@@ -71,11 +71,7 @@ class Reject extends ACore implements JsonSerializable {
 	 * @return array
 	 */
 	public function jsonSerialize(): array {
-		return array_merge(
+		return parent::jsonSerialize();
-			parent::jsonSerialize(),
-			[
-			]
-		);
 	}
 
 }

lib/Model/ActivityPub/Activity/Undo.php

@@ -70,11 +70,7 @@ class Undo extends ACore implements JsonSerializable {
 	 * @return array
 	 */
 	public function jsonSerialize(): array {
-		return array_merge(
+		return parent::jsonSerialize();
-			parent::jsonSerialize(),
-			[
-			]
-		);
 	}
 
 }

lib/Model/ActivityPub/Follow.php

@@ -128,13 +128,19 @@ class Follow extends ACore implements JsonSerializable {
 	 * @return array
 	 */
 	public function jsonSerialize(): array {
-		return array_merge(
+		$result = parent::jsonSerialize();
-			parent::jsonSerialize(),
+
-			[
+		if ($this->isCompleteDetails()) {
-				'follow_id' => $this->getFollowId(),
+			array_merge(
-				'accepted'  => $this->isAccepted()
+				$result,
-			]
+				[
-		);
+					'follow_id' => $this->getFollowId(),
+					'accepted'  => $this->isAccepted()
+				]
+			);
+		}
+
+		return $result;
 	}
 
 }

lib/Model/ActivityPub/Image.php

@@ -72,11 +72,7 @@ class Image extends Document implements JsonSerializable {
 	 * @return array
 	 */
 	public function jsonSerialize(): array {
-		return array_merge(
+		return parent::jsonSerialize();
-			parent::jsonSerialize(),
-			[
-			]
-		);
 	}
 
 }

lib/Model/ActivityPub/Tombstone.php

@@ -70,11 +70,7 @@ class Tombstone extends ACore implements JsonSerializable {
 	 * @return array
 	 */
 	public function jsonSerialize(): array {
-		return array_merge(
+		return parent::jsonSerialize();
-			parent::jsonSerialize(),
-			[
-			]
-		);
 	}
 
 }