diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php index 3b845074d..c190be4d1 100644 --- a/src/Module/Inbox.php +++ b/src/Module/Inbox.php @@ -26,7 +26,7 @@ class Inbox extends BaseModule } // Enable for test purposes - +/* if (HTTPSignature::getSigner($postdata, $_SERVER)) { $filename = 'signed-activitypub'; } else { @@ -37,7 +37,7 @@ class Inbox extends BaseModule file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); logger('Incoming message stored under ' . $tempfile); - +*/ if (!empty($a->argv[1])) { $user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]); if (!DBA::isResult($user)) { diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php index b1680178e..b4668e915 100644 --- a/src/Protocol/ActivityPub.php +++ b/src/Protocol/ActivityPub.php @@ -39,8 +39,6 @@ class ActivityPub 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers', 'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']]; const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application']; - const CONTENT_TYPES = ['Note', 'Article', 'Video', 'Image']; - const ACTIVITY_TYPES = ['Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept']; /** * Checks if the web request is done for the AP protocol * diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index 7d181234f..32cfcc6cb 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -272,7 +272,7 @@ class Processor */ public static function followUser($activity) { - $uid = User::getIdForURL($activity['object_actor']); + $uid = User::getIdForURL($activity['object_id']); if (empty($uid)) { return; } @@ -326,12 +326,12 @@ class Processor */ public static function deletePerson($activity) { - if (empty($activity['object_id']) || empty($activity['object_actor'])) { + if (empty($activity['object_id']) || empty($activity['actor'])) { logger('Empty object id or actor.', LOGGER_DEBUG); return; } - if ($activity['object_id'] != $activity['object_actor']) { + if ($activity['object_id'] != $activity['actor']) { logger('Object id does not match actor.', LOGGER_DEBUG); return; } diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php index ba6cd52ba..ac66aeb6e 100644 --- a/src/Protocol/ActivityPub/Receiver.php +++ b/src/Protocol/ActivityPub/Receiver.php @@ -166,7 +166,7 @@ class Receiver $object_data = self::processObject($activity); $object_data['name'] = $type; $object_data['author'] = JsonLD::fetchElement($activity, 'as:actor'); - $object_data['object'] = $object_id; + $object_data['object_id'] = $object_id; $object_data['object_type'] = ''; // Since we don't fetch the object, we don't know the type } else { $object_data = [];