Merge pull request #12409 from annando/diaspora-reshare

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

diff --git a/src/Module/NodeInfo110.php b/src/Module/NodeInfo110.php
index 6681dcc020a3ac90ba953deda40e861672ede4de..2f7042f1058365fca9ce6e0e963941aaf9b32ce6 100644 (file)
--- a/src/Module/NodeInfo110.php
+++ b/src/Module/NodeInfo110.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
  *
@@ -23,7 +23,7 @@ namespace Friendica\Module;
 
 use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Capabilities\IRespondToRequests;
+use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Core\Addon;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
@@ -53,7 +53,7 @@ class NodeInfo110 extends BaseModule
                        'version'           => '1.0',
                        'software'          => [
                                'name'    => 'friendica',
-                               'version' => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
+                               'version' => App::VERSION . '-' . DB_UPDATE_VERSION,
                        ],
                        'protocols'         => [
                                'inbound'  => [
@@ -63,8 +63,8 @@ class NodeInfo110 extends BaseModule
                                        'friendica'
                                ],
                        ],
-                       'services'          => [],
-                       'usage'             => [],
+                       'services'          => Nodeinfo::getServices(),
+                       'usage'             => Nodeinfo::getUsage(),
                        'openRegistrations' => intval($this->config->get('config', 'register_policy')) !== Register::CLOSED,
                        'metadata'          => [
                                'nodeName' => $this->config->get('config', 'sitename'),
@@ -81,10 +81,6 @@ class NodeInfo110 extends BaseModule
                        $nodeinfo['protocols']['outbound'][] = 'gnusocial';
                }
 
-               $nodeinfo['usage'] = Nodeinfo::getUsage();
-
-               $nodeinfo['services'] = Nodeinfo::getServices();
-
                $nodeinfo['metadata']['protocols']               = $nodeinfo['protocols'];
                $nodeinfo['metadata']['protocols']['outbound'][] = 'atom1.0';
                $nodeinfo['metadata']['protocols']['inbound'][]  = 'atom1.0';
@@ -98,7 +94,7 @@ class NodeInfo110 extends BaseModule
 
                $nodeinfo['metadata']['explicitContent'] = $this->config->get('system', 'explicit_content', false) == true;
 
-               $this->response->setType(IRespondToRequests::TYPE_JSON);
+               $this->response->setType(ICanCreateResponses::TYPE_JSON);
                $this->response->addContent(json_encode($nodeinfo, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
        }
 }