X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FWorker%2FDelivery.php;h=e0a5c09c270d48ec72a8379d880a44c6d82c8fcf;hb=69e7c7fecac5d315930c52bfa9fb21954dcf8b5e;hp=0c8ff27faf894d576303bba0a30decf2d61e8ce3;hpb=4d35e228c41a1fc6a6de9f50b8ec5c5bb45a9c2d;p=friendica.git

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 0c8ff27faf..e0a5c09c27 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -7,8 +7,9 @@ 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;
@@ -16,7 +17,6 @@ use Friendica\Model\User;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
-use dba;
 
 require_once 'include/items.php';
 
@@ -39,14 +39,15 @@ class Delivery extends BaseObject
 		$public_message = false;
 
 		if ($cmd == self::MAIL) {
-			$target_item = dba::selectFirst('mail', [], ['id' => $item_id]);
-			if (!DBM::is_result($target_item)) {
+			$target_item = DBA::selectFirst('mail', [], ['id' => $item_id]);
+			if (!DBA::isResult($target_item)) {
 				return;
 			}
 			$uid = $target_item['uid'];
+			$items = [];
 		} elseif ($cmd == self::SUGGESTION) {
-			$target_item = dba::selectFirst('fsuggest', [], ['id' => $item_id]);
-			if (!DBM::is_result($target_item)) {
+			$target_item = DBA::selectFirst('fsuggest', [], ['id' => $item_id]);
+			if (!DBA::isResult($target_item)) {
 				return;
 			}
 			$uid = $target_item['uid'];
@@ -54,12 +55,12 @@ class Delivery extends BaseObject
 			$uid = $item_id;
 		} else {
 			$item = Item::selectFirst(['parent'], ['id' => $item_id]);
-			if (!DBM::is_result($item) || empty($item['parent'])) {
+			if (!DBA::isResult($item) || empty($item['parent'])) {
 				return;
 			}
 			$parent_id = intval($item['parent']);
 
-			$condition = ['id' => [$item_id, $parent_id], 'visible' => true, 'moderated' => false];
+			$condition = ['id' => [$item_id, $parent_id], 'moderated' => false];
 			$params = ['order' => ['id']];
 			$itemdata = Item::select([], $condition, $params);
 
@@ -73,7 +74,17 @@ class Delivery extends BaseObject
 				}
 				$items[] = $item;
 			}
-			dba::close($itemdata);
+			DBA::close($itemdata);
+
+			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'];
 
@@ -127,38 +138,42 @@ class Delivery extends BaseObject
 			}
 		}
 
+		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;
@@ -171,7 +186,7 @@ class Delivery extends BaseObject
 				// 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;
 
@@ -205,7 +220,7 @@ class Delivery extends BaseObject
 		} elseif ($cmd == self::SUGGESTION) {
 			$item = $target_item;
 			$atom = DFRN::fsuggest($item, $owner);
-			dba::delete('fsuggest', ['id' => $item['id']]);
+			DBA::delete('fsuggest', ['id' => $item['id']]);
 		} elseif ($cmd == self::RELOCATION) {
 			$atom = DFRN::relocate($owner, $owner['uid']);
 		} elseif ($followup) {
@@ -232,8 +247,8 @@ class Delivery extends BaseObject
 
 		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'];
@@ -248,28 +263,21 @@ class Delivery extends BaseObject
 				}
 			}
 
-			// 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;
 		}
 
 		// 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 (($items[0]['uid'] == 0) || ($contact['uid'] == 0)) {
+		if (!empty($items) && (($items[0]['uid'] == 0) || ($contact['uid'] == 0))) {
 			// Transmit in public if it's a relay post
-			$public_dfrn = ($contact['contact-type'] == ACCOUNT_TYPE_RELAY);
+			$public_dfrn = ($contact['contact-type'] == Contact::ACCOUNT_TYPE_RELAY);
 
 			$deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn);
 
@@ -292,7 +300,7 @@ class Delivery extends BaseObject
 
 		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)) {
@@ -301,6 +309,10 @@ class Delivery extends BaseObject
 		} 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);
 		}
 	}
 
@@ -319,7 +331,7 @@ class Delivery extends BaseObject
 	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'];
@@ -395,16 +407,16 @@ class Delivery extends BaseObject
 			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'];
 		}
 
@@ -412,7 +424,7 @@ class Delivery extends BaseObject
 
 		// 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";
@@ -432,25 +444,30 @@ class Delivery extends BaseObject
 			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 = Item::selectFirst(['title'], $condition);
-				if (DBM::is_result($title) && ($title['title'] != '')) {
+
+				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);
-					if (DBM::is_result($title) && ($title['title'] != '')) {
+
+					if (DBA::isResult($title) && ($title['title'] != '')) {
 						$subject = $title['title'];
 					}
 				}
 			}
+
 			if (strncasecmp($subject, 'RE:', 3)) {
 				$subject = 'Re: ' . $subject;
 			}
 		}
+
 		Email::send($addr, $subject, $headers, $target_item);
 	}
 }