X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=921662a11542c9ecab671686ab25142ebc45b432;hb=295d90d496a56217383481fa7a0153e0ac48e38a;hp=191692a90608eb26b1554895f6256c9710daf8d0;hpb=1696ad962ea4fdae16a6bff29a6a98ee523108e5;p=friendica.git diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 191692a906..921662a115 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -11,16 +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\ItemDeliveryData; -use Friendica\Model\Queue; -use Friendica\Model\User; +use Friendica\Model; use Friendica\Protocol\DFRN; use Friendica\Protocol\Diaspora; use Friendica\Protocol\Email; use Friendica\Util\Strings; use Friendica\Util\Network; +use Friendica\Core\Worker; class Delivery extends BaseObject { @@ -58,17 +55,17 @@ class Delivery extends BaseObject $uid = $target_id; $target_item = []; } else { - $item = Item::selectFirst(['parent'], ['id' => $target_id]); + $item = Model\Item::selectFirst(['parent'], ['id' => $target_id]); if (!DBA::isResult($item) || empty($item['parent'])) { return; } $parent_id = intval($item['parent']); - $condition = ['id' => [$target_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; } @@ -94,7 +91,7 @@ class Delivery extends BaseObject } elseif (!empty($target_item['uid'])) { $uid = $target_item['uid']; } else { - Logger::log('Only public users for item ' . $item_id, Logger::DEBUG); + Logger::log('Only public users for item ' . $target_id, Logger::DEBUG); return; } @@ -152,7 +149,7 @@ class Delivery extends BaseObject 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; } @@ -183,7 +180,7 @@ class Delivery extends BaseObject self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); if (in_array($cmd, [Delivery::POST, Delivery::COMMENT])) { - ItemDeliveryData::incrementQueueDone($target_id); + Model\ItemDeliveryData::incrementQueueDone($target_id); } break; @@ -191,7 +188,7 @@ class Delivery extends BaseObject self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); if (in_array($cmd, [Delivery::POST, Delivery::COMMENT])) { - ItemDeliveryData::incrementQueueDone($target_id); + Model\ItemDeliveryData::incrementQueueDone($target_id); } break; @@ -210,10 +207,6 @@ class Delivery extends BaseObject case Protocol::MAIL: self::deliverMail($cmd, $contact, $owner, $target_item); - - if (in_array($cmd, [Delivery::POST, Delivery::COMMENT])) { - ItemDeliveryData::incrementQueueDone($target_id); - } break; default: @@ -234,6 +227,8 @@ 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) { @@ -241,7 +236,7 @@ class Delivery extends BaseObject 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; @@ -280,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; } @@ -303,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); @@ -327,16 +322,16 @@ class Delivery extends BaseObject 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 ' . defaults($target_item, 'guid', $target_item['id'])); - 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. @@ -355,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']; @@ -418,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) { @@ -452,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"; @@ -477,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'];