X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=c09181d3e6b5a3aa1d84953e0e0bba04f79733e8;hb=60532ee7e4152af9997e0d7b69c7b35262d5528d;hp=af04d91c5f241d2946f8ee65efc061af8c2217ee;hpb=9e1f03ca11ec5efc48c6f503ce16ea5df39c59af;p=friendica.git

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index af04d91c5f..c09181d3e6 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-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,6 +21,8 @@
 
 namespace Friendica\Worker;
 
+use Friendica\Contact\FriendSuggest\Collection\FriendSuggests;
+use Friendica\Contact\FriendSuggest\Exception\FriendSuggestNotFoundException;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -30,13 +32,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\Model\Post;
 use Friendica\Protocol\Relay;
 
 class Delivery
@@ -47,7 +46,6 @@ class Delivery
 	const DELETION      = 'drop';
 	const POST          = 'wall-new';
 	const POKE          = 'poke';
-	const UPLINK        = 'uplink';
 	const REMOVAL       = 'removeme';
 	const PROFILEUPDATE = 'profileupdate';
 
@@ -55,49 +53,35 @@ class Delivery
 	{
 		Logger::info('Invoked', ['cmd' => $cmd, 'target' => $post_uriid, 'sender_uid' => $sender_uid, 'contact' => $contact_id]);
 
-		$target_id = $post_uriid;
-
-		if (!empty($sender_uid)) {
-			$post = Post::selectFirst(['id'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]);
-			if (!DBA::isResult($post)) {
-				Logger::warning('Post not found', ['uri-id' => $post_uriid, 'uid' => $sender_uid]);
-				return;
-			}
-			$target_id = $post['id'];
-		} elseif (!in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION, Delivery::REMOVAL, Delivery::RELOCATION])) {
-			$post = Post::selectFirst(['id', 'uid', 'uri-id'], ['item-id' => $post_uriid]);
-			if (DBA::isResult($post)) {
-				$target_id = $post['id'];
-				$sender_uid = $post['uid'];
-				$post_uriid = $post['uri-id'];
-			}
-		}
-
 		$top_level = false;
 		$followup = false;
 		$public_message = false;
 
 		$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]);
-			if (!DBA::isResult($target_item)) {
+			try {
+				$target_item = DI::fsuggest()->selectOneById($post_uriid)->toArray();
+			} catch (FriendSuggestNotFoundException $e) {
+				DI::logger()->info('Cannot find FriendSuggestion', ['id' => $post_uriid]);
 				return;
 			}
 			$uid = $target_item['uid'];
 		} elseif ($cmd == self::RELOCATION) {
-			$uid = $target_id;
+			$uid = $post_uriid;
 			$target_item = [];
 		} else {
-			$item = Model\Post::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];
@@ -120,12 +104,12 @@ class Delivery
 			DBA::close($itemdata);
 
 			if (empty($target_item)) {
-				Logger::log('Item ' . $target_id . "wasn't found. Quitting here.");
+				Logger::notice('Item ' . $target_id . "wasn't found. Quitting here.");
 				return;
 			}
 
 			if (empty($parent)) {
-				Logger::log('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here.");
+				Logger::notice('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here.");
 				self::setFailedQueue($cmd, $target_item);
 				return;
 			}
@@ -135,7 +119,7 @@ class Delivery
 			} elseif (!empty($target_item['uid'])) {
 				$uid = $target_item['uid'];
 			} else {
-				Logger::log('Only public users for item ' . $target_id, Logger::DEBUG);
+				Logger::info('Only public users for item ' . $target_id);
 				self::setFailedQueue($cmd, $target_item);
 				return;
 			}
@@ -184,7 +168,7 @@ class Delivery
 			 */
 
 			if (!$top_level && ($parent['wall'] == 0) && stristr($target_item['uri'], $localhost)) {
-				Logger::log('Followup ' . $target_item["guid"], Logger::DEBUG);
+				Logger::info('Followup ' . $target_item["guid"]);
 				// local followup to remote post
 				$followup = true;
 			}
@@ -199,7 +183,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);
@@ -228,16 +212,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:
@@ -292,7 +272,7 @@ class Delivery
 	private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup, $server_protocol)
 	{
 		// Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
-		if (Diaspora::isReshare($target_item['body']) && !empty(FContact::getByURL($contact['addr'], false))) {
+		if (Diaspora::isReshare($target_item['body'] ?? '') && !empty(FContact::getByURL($contact['addr'], false))) {
 			Logger::info('Reshare will be transmitted via Diaspora', ['url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
 			self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
 			return;
@@ -307,7 +287,7 @@ class Delivery
 		} elseif ($cmd == self::SUGGESTION) {
 			$item = $target_item;
 			$atom = DFRN::fsuggest($item, $owner);
-			DBA::delete('fsuggest', ['id' => $item['id']]);
+			DI::fsuggest()->delete(new FriendSuggests([DI::fsuggest()->selectOneById($item['id'])]));
 		} elseif ($cmd == self::RELOCATION) {
 			$atom = DFRN::relocate($owner, $owner['uid']);
 		} elseif ($followup) {
@@ -332,40 +312,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.
@@ -397,17 +343,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]);
@@ -459,7 +397,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;
 		}
 
@@ -480,22 +418,22 @@ class Delivery
 			$deliver_status = Diaspora::sendAccountMigration($owner, $contact, $owner['uid']);
 		} elseif ($target_item['deleted'] && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
 			// top-level retraction
-			Logger::log('diaspora retract: ' . $loc);
+			Logger::notice('diaspora retract: ' . $loc);
 			$deliver_status = Diaspora::sendRetraction($target_item, $owner, $contact, $public_message);
 		} elseif ($followup) {
 			// send comments and likes to owner to relay
-			Logger::log('diaspora followup: ' . $loc);
+			Logger::notice('diaspora followup: ' . $loc);
 			$deliver_status = Diaspora::sendFollowup($target_item, $owner, $contact, $public_message);
 		} elseif ($target_item['uri'] !== $target_item['parent-uri']) {
 			// we are the relay - send comments, likes and relayable_retractions to our conversants
-			Logger::log('diaspora relay: ' . $loc);
+			Logger::notice('diaspora relay: ' . $loc);
 			$deliver_status = Diaspora::sendRelay($target_item, $owner, $contact, $public_message);
 		} elseif ($top_level && !$walltowall) {
 			// currently no workable solution for sending walltowall
-			Logger::log('diaspora status: ' . $loc);
+			Logger::notice('diaspora status: ' . $loc);
 			$deliver_status = Diaspora::sendStatus($target_item, $owner, $contact, $public_message);
 		} else {
-			Logger::log('Unknown mode ' . $cmd . ' for ' . $loc);
+			Logger::notice('Unknown mode ' . $cmd . ' for ' . $loc);
 			return;
 		}
 
@@ -542,7 +480,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;
 		}