diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php index 609bb8888..92767a105 100644 --- a/src/Worker/APDelivery.php +++ b/src/Worker/APDelivery.php @@ -68,13 +68,14 @@ class APDelivery } } - // This should never fail and is temporariy (until the move to ) + // This should never fail and is temporariy (until the move to the "post" structure) $item = Item::selectFirst(['uri-id'], ['id' => $target_id]); + $uriid = $item['uri-id'] ?? 0; if (!$success && !Worker::defer() && in_array($cmd, [Delivery::POST])) { - Post\DeliveryData::incrementQueueFailed($item['uri-id']); + Post\DeliveryData::incrementQueueFailed($uriid); } elseif ($success && in_array($cmd, [Delivery::POST])) { - Post\DeliveryData::incrementQueueDone($item['uri-id'], Post\DeliveryData::ACTIVITYPUB); + Post\DeliveryData::incrementQueueDone($uriid, Post\DeliveryData::ACTIVITYPUB); } } } diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 833d809e7..364e2a83c 100755 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -936,7 +936,7 @@ return [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], "notify-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["notify" => "id"], "comment" => ""], "master-parent-item" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => ""], - "master-parent-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Item-uri id of the parent of the related post"], + "master-parent-uri-id" => ["type" => "int unsigned", "relation" => ["item-uri" => "id"], "comment" => "Item-uri id of the parent of the related post"], "parent-item" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""], "receiver-uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],