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

Proper ActivityPub Accept

Browse Source
This commit is contained in:
Diogo Cordeiro 2018-07-31 23:28:27 +01:00
parent 80265024a7
commit edfd52e35f
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
actions/inbox/Follow.php
View File

@ -31,30 +31,31 @@ if (!defined('GNUSOCIAL')) {
// Validate Object // Validate Object
if (!filter_var($data->object, FILTER_VALIDATE_URL)) { if (!filter_var($data->object, FILTER_VALIDATE_URL)) {
ActivityPubReturn::error("Invalid Object object, URL expected."); ActivityPubReturn::error('Invalid Object Actor URL.');
} }
// Get valid Object profile // Get valid Object profile
try { try {
$object_profile = new Activitypub_explorer; $object_profile = new Activitypub_explorer;
$object_profile = $object_profile->lookup($data->object)[0]; $object_profile = $object_profile->lookup($data->object)[0];
$object_profile = Activitypub_profile::from_profile($object_profile); $object_aprofile = Activitypub_profile::from_profile($object_profile);
} catch (Exception $e) { } catch (Exception $e) {
ActivityPubReturn::error("Invalid Object Actor URL.", 404); common_debug();
ActivityPubReturn::error('Invalid Object Actor URL.', 404);
} }
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);
$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_aprofile->getInbox());
common_debug('ActivityPubPlugin: Accepted Follow request from '.$data->actor.' to '.$data->object); 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);
ActivityPubReturn::error("Already following.", 409); ActivityPubReturn::error('Already following.', 409);
} }
} catch (Exception $e) { } catch (Exception $e) {
common_debug('ActivityPubPlugin: An error ocurred processing Follow request from '.$data->actor.' to '.$data->object); common_debug('ActivityPubPlugin: An error ocurred processing Follow request from '.$data->actor.' to '.$data->object);
ActivityPubReturn::error("Invalid Object Actor URL.", 404); ActivityPubReturn::error('Invalid Object Actor URL.', 404);
} }

11
classes/Activitypub_accept.php
View File

@ -49,10 +49,13 @@ class Activitypub_accept extends Managed_DataObject
*/ */
public static function accept_to_array($object) public static function accept_to_array($object)
{ {
$res = array("@context" => "https://www.w3.org/ns/activitystreams", $res = [
"type" => "Accept", '@context' => 'https://www.w3.org/ns/activitystreams',
"object" => $object 'id' => common_root_url().'follow_from_'.urlencode($object->actor).'_to_'.urlencode($object->object),
); 'actor' => $object->object,
'type' => 'Accept',
'object' => $object
];
return $res; return $res;
} }
} }