friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-13 12:46:25 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Make requested changes

Browse source
This commit is contained in:
Gidi Kroon 2023-06-25 20:54:04 +02:00
parent 6a5266c6b8
commit 40783db161
5 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Module/ActivityPub/Objects.php
View file

@ -46,6 +46,8 @@ class Objects extends BaseModule
throw new HTTPException\BadRequestException(); throw new HTTPException\BadRequestException();
} }
header('Vary: Accept', false);
if (!ActivityPub::isRequest()) { if (!ActivityPub::isRequest()) {
DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString())); DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString()));
} }
@ -130,8 +132,6 @@ class Objects extends BaseModule
// Relaxed CORS header for public items // Relaxed CORS header for public items
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header('Vary: Accept', false);
System::jsonExit($data, 'application/activity+json'); System::jsonExit($data, 'application/activity+json');
} }
} }

5
src/Module/Friendica.php
View file

@ -90,8 +90,6 @@ class Friendica extends BaseModule
$blocked = null; $blocked = null;
} }
header('Vary: Accept', false);
$hooked = ''; $hooked = '';
Hook::callAll('about_hook', $hooked); Hook::callAll('about_hook', $hooked);
@ -117,6 +115,8 @@ class Friendica extends BaseModule
protected function rawContent(array $request = []) protected function rawContent(array $request = [])
{ {
header('Vary: Accept', false);
// @TODO: Replace with parameter from router // @TODO: Replace with parameter from router
if (DI::args()->getArgc() <= 1 || (DI::args()->getArgv()[1] !== 'json')) { if (DI::args()->getArgc() <= 1 || (DI::args()->getArgv()[1] !== 'json')) {
if (!ActivityPub::isRequest()) { if (!ActivityPub::isRequest()) {
@ -127,7 +127,6 @@ class Friendica extends BaseModule
$data = ActivityPub\Transmitter::getProfile(0); $data = ActivityPub\Transmitter::getProfile(0);
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header('Cache-Control: max-age=23200, stale-while-revalidate=23200'); header('Cache-Control: max-age=23200, stale-while-revalidate=23200');
header('Vary: Accept', false);
System::jsonExit($data, 'application/activity+json'); System::jsonExit($data, 'application/activity+json');
} catch (HTTPException\NotFoundException $e) { } catch (HTTPException\NotFoundException $e) {
System::jsonError(404, ['error' => 'Record not found']); System::jsonError(404, ['error' => 'Record not found']);

4
src/Module/Item/Display.php
View file

@ -88,6 +88,8 @@ class Display extends BaseModule
protected function content(array $request = []): string protected function content(array $request = []): string
{ {
header('Vary: Accept', false);
if (ActivityPub::isRequest()) { if (ActivityPub::isRequest()) {
$this->baseUrl->redirect(str_replace('display/', 'objects/', $this->args->getQueryString())); $this->baseUrl->redirect(str_replace('display/', 'objects/', $this->args->getQueryString()));
} }
@ -162,8 +164,6 @@ class Display extends BaseModule
$output .= $this->getDisplayData($item); $output .= $this->getDisplayData($item);
header('Vary: Accept', false);
return $output; return $output;
} }

5
src/Module/Profile/Profile.php
View file

@ -80,6 +80,8 @@ class Profile extends BaseProfile
protected function rawContent(array $request = []) protected function rawContent(array $request = [])
{ {
header('Vary: Accept', false);
if (ActivityPub::isRequest()) { if (ActivityPub::isRequest()) {
$user = $this->database->selectFirst('user', ['uid'], ['nickname' => $this->parameters['nickname'] ?? '', 'account_removed' => false]); $user = $this->database->selectFirst('user', ['uid'], ['nickname' => $this->parameters['nickname'] ?? '', 'account_removed' => false]);
if ($user) { if ($user) {
@ -87,7 +89,6 @@ class Profile extends BaseProfile
$data = ActivityPub\Transmitter::getProfile($user['uid']); $data = ActivityPub\Transmitter::getProfile($user['uid']);
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header('Cache-Control: max-age=23200, stale-while-revalidate=23200'); header('Cache-Control: max-age=23200, stale-while-revalidate=23200');
header('Vary: Accept', false);
System::jsonExit($data, 'application/activity+json'); System::jsonExit($data, 'application/activity+json');
} catch (HTTPException\NotFoundException $e) { } catch (HTTPException\NotFoundException $e) {
System::jsonError(404, ['error' => 'Record not found']); System::jsonError(404, ['error' => 'Record not found']);
@ -104,8 +105,6 @@ class Profile extends BaseProfile
System::jsonError(404, []); System::jsonError(404, []);
} }
} }
header('Vary: Accept', false);
} }
protected function content(array $request = []): string protected function content(array $request = []): string

5
src/Module/Xrd.php
View file

@ -80,6 +80,8 @@ class Xrd extends BaseModule
throw new NotFoundException('Invalid host name for xrd query: ' . $host); throw new NotFoundException('Invalid host name for xrd query: ' . $host);
} }
header('Vary: Accept', false);
if ($name == User::getActorName()) { if ($name == User::getActorName()) {
$owner = User::getSystemAccount(); $owner = User::getSystemAccount();
if (empty($owner)) { if (empty($owner)) {
@ -152,7 +154,6 @@ class Xrd extends BaseModule
] ]
]; ];
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header('Vary: Accept', false);
System::jsonExit($json, 'application/jrd+json; charset=utf-8'); System::jsonExit($json, 'application/jrd+json; charset=utf-8');
} }
@ -230,7 +231,6 @@ class Xrd extends BaseModule
]; ];
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header('Vary: Accept', false);
System::jsonExit($json, 'application/jrd+json; charset=utf-8'); System::jsonExit($json, 'application/jrd+json; charset=utf-8');
} }
@ -328,7 +328,6 @@ class Xrd extends BaseModule
]); ]);
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header('Vary: Accept', false);
System::httpExit($xmlString, Response::TYPE_XML, 'application/xrd+xml'); System::httpExit($xmlString, Response::TYPE_XML, 'application/xrd+xml');
} }
} }