X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=8961b3f13d71d935f8947b05204117fe28a1993e;hb=f6faae5bb10299c81ab4ca2e94463246e47cacf7;hp=bd97b267222b799bc6ae5c31d8bcad4c25597f4b;hpb=122ad0af14f046c2462a03fe33967dc41abfc8b5;p=friendica.git

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index bd97b26722..8961b3f13d 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -30,11 +30,10 @@ use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\Activity;
-use Friendica\Util\Strings;
 use Friendica\Util\Network;
 use Friendica\Core\Worker;
-use Friendica\Model\Conversation;
 use Friendica\Model\FContact;
+use Friendica\Model\Item;
 use Friendica\Protocol\Relay;
 
 class Delivery
@@ -49,9 +48,9 @@ class Delivery
 	const REMOVAL       = 'removeme';
 	const PROFILEUPDATE = 'profileupdate';
 
-	public static function execute($cmd, $target_id, $contact_id)
+	public static function execute(string $cmd, int $post_uriid, int $contact_id, int $sender_uid = 0)
 	{
-		Logger::info('Invoked', ['cmd' => $cmd, 'target' => $target_id, 'contact' => $contact_id]);
+		Logger::info('Invoked', ['cmd' => $cmd, 'target' => $post_uriid, 'sender_uid' => $sender_uid, 'contact' => $contact_id]);
 
 		$top_level = false;
 		$followup = false;
@@ -59,32 +58,34 @@ class Delivery
 
 		$items = [];
 		if ($cmd == self::MAIL) {
-			$target_item = DBA::selectFirst('mail', [], ['id' => $target_id]);
+			$target_item = DBA::selectFirst('mail', [], ['id' => $post_uriid]);
 			if (!DBA::isResult($target_item)) {
 				return;
 			}
 			$uid = $target_item['uid'];
 		} elseif ($cmd == self::SUGGESTION) {
-			$target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]);
+			$target_item = DBA::selectFirst('fsuggest', [], ['id' => $post_uriid]);
 			if (!DBA::isResult($target_item)) {
 				return;
 			}
 			$uid = $target_item['uid'];
 		} elseif ($cmd == self::RELOCATION) {
-			$uid = $target_id;
+			$uid = $post_uriid;
 			$target_item = [];
 		} else {
-			$item = Model\Item::selectFirst(['parent'], ['id' => $target_id]);
+			$item = Model\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;
 			}
+			$target_id = intval($item['id']);
 			$parent_id = intval($item['parent']);
 
-			$condition = ['id' => [$target_id, $parent_id], 'visible' => true, 'moderated' => false];
+			$condition = ['id' => [$target_id, $parent_id], 'visible' => true];
 			$params = ['order' => ['id']];
-			$itemdata = Model\Item::select([], $condition, $params);
+			$itemdata = Model\Post::select(Item::DELIVER_FIELDLIST, $condition, $params);
 
-			while ($item = Model\Item::fetch($itemdata)) {
+			while ($item = Model\Post::fetch($itemdata)) {
 				if ($item['verb'] == Activity::ANNOUNCE) {
 					continue;
 				}
@@ -121,7 +122,7 @@ class Delivery
 			}
 
 			$condition = ['uri' => $target_item['thr-parent'], 'uid' => $target_item['uid']];
-			$thr_parent = Model\Item::selectFirst(['network', 'object'], $condition);
+			$thr_parent = Model\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.
@@ -179,7 +180,7 @@ class Delivery
 		}
 
 		if (empty($items)) {
-			Logger::log('No delivery data for  ' . $cmd . ' - Item ID: ' .$target_id . ' - Contact ID: ' . $contact_id);
+			Logger::notice('No delivery data', ['command' => $cmd, 'uri-id' => $post_uriid, 'cid' => $contact_id]);
 		}
 
 		$owner = Model\User::getOwnerDataById($uid);
@@ -208,16 +209,12 @@ class Delivery
 		// 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;
 		}
 
-		// Ensure that local contacts are delivered locally
-		if (Model\Contact::isLocal($contact['url'])) {
-			$contact['network'] = Protocol::DFRN;
-		}
-
-		Logger::notice('Delivering', ['cmd' => $cmd, 'target' => $target_id, 'followup' => $followup, 'network' => $contact['network']]);
+		Logger::notice('Delivering', ['cmd' => $cmd, 'uri-id' => $post_uriid, 'followup' => $followup, 'network' => $contact['network']]);
 
 		switch ($contact['network']) {
 			case Protocol::DFRN:
@@ -312,40 +309,6 @@ class Delivery
 
 		Logger::debug('Notifier entry: ' . $contact["url"] . ' ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' entry: ' . $atom);
 
-		// perform local delivery if we are on the same site
-		if (Model\Contact::isLocal($contact['url'])) {
-			$condition = ['nurl' => Strings::normaliseLink($contact['url']), 'self' => true];
-			$target_self = DBA::selectFirst('contact', ['uid'], $condition);
-			if (!DBA::isResult($target_self)) {
-				return;
-			}
-			$target_uid = $target_self['uid'];
-
-			// Check if the user has got this contact
-			$cid = Model\Contact::getIdForURL($owner['url'], $target_uid);
-			if (!$cid) {
-				// Otherwise there should be a public contact
-				$cid = Model\Contact::getIdForURL($owner['url']);
-				if (!$cid) {
-					return;
-				}
-			}
-
-			$target_importer = DFRN::getImporter($cid, $target_uid);
-			if (empty($target_importer)) {
-				// This should never happen
-				return;
-			}
-
-			DFRN::import($atom, $target_importer, Conversation::PARCEL_LOCAL_DFRN, Conversation::PUSH);
-
-			if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
-				Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::DFRN);
-			}
-
-			return;
-		}
-
 		$protocol = Model\Post\DeliveryData::DFRN;
 
 		// We don't have a relationship with contacts on a public post.
@@ -377,17 +340,9 @@ class Delivery
 				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]);
@@ -439,7 +394,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;
 		}
 
@@ -522,7 +477,7 @@ class Delivery
 	 */
 	private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent)
 	{
-		if (DI::config()->get('system','dfrn_only')) {
+		if (DI::config()->get('system','imap_disabled')) {
 			return;
 		}
 
@@ -593,13 +548,13 @@ class Delivery
 
 			if (empty($target_item['title'])) {
 				$condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
-				$title = Model\Item::selectFirst(['title'], $condition);
+				$title = Model\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\Item::selectFirst(['title'], $condition);
+					$title = Model\Post::selectFirst(['title'], $condition);
 
 					if (DBA::isResult($title) && ($title['title'] != '')) {
 						$subject = $title['title'];