Merge branch '2023.03-rc' into stable

[friendica.git] / src / Module / WellKnown / XSocialRelay.php

diff --git a/src/Module/WellKnown/XSocialRelay.php b/src/Module/WellKnown/XSocialRelay.php
index 15b8e276ad7b2b888206a2bc0065d1162fe4d743..22d1b08a4eab0051baeebd85b45c8bff0cec24ea 100644 (file)
--- a/src/Module/WellKnown/XSocialRelay.php
+++ b/src/Module/WellKnown/XSocialRelay.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,16 +22,18 @@
 namespace Friendica\Module\WellKnown;
 
 use Friendica\BaseModule;
+use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Search;
+use Friendica\Protocol\Relay;
 
 /**
- * Node subscription preferences for social realy systems
+ * Node subscription preferences for social relay systems
  * @see https://git.feneas.org/jaywink/social-relay/blob/master/docs/relays.md
  */
 class XSocialRelay extends BaseModule
 {
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
                $config = DI::config();
 
@@ -40,7 +42,7 @@ class XSocialRelay extends BaseModule
                $systemTags = [];
                $userTags = [];
 
-               if ($scope == SR_SCOPE_TAGS) {
+               if ($scope == Relay::SCOPE_TAGS) {
                        $server_tags = $config->get('system', 'relay_server_tags');
                        $tagitems = explode(',', $server_tags);
 
@@ -57,26 +59,24 @@ class XSocialRelay extends BaseModule
                $tagList = array_unique(array_merge($systemTags, $userTags));
 
                $relay = [
-                       'subscribe' => ($scope != SR_SCOPE_NONE),
+                       'subscribe' => ($scope != Relay::SCOPE_NONE),
                        'scope'     => $scope,
                        'tags'      => $tagList,
                        'protocols' => [
                                'activitypub' => [
-                                       'actor' => DI::baseUrl()->get() . '/friendica',
-                                       'receive' => DI::baseUrl()->get() . '/inbox'
+                                       'actor' => DI::baseUrl() . '/friendica',
+                                       'receive' => DI::baseUrl() . '/inbox'
                                ],
                                'dfrn'     => [
-                                       'receive' => DI::baseUrl()->get() . '/dfrn_notify'
+                                       'receive' => DI::baseUrl() . '/dfrn_notify'
                                ]
                        ]
                ];
 
                if (DI::config()->get("system", "diaspora_enabled")) {
-                       $relay['protocols']['diaspora'] = ['receive' => DI::baseUrl()->get() . '/receive/public'];
+                       $relay['protocols']['diaspora'] = ['receive' => DI::baseUrl() . '/receive/public'];
                }
 
-               header('Content-type: application/json; charset=utf-8');
-               echo json_encode($relay, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-               exit;
+               System::jsonExit($relay);
        }
 }