diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php index 891211186..4fc450d85 100644 --- a/src/Module/Inbox.php +++ b/src/Module/Inbox.php @@ -25,6 +25,8 @@ class Inbox extends BaseModule System::httpExit(400); } +// Enable for test purposes +/* if (HTTPSignature::getSigner($postdata, $_SERVER)) { $filename = 'signed-activitypub'; } else { @@ -35,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 4697e3f8f..62d6dac0f 100644 --- a/src/Protocol/ActivityPub.php +++ b/src/Protocol/ActivityPub.php @@ -363,7 +363,7 @@ class ActivityPub } } - $parents = Item::select(['author-link', 'owner-link', 'gravity'], ['parent' => $item['parent']]); + $parents = Item::select(['id', 'author-link', 'owner-link', 'gravity'], ['parent' => $item['parent']]); while ($parent = Item::fetch($parents)) { // Don't include data from future posts if ($parent['id'] >= $item['id']) { @@ -1535,6 +1535,11 @@ class ActivityPub private static function postItem($activity, $item, $body) { /// @todo What to do with $activity['context']? + if (empty($activity['author'])) + logger('Empty author'); + + if (empty($activity['owner'])) + logger('Empty owner'); $item['network'] = Protocol::ACTIVITYPUB; $item['private'] = !in_array(0, $activity['receiver']);