Merge pull request #12429 from MrPetovan/bug/contactblock-icon

[friendica.git] / src / Module / ActivityPub / Objects.php

diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index dc9eaaf60c46a5535b25a440eb575cace805352f..8c8109d667ca99ac2d8a7a0a798f789a6c44f1bb 100644 (file)
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -29,9 +29,9 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
+use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Protocol\ActivityPub\PageCache;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -51,13 +51,6 @@ class Objects extends BaseModule
                        DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
                }
 
-               $data = PageCache::fetch($_SERVER['REQUEST_URI']);
-               if (!empty($data)) {
-                       header('Access-Control-Allow-Origin: *');
-
-                       System::jsonExit($data, 'application/activity+json');
-               }
-
                $itemuri = DBA::selectFirst('item-uri', ['id'], ['guid' => $this->parameters['guid']]);
 
                if (DBA::isResult($itemuri)) {
@@ -82,7 +75,9 @@ class Objects extends BaseModule
                        throw new HTTPException\NotFoundException();
                }
 
-               $validated = in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]);
+               $owner = User::getById($item['uid'], ['hidewall']);
+
+               $validated = empty($owner['hidewall']) && in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]);
 
                if (!$validated) {
                        $requester = HTTPSignature::getSigner('', $_SERVER);
@@ -105,8 +100,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();
                        }
@@ -123,7 +118,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();
                        }
@@ -135,10 +130,6 @@ class Objects extends BaseModule
                        throw new HTTPException\NotFoundException();
                }
 
-               if (in_array($item['private'], [Item::PUBLIC, Item::UNLISTED])) {
-                       PageCache::add($_SERVER['REQUEST_URI'], $data);
-               }
-
                // Relaxed CORS header for public items
                header('Access-Control-Allow-Origin: *');