X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=e0a5c09c270d48ec72a8379d880a44c6d82c8fcf;hb=69e7c7fecac5d315930c52bfa9fb21954dcf8b5e;hp=4387f28b79d40855504f6354084fe0c72f00fdc7;hpb=a785d8c2f9a95b933c8a81566331874e47926dd5;p=friendica.git diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 4387f28b79..e0a5c09c27 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -4,10 +4,12 @@ */ namespace Friendica\Worker; +use Friendica\BaseObject; use Friendica\Core\Config; use Friendica\Core\L10n; +use Friendica\Core\Protocol; use Friendica\Core\System; -use Friendica\Database\DBM; +use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Item; use Friendica\Model\Queue; @@ -15,51 +17,55 @@ use Friendica\Model\User; use Friendica\Protocol\DFRN; use Friendica\Protocol\Diaspora; use Friendica\Protocol\Email; -use dba; require_once 'include/items.php'; -class Delivery { - public static function execute($cmd, $item_id, $contact_id) { - global $a; - +class Delivery extends BaseObject +{ + const MAIL = 'mail'; + const SUGGESTION = 'suggest'; + const RELOCATION = 'relocate'; + const DELETION = 'drop'; + const POST = 'wall-new'; + const COMMENT = 'comment-new'; + const REMOVAL = 'removeme'; + + public static function execute($cmd, $item_id, $contact_id) + { logger('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $contact_id, LOGGER_DEBUG); $top_level = false; $followup = false; $public_message = false; - if ($cmd == DELIVER_MAIL) { - $target_item = dba::selectFirst('mail', [], ['id' => $item_id]); - if (!DBM::is_result($message)) { + if ($cmd == self::MAIL) { + $target_item = DBA::selectFirst('mail', [], ['id' => $item_id]); + if (!DBA::isResult($target_item)) { return; } $uid = $target_item['uid']; - } elseif ($cmd == DELIVER_SUGGESTION) { - $target_item = dba::selectFirst('fsuggest', [], ['id' => $item_id]); - if (!DBM::is_result($message)) { + $items = []; + } elseif ($cmd == self::SUGGESTION) { + $target_item = DBA::selectFirst('fsuggest', [], ['id' => $item_id]); + if (!DBA::isResult($target_item)) { return; } $uid = $target_item['uid']; - } elseif ($cmd == DELIVER_RELOCATION) { + } elseif ($cmd == self::RELOCATION) { $uid = $item_id; } else { - $item = dba::selectFirst('item', ['parent'], ['id' => $item_id]); - if (!DBM::is_result($item) || empty($item['parent'])) { + $item = Item::selectFirst(['parent'], ['id' => $item_id]); + if (!DBA::isResult($item) || empty($item['parent'])) { return; } $parent_id = intval($item['parent']); - $itemdata = dba::p("SELECT `item`.*, `contact`.`uid` AS `cuid`, - `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` - FROM `item` - INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` - WHERE `item`.`id` IN (?, ?) AND `visible` AND NOT `moderated` - ORDER BY `item`.`id`", - $item_id, $parent_id); + $condition = ['id' => [$item_id, $parent_id], 'moderated' => false]; + $params = ['order' => ['id']]; + $itemdata = Item::select([], $condition, $params); + $items = []; - while ($item = dba::fetch($itemdata)) { + while ($item = Item::fetch($itemdata)) { if ($item['id'] == $parent_id) { $parent = $item; } @@ -68,9 +74,19 @@ class Delivery { } $items[] = $item; } - dba::close($itemdata); + DBA::close($itemdata); - $uid = $target_item['cuid']; + if (empty($target_item)) { + logger('Item ' . $item_id . "wasn't found. Quitting here."); + return; + } + + if (empty($parent)) { + logger('Parent ' . $parent_id . ' for item ' . $item_id . "wasn't found. Quitting here."); + return; + } + + $uid = $target_item['contact-uid']; // avoid race condition with deleting entries if ($items[0]['deleted']) { @@ -95,7 +111,7 @@ class Delivery { // if $parent['wall'] == 1 we will already have the parent message in our array // and we will relay the whole lot. - $localhost = $a->get_hostname(); + $localhost = self::getApp()->get_hostname(); if (strpos($localhost, ':')) { $localhost = substr($localhost, 0, strpos($localhost, ':')); } @@ -122,38 +138,42 @@ class Delivery { } } + if (empty($items)) { + logger('No delivery data for ' . $cmd . ' - Item ID: ' .$item_id . ' - Contact ID: ' . $contact_id); + } + $owner = User::getOwnerDataById($uid); - if (!DBM::is_result($owner)) { + if (!DBA::isResult($owner)) { return; } // We don't deliver our items to blocked or pending contacts, and not to ourselves either - $contact = dba::selectFirst('contact', [], + $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'blocked' => false, 'pending' => false, 'self' => false] ); - if (!DBM::is_result($contact)) { + if (!DBA::isResult($contact)) { return; } // Transmit via Diaspora if the thread had started as Diaspora post // This is done since the uri wouldn't match (Diaspora doesn't transmit it) - if (isset($parent) && ($parent['network'] == NETWORK_DIASPORA) && ($contact['network'] == NETWORK_DFRN)) { - $contact['network'] = NETWORK_DIASPORA; + if (isset($parent) && ($parent['network'] == Protocol::DIASPORA) && ($contact['network'] == Protocol::DFRN)) { + $contact['network'] = Protocol::DIASPORA; } logger("Delivering " . $cmd . " followup=$followup - via network " . $contact['network']); switch ($contact['network']) { - case NETWORK_DFRN: + case Protocol::DFRN: self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); break; - case NETWORK_DIASPORA: + case Protocol::DIASPORA: self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); break; - case NETWORK_OSTATUS: + case Protocol::OSTATUS: // Do not send to otatus if we are not configured to send to public networks if ($owner['prvnets']) { break; @@ -166,7 +186,7 @@ class Delivery { // This is done in "notifier.php" (See "url_recipients" and "push_notify") break; - case NETWORK_MAIL: + case Protocol::MAIL: self::deliverMail($cmd, $contact, $owner, $target_item); break; @@ -177,19 +197,31 @@ class Delivery { return; } + /** + * @brief 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? + */ private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup) { - logger('Deliver ' . $target_item["guid"] . ' via DFRN to ' . $contact['addr']); + logger('Deliver ' . $target_item["guid"] . ' via DFRN to ' . (empty($contact['addr']) ? $contact['url'] : $contact['addr'])); - if ($cmd == DELIVER_MAIL) { + if ($cmd == self::MAIL) { $item = $target_item; $item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']); $atom = DFRN::mail($item, $owner); - } elseif ($cmd == DELIVER_SUGGESTION) { + } elseif ($cmd == self::SUGGESTION) { $item = $target_item; $atom = DFRN::fsuggest($item, $owner); - dba::delete('fsuggest', ['id' => $item['id']]); - } elseif ($cmd == DELIVER_RELOCATION) { + DBA::delete('fsuggest', ['id' => $item['id']]); + } elseif ($cmd == self::RELOCATION) { $atom = DFRN::relocate($owner, $owner['uid']); } elseif ($followup) { $msgitems = [$target_item]; @@ -198,25 +230,25 @@ class Delivery { $msgitems = []; foreach ($items as $item) { // Only add the parent when we don't delete other items. - if (($target_item['id'] == $item['id']) || ($cmd != DELIVER_DELETION)) { + 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); + $atom = DFRN::entries($msgitems, $owner); } logger('Notifier entry: ' . $contact["url"] . ' ' . $target_item["guid"] . ' entry: ' . $atom, LOGGER_DATA); - $basepath = implode('/', array_slice(explode('/',$contact['url']),0,3)); + $basepath = implode('/', array_slice(explode('/', $contact['url']), 0, 3)); // perform local delivery if we are on the same site if (link_compare($basepath, System::baseUrl())) { $condition = ['nurl' => normalise_link($contact['url']), 'self' => true]; - $target_self = dba::selectFirst('contact', ['uid'], $condition); - if (!DBM::is_result($target_self)) { + $target_self = DBA::selectFirst('contact', ['uid'], $condition); + if (!DBA::isResult($target_self)) { return; } $target_uid = $target_self['uid']; @@ -231,26 +263,31 @@ class Delivery { } } - // We now have some contact, so we fetch it - $target_importer = dba::fetch_first("SELECT *, `name` as `senderName` - FROM `contact` - WHERE NOT `blocked` AND `id` = ? LIMIT 1", - $cid); - - // This should never fail - if (!DBM::is_result($target_importer)) { + $target_importer = DFRN::getImporter($cid, $target_uid); + if (empty($target_importer)) { + // This should never happen return; } - // Set the user id. This is important if this is a public contact - $target_importer['importer_uid'] = $target_uid; DFRN::import($atom, $target_importer); return; } - if ($items[0]['uid'] == 0) { - $deliver_status = DFRN::transmit($owner, $contact, $atom); - if ($deliver_status < 200) { + // 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'] == Contact::ACCOUNT_TYPE_RELAY); + + $deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn); + + // We never spool failed relay deliveries + if ($public_dfrn) { + logger('Relay delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status); + return; + } + + if (($deliver_status < 200) || ($deliver_status > 299)) { // Transmit via Diaspora if not possible via Friendica self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); return; @@ -263,7 +300,7 @@ class Delivery { if ($deliver_status < 0) { logger('Delivery failed: queuing message ' . $target_item["guid"] ); - Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']); + Queue::add($contact['id'], Protocol::DFRN, $atom, false, $target_item['guid']); } if (($deliver_status >= 200) && ($deliver_status <= 299)) { @@ -272,13 +309,29 @@ class Delivery { } else { // The message could not be delivered. We mark the contact as "dead" Contact::markForArchival($contact); + + // Transmit via Diaspora when all other methods (legacy DFRN and new one) are failing. + // This is a fallback for systems that don't know the new methods. + self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); } } + /** + * @brief Deliver content via Diaspora + * + * @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? + */ private static function deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $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'] != ACCOUNT_TYPE_COMMUNITY); + $walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY); if ($public_message) { $loc = 'public batch ' . $contact['batch']; @@ -291,12 +344,12 @@ class Delivery { if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) { return; } - if ($cmd == DELIVER_MAIL) { + if ($cmd == self::MAIL) { Diaspora::sendMail($target_item, $owner, $contact); return; } - if ($cmd == DELIVER_SUGGESTION) { + if ($cmd == self::SUGGESTION) { return; } if (!$contact['pubkey'] && !$public_message) { @@ -307,7 +360,7 @@ class Delivery { logger('diaspora retract: ' . $loc); Diaspora::sendRetraction($target_item, $owner, $contact, $public_message); return; - } elseif ($cmd == DELIVER_RELOCATION) { + } elseif ($cmd == self::RELOCATION) { Diaspora::sendAccountMigration($owner, $contact, $owner['uid']); return; } elseif ($followup) { @@ -330,10 +383,16 @@ class Delivery { logger('Unknown mode ' . $cmd . ' for ' . $loc); } + /** + * @brief Deliver content via mail + * + * @param string $cmd Command + * @param array $contact Contact record of the receiver + * @param array $owner Owner record of the sender + * @param array $target_item Item record of the content + */ private static function deliverMail($cmd, $contact, $owner, $target_item) { - global $a; - if (Config::get('system','dfrn_only')) { return; } @@ -344,20 +403,20 @@ class Delivery { return; } - if (!in_array($cmd, [DELIVER_POST, DELIVER_COMMENT])) { + if (!in_array($cmd, [self::POST, self::COMMENT])) { return; } - $local_user = dba::selectFirst('user', [], ['uid' => $owner['uid']]); - if (!DBM::is_result($local_user)) { + $local_user = DBA::selectFirst('user', [], ['uid' => $owner['uid']]); + if (!DBA::isResult($local_user)) { return; } logger('Deliver ' . $target_item["guid"] . ' via mail to ' . $contact['addr']); $reply_to = ''; - $mailacct = dba::selectFirst('mailacct', ['reply_to'], ['uid' => $owner['uid']]); - if (DBM::is_result($mailacct) && !empty($mailacct['reply_to'])) { + $mailacct = DBA::selectFirst('mailacct', ['reply_to'], ['uid' => $owner['uid']]); + if (DBA::isResult($mailacct) && !empty($mailacct['reply_to'])) { $reply_to = $mailacct['reply_to']; } @@ -365,7 +424,7 @@ class Delivery { // only expose our real email address to true friends - if (($contact['rel'] == CONTACT_IS_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"; @@ -373,7 +432,7 @@ 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') . ' get_hostname() . '>' . "\n"; + $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' get_hostname() . '>' . "\n"; } $headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n"; @@ -385,25 +444,30 @@ class Delivery { if (($target_item["thr-parent"] != "") && ($target_item["thr-parent"] != $target_item["parent-uri"])) { $headers .= " <".Email::iri2msgid($target_item["thr-parent"]).">"; } + $headers .= "\n"; if (empty($target_item['title'])) { $condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']]; - $title = dba::selectFirst('item', ['title'], $condition); - if (DBM::is_result($title) && ($title['title'] != '')) { + $title = Item::selectFirst(['title'], $condition); + + if (DBA::isResult($title) && ($title['title'] != '')) { $subject = $title['title']; } else { $condition = ['parent-uri' => $target_item['parent-uri'], 'uid' => $owner['uid']]; - $title = dba::selectFirst('item', ['title'], $condition); - if (DBM::is_result($title) && ($title['title'] != '')) { + $title = Item::selectFirst(['title'], $condition); + + if (DBA::isResult($title) && ($title['title'] != '')) { $subject = $title['title']; } } } - if (strncasecmp($subject, 'RE:', 3)) { + + if (strncasecmp($subject, 'RE:', 3)) { $subject = 'Re: ' . $subject; } } + Email::send($addr, $subject, $headers, $target_item); } }