Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 01:50:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move System::jsonExit to BaseModule->jsonExit

Browse source 
- 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
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/ActivityPub/Featured.php
View file

@ -46,6 +46,6 @@ class Featured extends BaseModule
$featured = ActivityPub\Transmitter::getFeatured($owner, $page);
System::jsonExit($featured, 'application/activity+json');
$this->jsonExit($featured, 'application/activity+json');
}
}

2
src/Module/ActivityPub/Followers.php
View file

@ -49,6 +49,6 @@ class Followers extends BaseModule
$followers = ActivityPub\Transmitter::getContacts($owner, [Contact::FOLLOWER, Contact::FRIEND], 'followers', $page, (string)HTTPSignature::getSigner('', $_SERVER));
System::jsonExit($followers, 'application/activity+json');
$this->jsonExit($followers, 'application/activity+json');
}
}

2
src/Module/ActivityPub/Following.php
View file

@ -47,6 +47,6 @@ class Following extends BaseModule
$following = ActivityPub\Transmitter::getContacts($owner, [Contact::SHARING, Contact::FRIEND], 'following', $page);
System::jsonExit($following, 'application/activity+json');
$this->jsonExit($following, 'application/activity+json');
}
}

2
src/Module/ActivityPub/Inbox.php
View file

@ -66,7 +66,7 @@ class Inbox extends BaseApi
$inbox = ActivityPub\ClientToServer::getPublicInbox($uid, $page, $request['max_id'] ?? null);
}
System::jsonExit($inbox, 'application/activity+json');
$this->jsonExit($inbox, 'application/activity+json');
}
protected function post(array $request = [])

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

@ -130,6 +130,6 @@ class Objects extends BaseModule
// Relaxed CORS header for public items
header('Access-Control-Allow-Origin: *');
System::jsonExit($data, 'application/activity+json');
$this->jsonExit($data, 'application/activity+json');
}
}

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

@ -53,7 +53,7 @@ class Outbox extends BaseApi
$outbox = ActivityPub\ClientToServer::getOutbox($owner, $uid, $page, $request['max_id'] ?? null, HTTPSignature::getSigner('', $_SERVER));
System::jsonExit($outbox, 'application/activity+json');
$this->jsonExit($outbox, 'application/activity+json');
}
protected function post(array $request = [])
@ -79,6 +79,6 @@ class Outbox extends BaseApi
throw new \Friendica\Network\HTTPException\BadRequestException();
}
System::jsonExit(ActivityPub\ClientToServer::processActivity($activity, $uid, self::getCurrentApplication() ?? []));
$this->jsonExit(ActivityPub\ClientToServer::processActivity($activity, $uid, self::getCurrentApplication() ?? []));
}
}

2
src/Module/ActivityPub/Whoami.php
View file

@ -100,6 +100,6 @@ class Whoami extends BaseApi
];
$data['generator'] = ActivityPub\Transmitter::getService();
System::jsonExit($data, 'application/activity+json');
$this->jsonExit($data, 'application/activity+json');
}
}