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 2d76f80d04a7185b95a69ad2ead8cc20da8c65bc..c5a66fa3d5038ffc0e23f6caa22a95899a4250f9 100644 (file)
--- 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
  *
@@ -26,8 +26,10 @@ use Friendica\Core\Addon;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\Database\PostUpdate;
 use Friendica\DI;
 use Friendica\Model\User;
+use Friendica\Network\HTTPException;
 use Friendica\Protocol\ActivityPub;
 
 /**
@@ -36,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();
 
@@ -95,8 +97,8 @@ class Friendica extends BaseModule
                        'about'     => DI::l10n()->t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
                                '<strong>' . FRIENDICA_VERSION . '</strong>',
                                DI::baseUrl()->get(),
-                               '<strong>' . DB_UPDATE_VERSION . '</strong>',
-                               '<strong>' . $config->get('system', 'post_update_version') . '</strong>'),
+                               '<strong>' . DB_UPDATE_VERSION . '/' . $config->get('system', 'build') .'</strong>',
+                               '<strong>' . PostUpdate::VERSION . '/' . $config->get('system', 'post_update_version') . '</strong>'),
                        'friendica' => DI::l10n()->t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.'),
                        'bugs'      => DI::l10n()->t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">' . DI::l10n()->t('the bugtracker at github') . '</a>',
                        'info'      => DI::l10n()->t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
@@ -108,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 = [
@@ -180,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);
        }
 }