Issue 11566: More detailled notification configuration

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

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 95a319a41a962ec699da798e249951a3a728d6c4..c5a66fa3d5038ffc0e23f6caa22a95899a4250f9 100644 (file)
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -38,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();
 
@@ -110,9 +110,14 @@ class Friendica extends BaseModule
                ]);
        }
 
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
-               if (ActivityPub::isRequest()) {
+               // @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: *');
@@ -123,11 +128,6 @@ class Friendica extends BaseModule
                        }
                }
 
-               // @TODO: Replace with parameter from router
-               if (DI::args()->getArgc() <= 1 || (DI::args()->getArgv()[1] !== 'json')) {
-                       return;
-               }
-
                $config = DI::config();
 
                $register_policies = [
@@ -182,8 +182,6 @@ class Friendica extends BaseModule
                        'no_scrape_url'    => DI::baseUrl()->get() . '/noscrape',
                ];
 
-               header('Content-type: application/json; charset=utf-8');
-               echo json_encode($data);
-               exit();
+               System::jsonExit($data);
        }
 }