X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FWorker%2FDelivery.php;h=e42b5a10195f4c5035ffedbdc949873f38f0d857;hb=2647514603852fe5fb9f47f0bf153dd20c124ce6;hp=c69545bbd13ee112622b7d371b700b3255546676;hpb=13a10b8f20ac7c5927c39d9e80e1a7d515385736;p=friendica.git diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index c69545bbd1..e42b5a1019 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -1,6 +1,6 @@ $cmd, 'target' => $target_id, 'contact' => $contact_id]); + Logger::info('Invoked', ['cmd' => $cmd, 'target' => $post_uriid, 'sender_uid' => $sender_uid, 'contact' => $contact_id]); $top_level = false; $followup = false; @@ -56,35 +59,38 @@ class Delivery $items = []; if ($cmd == self::MAIL) { - $target_item = DBA::selectFirst('mail', [], ['id' => $target_id]); + $target_item = DBA::selectFirst('mail', [], ['id' => $post_uriid]); if (!DBA::isResult($target_item)) { - self::setFailedQueue($cmd, $target_id); return; } $uid = $target_item['uid']; } elseif ($cmd == self::SUGGESTION) { - $target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]); + $target_item = DBA::selectFirst('fsuggest', [], ['id' => $post_uriid]); if (!DBA::isResult($target_item)) { - self::setFailedQueue($cmd, $target_id); return; } $uid = $target_item['uid']; } elseif ($cmd == self::RELOCATION) { - $uid = $target_id; + $uid = $post_uriid; $target_item = []; } else { - $item = Model\Item::selectFirst(['parent'], ['id' => $target_id]); + $item = Model\Post::selectFirst(['id', 'parent'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]); if (!DBA::isResult($item) || empty($item['parent'])) { - self::setFailedQueue($cmd, $target_id); + Logger::warning('Post not found', ['uri-id' => $post_uriid, 'uid' => $sender_uid]); return; } + $target_id = intval($item['id']); $parent_id = intval($item['parent']); - $condition = ['id' => [$target_id, $parent_id], 'visible' => true, 'moderated' => false]; + $condition = ['id' => [$target_id, $parent_id], 'visible' => true]; $params = ['order' => ['id']]; - $itemdata = Model\Item::select([], $condition, $params); + $itemdata = Model\Post::select(Item::DELIVER_FIELDLIST, $condition, $params); - while ($item = Model\Item::fetch($itemdata)) { + while ($item = Model\Post::fetch($itemdata)) { + if ($item['verb'] == Activity::ANNOUNCE) { + continue; + } + if ($item['id'] == $parent_id) { $parent = $item; } @@ -97,13 +103,12 @@ class Delivery if (empty($target_item)) { Logger::log('Item ' . $target_id . "wasn't found. Quitting here."); - self::setFailedQueue($cmd, $target_id); return; } if (empty($parent)) { Logger::log('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here."); - self::setFailedQueue($cmd, $target_id); + self::setFailedQueue($cmd, $target_item); return; } @@ -113,12 +118,12 @@ class Delivery $uid = $target_item['uid']; } else { Logger::log('Only public users for item ' . $target_id, Logger::DEBUG); - self::setFailedQueue($cmd, $target_id); + self::setFailedQueue($cmd, $target_item); return; } $condition = ['uri' => $target_item['thr-parent'], 'uid' => $target_item['uid']]; - $thr_parent = Model\Item::selectFirst(['network', 'object'], $condition); + $thr_parent = Model\Post::selectFirst(['network', 'object'], $condition); if (!DBA::isResult($thr_parent)) { // Shouldn't happen. But when this does, we just take the parent as thread parent. // That's totally okay for what we use this variable here. @@ -127,7 +132,7 @@ class Delivery if (!empty($contact_id) && Model\Contact::isArchived($contact_id)) { Logger::info('Contact is archived', ['id' => $contact_id, 'cmd' => $cmd, 'item' => $target_item['id']]); - self::setFailedQueue($cmd, $target_id); + self::setFailedQueue($cmd, $target_item); return; } @@ -138,13 +143,7 @@ class Delivery } } - // When commenting too fast after delivery, a post wasn't recognized as top level post. - // The count then showed more than one entry. The additional check should help. - // The check for the "count" should be superfluous, but I'm not totally sure by now, so we keep it. - if ((($parent['id'] == $target_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) { - Logger::log('Top level post'); - $top_level = true; - } + $top_level = $target_item['gravity'] == GRAVITY_PARENT; // This is IMPORTANT!!!! @@ -176,52 +175,50 @@ class Delivery && empty($parent['allow_gid']) && empty($parent['deny_cid']) && empty($parent['deny_gid']) - && !$parent["private"]) { + && ($parent["private"] != Model\Item::PRIVATE)) { $public_message = true; } } if (empty($items)) { - Logger::log('No delivery data for ' . $cmd . ' - Item ID: ' .$target_id . ' - Contact ID: ' . $contact_id); + Logger::notice('No delivery data', ['command' => $cmd, 'uri-id' => $post_uriid, 'cid' => $contact_id]); } $owner = Model\User::getOwnerDataById($uid); if (!DBA::isResult($owner)) { - self::setFailedQueue($cmd, $target_id); + self::setFailedQueue($cmd, $target_item); return; } - // We don't deliver our items to blocked or pending contacts, and not to ourselves either + // We don't deliver our items to blocked, archived or pending contacts, and not to ourselves either $contact = DBA::selectFirst('contact', [], - ['id' => $contact_id, 'blocked' => false, 'pending' => false, 'self' => false] + ['id' => $contact_id, 'archive' => false, 'blocked' => false, 'pending' => false, 'self' => false] ); if (!DBA::isResult($contact)) { - self::setFailedQueue($cmd, $target_id); + self::setFailedQueue($cmd, $target_item); return; } if (Network::isUrlBlocked($contact['url'])) { - self::setFailedQueue($cmd, $target_id); + self::setFailedQueue($cmd, $target_item); return; } + $protocol = Model\GServer::getProtocol($contact['gsid'] ?? 0); + // Transmit via Diaspora if the thread had started as Diaspora post. // Also transmit via Diaspora if this is a direct answer to a Diaspora comment. // This is done since the uri wouldn't match (Diaspora doesn't transmit it) - if (!empty($parent) && !empty($thr_parent) && in_array(Protocol::DIASPORA, [$parent['network'], $thr_parent['network']])) { + // Also transmit relayed posts from Diaspora contacts via Diaspora. + if (!empty($parent) && !empty($thr_parent) && in_array(Protocol::DIASPORA, [$parent['network'], $thr_parent['network'], $target_item['network']])) { $contact['network'] = Protocol::DIASPORA; } - // Ensure that local contacts are delivered locally - if (Model\Contact::isLocal($contact['url'])) { - $contact['network'] = Protocol::DFRN; - } - - Logger::notice('Delivering', ['cmd' => $cmd, 'target' => $target_id, 'followup' => $followup, 'network' => $contact['network']]); + Logger::notice('Delivering', ['cmd' => $cmd, 'uri-id' => $post_uriid, 'followup' => $followup, 'network' => $contact['network']]); switch ($contact['network']) { case Protocol::DFRN: - self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); + self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup, $protocol); break; case Protocol::DIASPORA: @@ -242,36 +239,37 @@ class Delivery /** * Increased the "failed" counter in the item delivery data * - * @param string $cmd Command - * @param integer $id Item id + * @param string $cmd Command + * @param array $item Item array */ - private static function setFailedQueue(string $cmd, int $id) + private static function setFailedQueue(string $cmd, array $item) { if (!in_array($cmd, [Delivery::POST, Delivery::POKE])) { return; } - Model\ItemDeliveryData::incrementQueueFailed($id); + Model\Post\DeliveryData::incrementQueueFailed($item['uri-id'] ?? $item['id']); } /** * Deliver content via DFRN * - * @param string $cmd Command - * @param array $contact Contact record of the receiver - * @param array $owner Owner record of the sender - * @param array $items Item record of the content and the parent - * @param array $target_item Item record of the content - * @param boolean $public_message Is the content public? - * @param boolean $top_level Is it a thread starter? - * @param boolean $followup Is it an answer to a remote post? + * @param string $cmd Command + * @param array $contact Contact record of the receiver + * @param array $owner Owner record of the sender + * @param array $items Item record of the content and the parent + * @param array $target_item Item record of the content + * @param boolean $public_message Is the content public? + * @param boolean $top_level Is it a thread starter? + * @param boolean $followup Is it an answer to a remote post? + * @param int $server_protocol The protocol of the server * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup) + private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup, $server_protocol) { // Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora - if (Diaspora::isReshare($target_item['body']) && !empty(Diaspora::personByHandle($contact['addr'], false))) { + if (Diaspora::isReshare($target_item['body']) && !empty(FContact::getByURL($contact['addr'], false))) { Logger::info('Reshare will be transmitted via Diaspora', ['url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id']]); self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); return; @@ -293,13 +291,17 @@ class Delivery $msgitems = [$target_item]; $atom = DFRN::entries($msgitems, $owner); } else { - $msgitems = []; - foreach ($items as $item) { - // Only add the parent when we don't delete other items. - if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) { - $item["entry:comment-allow"] = true; - $item["entry:cid"] = ($top_level ? $contact['id'] : 0); - $msgitems[] = $item; + if ($target_item['deleted']) { + $msgitems = [$target_item]; + } else { + $msgitems = []; + foreach ($items as $item) { + // Only add the parent when we don't delete other items. + if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) { + $item["entry:comment-allow"] = true; + $item["entry:cid"] = ($top_level ? $contact['id'] : 0); + $msgitems[] = $item; + } } } $atom = DFRN::entries($msgitems, $owner); @@ -307,41 +309,7 @@ class Delivery Logger::debug('Notifier entry: ' . $contact["url"] . ' ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' entry: ' . $atom); - // perform local delivery if we are on the same site - if (Model\Contact::isLocal($contact['url'])) { - $condition = ['nurl' => Strings::normaliseLink($contact['url']), 'self' => true]; - $target_self = DBA::selectFirst('contact', ['uid'], $condition); - if (!DBA::isResult($target_self)) { - return; - } - $target_uid = $target_self['uid']; - - // Check if the user has got this contact - $cid = Model\Contact::getIdForURL($owner['url'], $target_uid); - if (!$cid) { - // Otherwise there should be a public contact - $cid = Model\Contact::getIdForURL($owner['url']); - if (!$cid) { - return; - } - } - - $target_importer = DFRN::getImporter($cid, $target_uid); - if (empty($target_importer)) { - // This should never happen - return; - } - - DFRN::import($atom, $target_importer); - - if (in_array($cmd, [Delivery::POST, Delivery::POKE])) { - Model\ItemDeliveryData::incrementQueueDone($target_item['id'], Model\ItemDeliveryData::DFRN); - } - - return; - } - - $protocol = Model\ItemDeliveryData::DFRN; + $protocol = Model\Post\DeliveryData::DFRN; // We don't have a relationship with contacts on a public post. // Se we transmit with the new method and via Diaspora as a fallback @@ -357,30 +325,24 @@ class Delivery if (in_array($cmd, [Delivery::POST, Delivery::POKE])) { if (($deliver_status >= 200) && ($deliver_status <= 299)) { - Model\ItemDeliveryData::incrementQueueDone($target_item['id'], $protocol); + Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol); + + Model\GServer::setProtocol($contact['gsid'] ?? 0, $protocol); } else { - Model\ItemDeliveryData::incrementQueueFailed($target_item['id']); + Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']); } } return; } - if (($deliver_status < 200) || ($deliver_status > 299)) { + if ((($deliver_status < 200) || ($deliver_status > 299)) && (empty($server_protocol) || ($server_protocol == Model\Post\DeliveryData::LEGACY_DFRN))) { // Transmit via Diaspora if not possible via Friendica self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); return; } - } elseif ($cmd != self::RELOCATION) { + } else { // DFRN payload over Diaspora transport layer $deliver_status = DFRN::transmit($owner, $contact, $atom); - if ($deliver_status < 200) { - // Legacy DFRN - $deliver_status = DFRN::deliver($owner, $contact, $atom); - $protocol = Model\ItemDeliveryData::LEGACY_DFRN; - } - } else { - $deliver_status = DFRN::deliver($owner, $contact, $atom); - $protocol = Model\ItemDeliveryData::LEGACY_DFRN; } Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id'], 'return' => $deliver_status]); @@ -389,8 +351,10 @@ class Delivery // We successfully delivered a message, the contact is alive Model\Contact::unmarkForArchival($contact); + Model\GServer::setProtocol($contact['gsid'] ?? 0, $protocol); + if (in_array($cmd, [Delivery::POST, Delivery::POKE])) { - Model\ItemDeliveryData::incrementQueueDone($target_item['id'], $protocol); + Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol); } } else { // The message could not be delivered. We mark the contact as "dead" @@ -398,7 +362,7 @@ class Delivery Logger::info('Delivery failed: defer message', ['id' => ($target_item['guid'] ?? '') ?: $target_item['id']]); if (!Worker::defer() && in_array($cmd, [Delivery::POST, Delivery::POKE])) { - Model\ItemDeliveryData::incrementQueueFailed($target_item['id']); + Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']); } } } @@ -474,8 +438,10 @@ class Delivery // We successfully delivered a message, the contact is alive Model\Contact::unmarkForArchival($contact); + Model\GServer::setProtocol($contact['gsid'] ?? 0, Model\Post\DeliveryData::DIASPORA); + if (in_array($cmd, [Delivery::POST, Delivery::POKE])) { - Model\ItemDeliveryData::incrementQueueDone($target_item['id'], Model\ItemDeliveryData::DIASPORA); + Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::DIASPORA); } } else { // The message could not be delivered. We mark the contact as "dead" @@ -483,17 +449,17 @@ class Delivery // When it is delivered to the public endpoint, we do mark the relay contact for archival as well if ($public_message) { - Diaspora::markRelayForArchival($contact); + Relay::markForArchival($contact); } 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])) { - Model\ItemDeliveryData::incrementQueueFailed($target_item['id']); + Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']); } } elseif (in_array($cmd, [Delivery::POST, Delivery::POKE])) { - Model\ItemDeliveryData::incrementQueueFailed($target_item['id']); + Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']); } } } @@ -564,7 +530,8 @@ class Delivery $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n"; } } else { - $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' getHostname() . '>' . "\n"; + $sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHostname()); + $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <' . $sender . '>' . "\n"; } $headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n"; @@ -581,13 +548,13 @@ class Delivery if (empty($target_item['title'])) { $condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']]; - $title = Model\Item::selectFirst(['title'], $condition); + $title = Model\Post::selectFirst(['title'], $condition); if (DBA::isResult($title) && ($title['title'] != '')) { $subject = $title['title']; } else { $condition = ['parent-uri' => $target_item['parent-uri'], 'uid' => $owner['uid']]; - $title = Model\Item::selectFirst(['title'], $condition); + $title = Model\Post::selectFirst(['title'], $condition); if (DBA::isResult($title) && ($title['title'] != '')) { $subject = $title['title']; @@ -602,7 +569,7 @@ class Delivery Email::send($addr, $subject, $headers, $target_item); - Model\ItemDeliveryData::incrementQueueDone($target_item['id'], Model\ItemDeliveryData::MAIL); + Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::MAIL); Logger::info('Delivered via mail', ['guid' => $target_item['guid'], 'to' => $addr, 'subject' => $subject]); }