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 9935e9089a24219ea891bf6abc119cb1a3fd922f..2f7042f1058365fca9ce6e0e963941aaf9b32ce6 100644 (file)
--- a/src/Module/NodeInfo110.php
+++ b/src/Module/NodeInfo110.php
@@ -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';