X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FObjects.php;h=783e849bfe35cd756d8feaae99dde9867115278b;hb=6cbfa5b862ce7a241fd4339129749f87dc19760c;hp=3f8aea0d01adc4432a523645c92d82341be2a675;hpb=f13b8f8ec4d0ad12e68b7bfa3fb5f5c04d6b1172;p=friendica.git

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 3f8aea0d01..783e849bfe 100644
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -5,38 +5,51 @@
 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\DI;
+use Friendica\Model\Item;
+use Friendica\Protocol\ActivityPub;
 
 /**
  * ActivityPub Objects
  */
 class Objects extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
-		$a = self::getApp();
+		$a = DI::app();
 
 		if (empty($a->argv[1])) {
-			System::httpExit(404);
+			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
 		if (!ActivityPub::isRequest()) {
-			$a->internalRedirect(str_replace('objects/', 'display/', $a->query_string));
+			DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
 		}
 
 		/// @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' => false]);
 		if (!DBA::isResult($item)) {
-			System::httpExit(404);
+			// 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'], DI::baseUrl()->get())) {
+				throw new \Friendica\Network\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();
 		}
 
-		$data = ActivityPub\Transmitter::createObjectFromItemID($item['id']);
+		$data = ['@context' => ActivityPub::CONTEXT];
+		$data = array_merge($data, $activity['object']);
 
 		header('Content-Type: application/activity+json');
 		echo json_encode($data);