X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FObjects.php;h=2104e8042fd98e3c2cc9f7bc57eb9782a7627826;hb=3c7e4b474b8f219b7ddacfd2c948d49628aafa81;hp=558b274919ce33bad609074dec5aac569ceca9e0;hpb=0a284edde7580b2d127b1fc764067a785e88252c;p=friendica.git diff --git a/src/Module/Objects.php b/src/Module/Objects.php index 558b274919..2104e8042f 100644 --- a/src/Module/Objects.php +++ b/src/Module/Objects.php @@ -5,11 +5,10 @@ namespace Friendica\Module; use Friendica\BaseModule; -use Friendica\Protocol\ActivityPub; use Friendica\Core\System; -use Friendica\Model\Item; use Friendica\Database\DBA; -use Friendica\Util\HTTPSignature; +use Friendica\Model\Item; +use Friendica\Protocol\ActivityPub; /** * ActivityPub Objects @@ -21,7 +20,7 @@ class Objects extends BaseModule $a = self::getApp(); if (empty($a->argv[1])) { - System::httpExit(404); + throw new \Friendica\Network\HTTPException\NotFoundException(); } if (!ActivityPub::isRequest()) { @@ -32,12 +31,14 @@ class Objects extends BaseModule // $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' => false]); 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' => false]); if (!DBA::isResult($item) || !strstr($item['author-link'], System::baseUrl())) { - System::httpExit(404); + throw new \Friendica\Network\HTTPException\NotFoundException(); } }