X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FActivityPub%2FObjects.php;h=34d4609511447a577b32b413badac788dd331ed6;hb=b5f20203134bda1b7899e92527e34ae4bf3fd142;hp=0a523ea435471079021f64906fcac793f3824157;hpb=4c7d3a6371c1f9b47ac01e6d479e652d7ee1d211;p=friendica.git

diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index 0a523ea435..34d4609511 100644
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -31,7 +31,6 @@ use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -57,7 +56,7 @@ class Objects extends BaseModule
 			Logger::info('Provided GUID found.', ['guid' => $this->parameters['guid'], 'uri-id' => $itemuri['id']]);
 		} else {
 			// The item URI does not always contain the GUID. This means that we have to search the URL instead
-			$url = DI::baseUrl()->get() . '/' . DI::args()->getQueryString();
+			$url = DI::baseUrl() . '/' . DI::args()->getQueryString();
 			$nurl = Strings::normaliseLink($url);
 			$ssl_url = str_replace('http://', 'https://', $nurl);
 
@@ -81,6 +80,7 @@ class Objects extends BaseModule
 			$requester = HTTPSignature::getSigner('', $_SERVER);
 			if (!empty($requester)) {
 				$receivers = Item::enumeratePermissions($item, false);
+				$receivers[] = $item['contact-id'];
 
 				$validated = in_array(Contact::getIdForURL($requester, $item['uid']), $receivers);
 				if (!$validated) {
@@ -97,8 +97,8 @@ class Objects extends BaseModule
 		$last_modified = $item['changed'];
 		Network::checkEtagModified($etag, $last_modified);
 
-		if (empty($this->parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
-			$activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
+		if (empty($this->parameters['activity']) && ($item['gravity'] != Item::GRAVITY_ACTIVITY)) {
+			$activity = ActivityPub\Transmitter::createCachedActivityFromItem($item['id'], false, true);
 			if (empty($activity['type'])) {
 				throw new HTTPException\NotFoundException();
 			}
@@ -115,7 +115,7 @@ class Objects extends BaseModule
 		} elseif (empty($this->parameters['activity']) || in_array($this->parameters['activity'],
 			['Create', 'Announce', 'Update', 'Like', 'Dislike', 'Accept', 'Reject',
 			'TentativeAccept', 'Follow', 'Add'])) {
-			$data = ActivityPub\Transmitter::createActivityFromItem($item['id']);
+			$data = ActivityPub\Transmitter::createCachedActivityFromItem($item['id']);
 			if (empty($data)) {
 				throw new HTTPException\NotFoundException();
 			}
@@ -129,6 +129,7 @@ class Objects extends BaseModule
 
 		// Relaxed CORS header for public items
 		header('Access-Control-Allow-Origin: *');
+
 		System::jsonExit($data, 'application/activity+json');
 	}
 }