Move System::jsonExit to BaseModule->jsonExit

- This will ensure headers set in BaseModule->run will be carried in jsonExit scenarios
- Deprecate jsonExit() method in Core\System
This commit is contained in:
Hypolite Petovan
2023-09-21 12:16:17 -04:00
parent e424b7bacb
commit 81279dad9e
119 changed files with 165 additions and 162 deletions
+3 -13
View File
@@ -32,26 +32,16 @@ use Friendica\DI;
class NodeInfo extends BaseModule
{
protected function rawContent(array $request = [])
{
self::printWellKnown();
}
/**
* Prints the well-known nodeinfo redirect
*
* @throws \Friendica\Network\HTTPException\NotFoundException
*/
private static function printWellKnown()
{
$nodeinfo = [
'links' => [
['rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
'href' => DI::baseUrl() . '/nodeinfo/1.0'],
'href' => DI::baseUrl() . '/nodeinfo/1.0'],
['rel' => 'http://nodeinfo.diaspora.software/ns/schema/2.0',
'href' => DI::baseUrl() . '/nodeinfo/2.0'],
'href' => DI::baseUrl() . '/nodeinfo/2.0'],
]
];
System::jsonExit($nodeinfo);
$this->jsonExit($nodeinfo);
}
}
+1 -1
View File
@@ -77,6 +77,6 @@ class XSocialRelay extends BaseModule
$relay['protocols']['diaspora'] = ['receive' => DI::baseUrl() . '/receive/public'];
}
System::jsonExit($relay);
$this->jsonExit($relay);
}
}