X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FObjects.php;h=8080289f15866143a2207209d56d3666df448964;hb=63dc6950d4930ea56d24ee83953b583a49c58c56;hp=023ced08ce33b04fda4d04f9023ccdd383f5d499;hpb=dd613cda4515e366a1947cebd0e549d4101adabf;p=friendica.git

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 023ced08ce..8080289f15 100644
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -22,10 +22,13 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
+use Friendica\Util\Network;
 
 /**
  * ActivityPub Objects
@@ -34,10 +37,8 @@ class Objects extends BaseModule
 {
 	public static function rawContent(array $parameters = [])
 	{
-		$a = DI::app();
-
-		if (empty($a->argv[1])) {
-			throw new \Friendica\Network\HTTPException\NotFoundException();
+		if (empty($parameters['guid'])) {
+			throw new HTTPException\BadRequestException();
 		}
 
 		if (!ActivityPub::isRequest()) {
@@ -47,29 +48,50 @@ class Objects extends BaseModule
 		/// @todo Add Authentication to enable fetching of non public content
 		// $requester = HTTPSignature::getSigner('', $_SERVER);
 
-		// At first we try the original post with that guid
-		// @TODO: Replace with parameter from router
-		$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'origin' => true, 'private' => [item::PRIVATE, Item::UNLISTED]]);
-		if (!DBA::isResult($item)) {
-			// If no original post could be found, it could possibly be a forum post, there we remove the "origin" field.
-			// @TODO: Replace with parameter from router
-			$item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => [item::PRIVATE, Item::UNLISTED]]);
-			if (!DBA::isResult($item) || !strstr($item['author-link'], DI::baseUrl()->get())) {
-				throw new \Friendica\Network\HTTPException\NotFoundException();
-			}
+		$item = Item::selectFirst(
+			['id', 'origin', 'author-link', 'changed'],
+			[
+				'guid' => $parameters['guid'],
+				'private' => [Item::PUBLIC, Item::UNLISTED]
+			],
+			['order' => ['origin' => true]]
+		);
+		// Valid items are original post or posted from this node (including in the case of a forum)
+		if (!DBA::isResult($item) || !$item['origin'] && (parse_url($item['author-link'], PHP_URL_HOST) != parse_url(DI::baseUrl()->get(), PHP_URL_HOST))) {
+			throw new HTTPException\NotFoundException();
 		}
 
-		$activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
-		// Only display "Create" activity objects here, no reshares or anything else
-		if (!is_array($activity['object']) || ($activity['type'] != 'Create')) {
-			throw new \Friendica\Network\HTTPException\NotFoundException();
-		}
+		$etag          = md5($parameters['guid'] . '-' . $item['changed']);
+		$last_modified = $item['changed'];
+		Network::checkEtagModified($etag, $last_modified);
 
-		$data = ['@context' => ActivityPub::CONTEXT];
-		$data = array_merge($data, $activity['object']);
+		if (empty($parameters['activity'])) {
+			$activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
+			$activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
+
+			// Only display "Create" activity objects here, no reshares or anything else
+			if (empty($activity['object']) || ($activity['type'] != 'Create')) {
+				throw new HTTPException\NotFoundException();
+			}
+
+			$data = ['@context' => ActivityPub::CONTEXT];
+			$data = array_merge($data, $activity['object']);
+		} elseif (in_array($parameters['activity'], ['Create', 'Announce', 'Update', 
+			'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept', 'Follow', 'Add'])) {
+			$data = ActivityPub\Transmitter::createActivityFromItem($item['id']);
+			if (empty($data)) {
+				throw new HTTPException\NotFoundException();
+			}
+			if ($parameters['activity'] != 'Create') {
+				$data['type'] = $parameters['activity'];
+				$data['id'] = str_replace('/Create', '/' . $parameters['activity'], $data['id']);
+			}
+		} else {
+			throw new HTTPException\NotFoundException();
+		}
 
-		header('Content-Type: application/activity+json');
-		echo json_encode($data);
-		exit();
+		// Relaxed CORS header for public items
+		header('Access-Control-Allow-Origin: *');
+		System::jsonExit($data, 'application/activity+json');
 	}
 }