const RELOCATION = 'relocate';
const DELETION = 'drop';
const POST = 'wall-new';
- const POKE = 'poke';
const REMOVAL = 'removeme';
const PROFILEUPDATE = 'profileupdate';
DBA::close($itemdata);
if (empty($target_item)) {
- Logger::notice('Item ' . $target_id . "wasn't found. Quitting here.");
+ Logger::warning("No target item data. Quitting here.", ['id' => $target_id]);
return;
}
if (empty($parent)) {
- Logger::notice('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here.");
+ Logger::warning('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here.");
self::setFailedQueue($cmd, $target_item);
return;
}
}
if (empty($items)) {
- Logger::notice('No delivery data', ['command' => $cmd, 'uri-id' => $post_uriid, 'cid' => $contact_id]);
+ Logger::warning('No delivery data', ['command' => $cmd, 'uri-id' => $post_uriid, 'cid' => $contact_id]);
}
$owner = Model\User::getOwnerDataById($uid);
*/
private static function setFailedQueue(string $cmd, array $item)
{
- if (!in_array($cmd, [Delivery::POST, Delivery::POKE])) {
+ if ($cmd != Delivery::POST) {
return;
}
if ($public_dfrn) {
Logger::info('Relay delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status);
- if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
+ if ($cmd == Delivery::POST) {
if (($deliver_status >= 200) && ($deliver_status <= 299)) {
Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol);
Model\GServer::setProtocol($contact['gsid'] ?? 0, $protocol);
- if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
+ if ($cmd == Delivery::POST) {
Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol);
}
} else {
Model\Contact::markForArchival($contact);
Logger::info('Delivery failed: defer message', ['id' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
- if (!Worker::defer() && in_array($cmd, [Delivery::POST, Delivery::POKE])) {
+ if (!Worker::defer() && $cmd == Delivery::POST) {
Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']);
}
}
Logger::notice('diaspora status: ' . $loc);
$deliver_status = Diaspora::sendStatus($target_item, $owner, $contact, $public_message);
} else {
- Logger::notice('Unknown mode ' . $cmd . ' for ' . $loc);
+ Logger::warning('Unknown mode', ['command' => $cmd, 'target' => $loc]);
return;
}
Model\GServer::setProtocol($contact['gsid'] ?? 0, Model\Post\DeliveryData::DIASPORA);
- if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
+ if ($cmd == Delivery::POST) {
Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::DIASPORA);
}
} else {
if (empty($contact['contact-type']) || ($contact['contact-type'] != Model\Contact::TYPE_RELAY)) {
Logger::info('Delivery failed: defer message', ['id' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
// defer message for redelivery
- if (!Worker::defer() && in_array($cmd, [Delivery::POST, Delivery::POKE])) {
+ if (!Worker::defer() && $cmd == Delivery::POST) {
Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']);
}
- } elseif (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
+ } elseif ($cmd == Delivery::POST) {
Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']);
}
}
return;
}
- if (!in_array($cmd, [self::POST, self::POKE])) {
+ if ($cmd != self::POST) {
return;
}