GNUsocial/gnu-social-v2-archive-activitypub-plugin
Archived
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patches for getBestSupportedMimeType

Browse Source
This commit is contained in:
Diogo Cordeiro 2018-07-31 23:02:32 +01:00
parent 9fddc0f606
commit 3c021db5f0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ActivityPubPlugin.php
View File

@ -905,8 +905,12 @@ class ActivityPubReturn
*/ */
public static function getBestSupportedMimeType($mimeTypes = null) public static function getBestSupportedMimeType($mimeTypes = null)
{ {
if (!isset($_SERVER['HTTP_ACCEPT'])) {
return null;
}
// Values will be stored in this array // Values will be stored in this array
$AcceptTypes = array(); $AcceptTypes = [];
// Accept header is case insensitive, and whitespace isn’t important // Accept header is case insensitive, and whitespace isn’t important
$accept = strtolower(str_replace(' ', '', $_SERVER['HTTP_ACCEPT'])); $accept = strtolower(str_replace(' ', '', $_SERVER['HTTP_ACCEPT']));

2
actions/inbox/Follow.php
View File

@ -46,9 +46,9 @@ try {
try { try {
if (!Subscription::exists($actor_profile, $object_profile)) { if (!Subscription::exists($actor_profile, $object_profile)) {
Subscription::start($actor_profile, $object_profile); Subscription::start($actor_profile, $object_profile);
common_debug('ActivityPubPlugin: Accepted Follow request from '.$data->actor.' to '.$data->object);
$postman = new Activitypub_postman($actor_profile); $postman = new Activitypub_postman($actor_profile);
$postman->send(json_encode(Activitypub_accept::accept_to_array(Activitypub_follow::follow_to_array($data->actor, $data->object))), $object_profile->getInbox()); $postman->send(json_encode(Activitypub_accept::accept_to_array(Activitypub_follow::follow_to_array($data->actor, $data->object))), $object_profile->getInbox());
common_debug('ActivityPubPlugin: Accepted Follow request from '.$data->actor.' to '.$data->object);
ActivityPubReturn::answer('', 202); ActivityPubReturn::answer('', 202);
} else { } else {
common_debug('ActivityPubPlugin: Received a repeated Follow request from '.$data->actor.' to '.$data->object); common_debug('ActivityPubPlugin: Received a repeated Follow request from '.$data->actor.' to '.$data->object);