X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=706adb401e935124d048abca310fe9d7d2605899;hb=6f93ee7e49fc555e10a008e04567cd72105533dc;hp=dad2ff7b3d0cf75819e777a53a6b58aaf5da781a;hpb=8c99d3acc1b65bd7645d69f430d5fd9604d6b3b5;p=friendica.git diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index dad2ff7b3d..706adb401e 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -1,6 +1,6 @@ $post_uriid]); - if (!DBA::isResult($target_item)) { + try { + $target_item = DI::fsuggest()->selectOneById($post_uriid)->toArray(); + } catch (FriendSuggestNotFoundException $e) { + DI::logger()->info('Cannot find FriendSuggestion', ['id' => $post_uriid]); return; } $uid = $target_item['uid']; @@ -74,7 +78,7 @@ class Delivery $uid = $post_uriid; $target_item = []; } else { - $item = Model\Post::selectFirst(['id', 'parent'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]); + $item = Post::selectFirst(['id', 'parent'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]); if (!DBA::isResult($item) || empty($item['parent'])) { Logger::warning('Post not found', ['uri-id' => $post_uriid, 'uid' => $sender_uid]); return; @@ -84,9 +88,9 @@ class Delivery $condition = ['id' => [$target_id, $parent_id], 'visible' => true]; $params = ['order' => ['id']]; - $itemdata = Model\Post::select(Item::DELIVER_FIELDLIST, $condition, $params); + $itemdata = Post::select(Item::DELIVER_FIELDLIST, $condition, $params); - while ($item = Model\Post::fetch($itemdata)) { + while ($item = Post::fetch($itemdata)) { if ($item['verb'] == Activity::ANNOUNCE) { continue; } @@ -102,12 +106,12 @@ class Delivery DBA::close($itemdata); if (empty($target_item)) { - Logger::log('Item ' . $target_id . "wasn't found. Quitting here."); + Logger::warning("No target item data. Quitting here.", ['id' => $target_id]); return; } if (empty($parent)) { - Logger::log('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; } @@ -117,20 +121,20 @@ class Delivery } elseif (!empty($target_item['uid'])) { $uid = $target_item['uid']; } else { - Logger::log('Only public users for item ' . $target_id, Logger::DEBUG); + Logger::info('Only public users for item ' . $target_id); self::setFailedQueue($cmd, $target_item); return; } $condition = ['uri' => $target_item['thr-parent'], 'uid' => $target_item['uid']]; - $thr_parent = Model\Post::selectFirst(['network', 'object'], $condition); + $thr_parent = 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. $thr_parent = $parent; } - if (!empty($contact_id) && Model\Contact::isArchived($contact_id)) { + if (!empty($contact_id) && Contact::isArchived($contact_id)) { Logger::info('Contact is archived', ['id' => $contact_id, 'cmd' => $cmd, 'item' => $target_item['id']]); self::setFailedQueue($cmd, $target_item); return; @@ -143,7 +147,7 @@ class Delivery } } - $top_level = $target_item['gravity'] == GRAVITY_PARENT; + $top_level = $target_item['gravity'] == Item::GRAVITY_PARENT; // This is IMPORTANT!!!! @@ -166,7 +170,7 @@ class Delivery */ if (!$top_level && ($parent['wall'] == 0) && stristr($target_item['uri'], $localhost)) { - Logger::log('Followup ' . $target_item["guid"], Logger::DEBUG); + Logger::info('Followup ' . $target_item["guid"]); // local followup to remote post $followup = true; } @@ -175,16 +179,16 @@ class Delivery && empty($parent['allow_gid']) && empty($parent['deny_cid']) && empty($parent['deny_gid']) - && ($parent["private"] != Model\Item::PRIVATE)) { + && ($parent['private'] != Item::PRIVATE)) { $public_message = true; } } 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); + $owner = User::getOwnerDataById($uid); if (!DBA::isResult($owner)) { self::setFailedQueue($cmd, $target_item); return; @@ -204,13 +208,14 @@ class Delivery return; } - $protocol = Model\GServer::getProtocol($contact['gsid'] ?? 0); + $protocol = 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) // 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']])) { + if (($contact['network'] != Protocol::DIASPORA) && in_array(Protocol::DIASPORA, [$parent['network'] ?? '', $thr_parent['network'] ?? '', $target_item['network']] ?? '')) { + Logger::info('Enforcing the Diaspora protocol', ['id' => $contact['id'], 'network' => $contact['network'], 'parent' => $parent['network'], 'thread-parent' => $thr_parent['network'], 'post' => $target_item['network']]); $contact['network'] = Protocol::DIASPORA; } @@ -241,35 +246,39 @@ class Delivery * * @param string $cmd Command * @param array $item Item array + * + * @return void */ private static function setFailedQueue(string $cmd, array $item) { - if (!in_array($cmd, [Delivery::POST, Delivery::POKE])) { + if ($cmd != Delivery::POST) { return; } - Model\Post\DeliveryData::incrementQueueFailed($item['uri-id'] ?? $item['id']); + 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 int $server_protocol The protocol of the server + * @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|null $server_protocol The protocol of the server + * + * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup, $server_protocol) + private static function deliverDFRN(string $cmd, array $contact, array $owner, array $items, array $target_item, bool $public_message, bool $top_level, bool $followup, int $server_protocol = null) { // Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora - if (Diaspora::isReshare($target_item['body']) && !empty(FContact::getByURL($contact['addr'], false))) { + if (Diaspora::getReshareDetails($target_item ?? []) && !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; @@ -279,12 +288,12 @@ class Delivery if ($cmd == self::MAIL) { $item = $target_item; - $item['body'] = Model\Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']); + $item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']); $atom = DFRN::mail($item, $owner); } elseif ($cmd == self::SUGGESTION) { $item = $target_item; $atom = DFRN::fsuggest($item, $owner); - DBA::delete('fsuggest', ['id' => $item['id']]); + DI::fsuggest()->delete(new FriendSuggests([DI::fsuggest()->selectOneById($item['id'])])); } elseif ($cmd == self::RELOCATION) { $atom = DFRN::relocate($owner, $owner['uid']); } elseif ($followup) { @@ -298,8 +307,8 @@ class Delivery 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); + $item['entry:comment-allow'] = true; + $item['entry:cid'] = ($top_level ? $contact['id'] : 0); $msgitems[] = $item; } } @@ -307,70 +316,62 @@ class Delivery $atom = DFRN::entries($msgitems, $owner); } - Logger::debug('Notifier entry: ' . $contact["url"] . ' ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' entry: ' . $atom); + Logger::debug('Notifier entry: ' . $contact['url'] . ' ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' entry: ' . $atom); - $protocol = Model\Post\DeliveryData::DFRN; + $protocol = 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 if (!empty($items) && (($items[0]['uid'] == 0) || ($contact['uid'] == 0))) { // Transmit in public if it's a relay post - $public_dfrn = ($contact['contact-type'] == Model\Contact::TYPE_RELAY); + $public_dfrn = ($contact['contact-type'] == Contact::TYPE_RELAY); $deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn); // We never spool failed relay deliveries if ($public_dfrn) { - Logger::info('Relay delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status); + 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); + Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol); - Model\GServer::setProtocol($contact['gsid'] ?? 0, $protocol); + GServer::setProtocol($contact['gsid'] ?? 0, $protocol); } else { - Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']); + Post\DeliveryData::incrementQueueFailed($target_item['uri-id']); } } return; } - if ((($deliver_status < 200) || ($deliver_status > 299)) && (empty($server_protocol) || ($server_protocol == Model\Post\DeliveryData::LEGACY_DFRN))) { + if ((($deliver_status < 200) || ($deliver_status > 299)) && (empty($server_protocol) || ($server_protocol == 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) && (empty($server_protocol) || ($server_protocol == Model\Post\DeliveryData::LEGACY_DFRN))) { - // Legacy DFRN - $deliver_status = DFRN::deliver($owner, $contact, $atom); - $protocol = Model\Post\DeliveryData::LEGACY_DFRN; - } - } else { - $deliver_status = DFRN::deliver($owner, $contact, $atom); - $protocol = Model\Post\DeliveryData::LEGACY_DFRN; } Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id'], 'return' => $deliver_status]); if (($deliver_status >= 200) && ($deliver_status <= 299)) { // We successfully delivered a message, the contact is alive - Model\Contact::unmarkForArchival($contact); + Contact::unmarkForArchival($contact); - Model\GServer::setProtocol($contact['gsid'] ?? 0, $protocol); + GServer::setProtocol($contact['gsid'] ?? 0, $protocol); - if (in_array($cmd, [Delivery::POST, Delivery::POKE])) { - Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol); + if ($cmd == Delivery::POST) { + Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol); } } else { // The message could not be delivered. We mark the contact as "dead" - Model\Contact::markForArchival($contact); + 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])) { - Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']); + if (!Worker::defer() && $cmd == Delivery::POST) { + Post\DeliveryData::incrementQueueFailed($target_item['uri-id']); } } } @@ -386,13 +387,15 @@ class Delivery * @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? + * + * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - private static function deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup) + private static function deliverDiaspora(string $cmd, array $contact, array $owner, array $items, array $target_item, bool $public_message, bool $top_level, bool $followup) { // We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora - $walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != Model\User::ACCOUNT_TYPE_COMMUNITY); + $walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != User::ACCOUNT_TYPE_COMMUNITY); if ($public_message) { $loc = 'public batch ' . $contact['batch']; @@ -402,7 +405,7 @@ class Delivery Logger::notice('Deliver via Diaspora', ['target' => $target_item['id'], 'guid' => $target_item['guid'], 'to' => $loc]); - if (DI::config()->get('system', 'dfrn_only') || !DI::config()->get('system', 'diaspora_enabled')) { + if (!DI::config()->get('system', 'diaspora_enabled')) { return; } @@ -423,51 +426,51 @@ class Delivery $deliver_status = Diaspora::sendAccountMigration($owner, $contact, $owner['uid']); } elseif ($target_item['deleted'] && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) { // top-level retraction - Logger::log('diaspora retract: ' . $loc); + Logger::notice('diaspora retract: ' . $loc); $deliver_status = Diaspora::sendRetraction($target_item, $owner, $contact, $public_message); } elseif ($followup) { // send comments and likes to owner to relay - Logger::log('diaspora followup: ' . $loc); + Logger::notice('diaspora followup: ' . $loc); $deliver_status = Diaspora::sendFollowup($target_item, $owner, $contact, $public_message); } elseif ($target_item['uri'] !== $target_item['parent-uri']) { // we are the relay - send comments, likes and relayable_retractions to our conversants - Logger::log('diaspora relay: ' . $loc); + Logger::notice('diaspora relay: ' . $loc); $deliver_status = Diaspora::sendRelay($target_item, $owner, $contact, $public_message); } elseif ($top_level && !$walltowall) { // currently no workable solution for sending walltowall - Logger::log('diaspora status: ' . $loc); + Logger::notice('diaspora status: ' . $loc); $deliver_status = Diaspora::sendStatus($target_item, $owner, $contact, $public_message); } else { - Logger::log('Unknown mode ' . $cmd . ' for ' . $loc); + Logger::warning('Unknown mode', ['command' => $cmd, 'target' => $loc]); return; } if (($deliver_status >= 200) && ($deliver_status <= 299)) { // We successfully delivered a message, the contact is alive - Model\Contact::unmarkForArchival($contact); + Contact::unmarkForArchival($contact); - Model\GServer::setProtocol($contact['gsid'] ?? 0, Model\Post\DeliveryData::DIASPORA); + GServer::setProtocol($contact['gsid'] ?? 0, Post\DeliveryData::DIASPORA); - if (in_array($cmd, [Delivery::POST, Delivery::POKE])) { - Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::DIASPORA); + if ($cmd == Delivery::POST) { + Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Post\DeliveryData::DIASPORA); } } else { // The message could not be delivered. We mark the contact as "dead" - Model\Contact::markForArchival($contact); + Contact::markForArchival($contact); // When it is delivered to the public endpoint, we do mark the relay contact for archival as well if ($public_message) { Relay::markForArchival($contact); } - if (empty($contact['contact-type']) || ($contact['contact-type'] != Model\Contact::TYPE_RELAY)) { + if (empty($contact['contact-type']) || ($contact['contact-type'] != 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\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']); + if (!Worker::defer() && $cmd == Delivery::POST) { + Post\DeliveryData::incrementQueueFailed($target_item['uri-id']); } - } elseif (in_array($cmd, [Delivery::POST, Delivery::POKE])) { - Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']); + } elseif ($cmd == Delivery::POST) { + Post\DeliveryData::incrementQueueFailed($target_item['uri-id']); } } } @@ -480,12 +483,14 @@ class Delivery * @param array $owner Owner record of the sender * @param array $target_item Item record of the content * @param array $thr_parent Item record of the direct parent in the thread + * + * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent) + private static function deliverMail(string $cmd, array $contact, array $owner, array $target_item, array $thr_parent) { - if (DI::config()->get('system','dfrn_only')) { + if (DI::config()->get('system', 'imap_disabled')) { return; } @@ -494,7 +499,7 @@ class Delivery return; } - if (!in_array($cmd, [self::POST, self::POKE])) { + if ($cmd != self::POST) { return; } @@ -530,7 +535,7 @@ class Delivery // only expose our real email address to true friends - if (($contact['rel'] == Model\Contact::FRIEND) && !$contact['blocked']) { + if (($contact['rel'] == Contact::FRIEND) && !$contact['blocked']) { if ($reply_to) { $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $reply_to . '>' . "\n"; $headers .= 'Sender: ' . $local_user['email'] . "\n"; @@ -556,13 +561,13 @@ class Delivery if (empty($target_item['title'])) { $condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']]; - $title = Model\Post::selectFirst(['title'], $condition); + $title = 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\Post::selectFirst(['title'], $condition); + $title = Post::selectFirst(['title'], $condition); if (DBA::isResult($title) && ($title['title'] != '')) { $subject = $title['title']; @@ -575,10 +580,16 @@ class Delivery } } - Email::send($addr, $subject, $headers, $target_item); - - Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::MAIL); + // Try to send email + $success = Email::send($addr, $subject, $headers, $target_item); - Logger::info('Delivered via mail', ['guid' => $target_item['guid'], 'to' => $addr, 'subject' => $subject]); + if ($success) { + // Success + Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Post\DeliveryData::MAIL); + Logger::info('Delivered via mail', ['guid' => $target_item['guid'], 'to' => $addr, 'subject' => $subject]); + } else { + // Failed + Logger::warning('Delivery of mail has FAILED', ['to' => $addr, 'subject' => $subject, 'guid' => $target_item['guid']]); + } } }