X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModule%2FFriendica.php;h=3fccda5f859ddd429adb34a8e21e23e3c521ca83;hb=d7df0825db598012871d8555de04575d0c30247a;hp=7da02808962969292e2459a52bf8aee726de3cb2;hpb=122ad0af14f046c2462a03fe33967dc41abfc8b5;p=friendica.git

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 7da0280896..3fccda5f85 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,6 +29,7 @@ use Friendica\Core\System;
 use Friendica\Database\PostUpdate;
 use Friendica\DI;
 use Friendica\Model\User;
+use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
 
 /**
@@ -37,7 +38,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Friendica extends BaseModule
 {
-	public static function content(array $parameters = [])
+	protected function content(array $request = []): string
 	{
 		$config = DI::config();
 
@@ -109,24 +110,24 @@ class Friendica extends BaseModule
 		]);
 	}
 
-	public static function rawContent(array $parameters = [])
+	protected function rawContent(array $request = [])
 	{
-		if (ActivityPub::isRequest()) {
-			$data = ActivityPub\Transmitter::getProfile(0);
-			if (!empty($data)) {
+		// @TODO: Replace with parameter from router
+		if (DI::args()->getArgc() <= 1 || (DI::args()->getArgv()[1] !== 'json')) {
+			if (!ActivityPub::isRequest()) {
+				return;
+			}
+
+			try {
+				$data = ActivityPub\Transmitter::getProfile(0);
 				header('Access-Control-Allow-Origin: *');
 				header('Cache-Control: max-age=23200, stale-while-revalidate=23200');
 				System::jsonExit($data, 'application/activity+json');
+			} catch (HTTPException\NotFoundException $e) {
+				System::jsonError(404, ['error' => 'Record not found']);
 			}
 		}
 
-		$app = DI::app();
-
-		// @TODO: Replace with parameter from router
-		if ($app->argc <= 1 || ($app->argv[1] !== 'json')) {
-			return;
-		}
-
 		$config = DI::config();
 
 		$register_policies = [