Merge remote-tracking branch 'upstream/develop' into post-thread-user

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

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 4262e4e0054696b1431757bba83861312df4266e..18830339fbb481bf26a76fd1dde24d99efcd0bae 100644 (file)
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -22,15 +22,18 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 /**
  * ActivityPub Objects
@@ -47,8 +50,27 @@ class Objects extends BaseModule
                        DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
                }
 
-               $item = Item::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid'],
-                       ['guid' => $parameters['guid']], ['order' => ['origin' => true]]);
+               $itemuri = DBA::selectFirst('item-uri', ['id'], ['guid' => $parameters['guid']]);
+
+               if (DBA::isResult($itemuri)) {
+                       Logger::info('Provided GUID found.', ['guid' => $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();
+                       $nurl = Strings::normaliseLink($url);
+                       $ssl_url = str_replace('http://', 'https://', $nurl);
+
+                       $itemuri = DBA::selectFirst('item-uri', ['guid', 'id'], ['uri' => [$url, $nurl, $ssl_url]]);
+                       if (DBA::isResult($itemuri)) {
+                               Logger::info('URL found.', ['url' => $url, 'guid' => $itemuri['guid'], 'uri-id' => $itemuri['id']]);
+                       } else {
+                               Logger::info('URL not found.', ['url' => $url]);
+                               throw new HTTPException\NotFoundException();
+                       }
+               }
+
+               $item = Post::selectFirst(['id', 'uid', 'origin', 'author-link', 'changed', 'private', 'psid', 'gravity'],
+                       ['uri-id' => $itemuri['id']], ['order' => ['origin' => true]]);
 
                if (!DBA::isResult($item)) {
                        throw new HTTPException\NotFoundException();
@@ -80,8 +102,12 @@ class Objects extends BaseModule
                $last_modified = $item['changed'];
                Network::checkEtagModified($etag, $last_modified);
 
-               if (empty($parameters['activity'])) {
+               if (empty($parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) {
                        $activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true);
+                       if (empty($activity['type'])) {
+                               throw new HTTPException\NotFoundException();
+                       }
+
                        $activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
 
                        // Only display "Create" activity objects here, no reshares or anything else
@@ -91,13 +117,14 @@ class Objects extends BaseModule
 
                        $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'])) {
+               } elseif (empty($parameters['activity']) || 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') {
+                       if (!empty($parameters['activity']) && ($parameters['activity'] != 'Create')) {
                                $data['type'] = $parameters['activity'];
                                $data['id'] = str_replace('/Create', '/' . $parameters['activity'], $data['id']);
                        }