X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=921662a11542c9ecab671686ab25142ebc45b432;hb=e3caf0f4f556b5d918b4745498e1e3c5cf8dfce8;hp=59d506af3dd6ad4499e9879254351aa6308bb610;hpb=8821d33f73785884cfce83e7b23d3ef19cc1bc11;p=friendica.git diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 59d506af3d..921662a115 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -11,15 +11,13 @@ use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Database\DBA; -use Friendica\Model\Contact; -use Friendica\Model\Item; -use Friendica\Model\Queue; -use Friendica\Model\User; +use Friendica\Model; use Friendica\Protocol\DFRN; use Friendica\Protocol\Diaspora; use Friendica\Protocol\Email; - -require_once 'include/items.php'; +use Friendica\Util\Strings; +use Friendica\Util\Network; +use Friendica\Core\Worker; class Delivery extends BaseObject { @@ -32,9 +30,9 @@ class Delivery extends BaseObject const REMOVAL = 'removeme'; const PROFILEUPDATE = 'profileupdate'; - public static function execute($cmd, $item_id, $contact_id) + public static function execute($cmd, $target_id, $contact_id) { - Logger::log('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $contact_id, Logger::DEBUG); + Logger::log('Invoked: ' . $cmd . ': ' . $target_id . ' to ' . $contact_id, Logger::DEBUG); $top_level = false; $followup = false; @@ -42,36 +40,36 @@ class Delivery extends BaseObject $items = []; if ($cmd == self::MAIL) { - $target_item = DBA::selectFirst('mail', [], ['id' => $item_id]); + $target_item = DBA::selectFirst('mail', [], ['id' => $target_id]); if (!DBA::isResult($target_item)) { return; } $uid = $target_item['uid']; } elseif ($cmd == self::SUGGESTION) { - $target_item = DBA::selectFirst('fsuggest', [], ['id' => $item_id]); + $target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]); if (!DBA::isResult($target_item)) { return; } $uid = $target_item['uid']; } elseif ($cmd == self::RELOCATION) { - $uid = $item_id; + $uid = $target_id; $target_item = []; } else { - $item = Item::selectFirst(['parent'], ['id' => $item_id]); + $item = Model\Item::selectFirst(['parent'], ['id' => $target_id]); if (!DBA::isResult($item) || empty($item['parent'])) { return; } $parent_id = intval($item['parent']); - $condition = ['id' => [$item_id, $parent_id], 'moderated' => false]; + $condition = ['id' => [$target_id, $parent_id], 'visible' => true, 'moderated' => false]; $params = ['order' => ['id']]; - $itemdata = Item::select([], $condition, $params); + $itemdata = Model\Item::select([], $condition, $params); - while ($item = Item::fetch($itemdata)) { + while ($item = Model\Item::fetch($itemdata)) { if ($item['id'] == $parent_id) { $parent = $item; } - if ($item['id'] == $item_id) { + if ($item['id'] == $target_id) { $target_item = $item; } $items[] = $item; @@ -79,16 +77,23 @@ class Delivery extends BaseObject DBA::close($itemdata); if (empty($target_item)) { - Logger::log('Item ' . $item_id . "wasn't found. Quitting here."); + Logger::log('Item ' . $target_id . "wasn't found. Quitting here."); return; } if (empty($parent)) { - Logger::log('Parent ' . $parent_id . ' for item ' . $item_id . "wasn't found. Quitting here."); + Logger::log('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here."); return; } - $uid = $target_item['contact-uid']; + if (!empty($target_item['contact-uid'])) { + $uid = $target_item['contact-uid']; + } elseif (!empty($target_item['uid'])) { + $uid = $target_item['uid']; + } else { + Logger::log('Only public users for item ' . $target_id, Logger::DEBUG); + return; + } // avoid race condition with deleting entries if ($items[0]['deleted']) { @@ -100,7 +105,7 @@ class Delivery extends BaseObject // 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'] == $item_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) { + if ((($parent['id'] == $target_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) { Logger::log('Top level post'); $top_level = true; } @@ -141,10 +146,10 @@ class Delivery extends BaseObject } if (empty($items)) { - Logger::log('No delivery data for ' . $cmd . ' - Item ID: ' .$item_id . ' - Contact ID: ' . $contact_id); + Logger::log('No delivery data for ' . $cmd . ' - Item ID: ' .$target_id . ' - Contact ID: ' . $contact_id); } - $owner = User::getOwnerDataById($uid); + $owner = Model\User::getOwnerDataById($uid); if (!DBA::isResult($owner)) { return; } @@ -157,6 +162,10 @@ class Delivery extends BaseObject return; } + if (Network::isUrlBlocked($contact['url'])) { + 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'] == Protocol::DIASPORA) && ($contact['network'] == Protocol::DFRN)) { @@ -169,10 +178,18 @@ class Delivery extends BaseObject case Protocol::DFRN: self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); + + if (in_array($cmd, [Delivery::POST, Delivery::COMMENT])) { + Model\ItemDeliveryData::incrementQueueDone($target_id); + } break; case Protocol::DIASPORA: self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); + + if (in_array($cmd, [Delivery::POST, Delivery::COMMENT])) { + Model\ItemDeliveryData::incrementQueueDone($target_id); + } break; case Protocol::OSTATUS: @@ -210,14 +227,16 @@ class Delivery extends BaseObject * @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? + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup) { - Logger::log('Deliver ' . $target_item["guid"] . ' via DFRN to ' . (empty($contact['addr']) ? $contact['url'] : $contact['addr'])); + Logger::log('Deliver ' . defaults($target_item, 'guid', $target_item['id']) . ' via DFRN to ' . (empty($contact['addr']) ? $contact['url'] : $contact['addr'])); if ($cmd == self::MAIL) { $item = $target_item; - $item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']); + $item['body'] = Model\Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']); $atom = DFRN::mail($item, $owner); } elseif ($cmd == self::SUGGESTION) { $item = $target_item; @@ -241,14 +260,14 @@ class Delivery extends BaseObject $atom = DFRN::entries($msgitems, $owner); } - Logger::log('Notifier entry: ' . $contact["url"] . ' ' . $target_item["guid"] . ' entry: ' . $atom, Logger::DATA); + Logger::log('Notifier entry: ' . $contact["url"] . ' ' . defaults($target_item, 'guid', $target_item['id']) . ' entry: ' . $atom, Logger::DATA); $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]; + if (Strings::compareLink($basepath, System::baseUrl())) { + $condition = ['nurl' => Strings::normaliseLink($contact['url']), 'self' => true]; $target_self = DBA::selectFirst('contact', ['uid'], $condition); if (!DBA::isResult($target_self)) { return; @@ -256,10 +275,10 @@ class Delivery extends BaseObject $target_uid = $target_self['uid']; // Check if the user has got this contact - $cid = Contact::getIdForURL($owner['url'], $target_uid); + $cid = Model\Contact::getIdForURL($owner['url'], $target_uid); if (!$cid) { // Otherwise there should be a public contact - $cid = Contact::getIdForURL($owner['url']); + $cid = Model\Contact::getIdForURL($owner['url']); if (!$cid) { return; } @@ -279,7 +298,7 @@ class Delivery extends BaseObject // 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); + $public_dfrn = ($contact['contact-type'] == Model\Contact::TYPE_RELAY); $deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn); @@ -300,19 +319,19 @@ class Delivery extends BaseObject $deliver_status = DFRN::deliver($owner, $contact, $atom, false, true); } - Logger::log('Delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status); + Logger::log('Delivery to ' . $contact['url'] . ' with guid ' . defaults($target_item, 'guid', $target_item['id']) . ' returns ' . $deliver_status); if ($deliver_status < 0) { - Logger::log('Delivery failed: queuing message ' . $target_item["guid"] ); - Queue::add($contact['id'], Protocol::DFRN, $atom, false, $target_item['guid']); + Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]); + Worker::defer(); } if (($deliver_status >= 200) && ($deliver_status <= 299)) { // We successfully delivered a message, the contact is alive - Contact::unmarkForArchival($contact); + Model\Contact::unmarkForArchival($contact); } else { // The message could not be delivered. We mark the contact as "dead" - Contact::markForArchival($contact); + Model\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. @@ -331,11 +350,13 @@ class Delivery extends BaseObject * @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? + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ 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'] != Contact::ACCOUNT_TYPE_COMMUNITY); + $walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != Model\User::ACCOUNT_TYPE_COMMUNITY); if ($public_message) { $loc = 'public batch ' . $contact['batch']; @@ -343,7 +364,7 @@ class Delivery extends BaseObject $loc = $contact['addr']; } - Logger::log('Deliver ' . $target_item["guid"] . ' via Diaspora to ' . $loc); + Logger::log('Deliver ' . defaults($target_item, 'guid', $target_item['id']) . ' via Diaspora to ' . $loc); if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) { return; @@ -359,14 +380,14 @@ class Delivery extends BaseObject if (!$contact['pubkey'] && !$public_message) { return; } - if (($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) { + if ($cmd == self::RELOCATION) { + Diaspora::sendAccountMigration($owner, $contact, $owner['uid']); + return; + } elseif ($target_item['deleted'] && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) { // top-level retraction Logger::log('diaspora retract: ' . $loc); Diaspora::sendRetraction($target_item, $owner, $contact, $public_message); return; - } elseif ($cmd == self::RELOCATION) { - Diaspora::sendAccountMigration($owner, $contact, $owner['uid']); - return; } elseif ($followup) { // send comments and likes to owner to relay Logger::log('diaspora followup: ' . $loc); @@ -394,6 +415,8 @@ class Delivery extends BaseObject * @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 + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function deliverMail($cmd, $contact, $owner, $target_item) { @@ -428,7 +451,7 @@ class Delivery extends BaseObject // only expose our real email address to true friends - if (($contact['rel'] == Contact::FRIEND) && !$contact['blocked']) { + if (($contact['rel'] == Model\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"; @@ -453,13 +476,13 @@ class Delivery extends BaseObject if (empty($target_item['title'])) { $condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']]; - $title = Item::selectFirst(['title'], $condition); + $title = Model\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 = Item::selectFirst(['title'], $condition); + $title = Model\Item::selectFirst(['title'], $condition); if (DBA::isResult($title) && ($title['title'] != '')) { $subject = $title['title'];