Issue 13052: The limit parameter now behaves like the Mastodon counterpart

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

diff --git a/src/Module/Statistics.php b/src/Module/Statistics.php
index 88b01e255e392adf19705654c0ecbc04db34ed62..514f10bb73d768d836fb576d06d29a5c6863b2d0 100644 (file)
--- a/src/Module/Statistics.php
+++ b/src/Module/Statistics.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,7 +25,9 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs;
 use Friendica\Core\L10n;
+use Friendica\Core\System;
 use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
@@ -34,13 +36,15 @@ class Statistics extends BaseModule
 {
        /** @var IManageConfigValues */
        protected $config;
-
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, IManageConfigValues $config, Response $response, array $server, array $parameters = [])
+       /** @var IManageKeyValuePairs */
+       protected $keyValue;
+       
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, IManageConfigValues $config, IManageKeyValuePairs $keyValue, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->config = $config;
-
+               $this->config   = $config;
+               $this->keyValue = $keyValue;
                if (!$this->config->get("system", "nodeinfo")) {
                        throw new NotFoundException();
                }
@@ -68,19 +72,17 @@ class Statistics extends BaseModule
 
                $statistics = array_merge([
                        'name'                  => $this->config->get('config', 'sitename'),
-                       'network'               => FRIENDICA_PLATFORM,
-                       'version'               => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
+                       'network'               => App::PLATFORM,
+                       'version'               => App::VERSION . '-' . DB_UPDATE_VERSION,
                        'registrations_open'    => $registration_open,
-                       'total_users'           => $this->config->get('nodeinfo', 'total_users'),
-                       'active_users_halfyear' => $this->config->get('nodeinfo', 'active_users_halfyear'),
-                       'active_users_monthly'  => $this->config->get('nodeinfo', 'active_users_monthly'),
-                       'local_posts'           => $this->config->get('nodeinfo', 'local_posts'),
+                       'total_users'           => $this->keyValue->get('nodeinfo_total_users'),
+                       'active_users_halfyear' => $this->keyValue->get('nodeinfo_active_users_halfyear'),
+                       'active_users_monthly'  => $this->keyValue->get('nodeinfo_active_users_monthly'),
+                       'local_posts'           => $this->keyValue->get('nodeinfo_local_posts'),
                        'services'              => $services,
                ], $services);
 
-               header("Content-Type: application/json");
-               echo json_encode($statistics, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
                $this->logger->debug("statistics.", ['statistics' => $statistics]);
-               exit();
+               System::jsonExit($statistics);
        }
 }