X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FNotifier.php;h=02e69064c5bf6b20e7a234114c4832f9de1912b9;hb=282bc019943b22b1004c0d37d976116c43e5763b;hp=e4e72023616bf28d4c4b1e2d7bfb5017ec12ae2e;hpb=83c3744628d83dcb7a7452d543a379686f6aa0e4;p=friendica.git

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index e4e7202361..02e69064c5 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -4,28 +4,28 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Addon;
+use Friendica\BaseObject;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
+use Friendica\Model\ItemDeliveryData;
+use Friendica\Model\PushSubscriber;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
-use dba;
 
-require_once 'include/dba.php';
 require_once 'include/items.php';
 
-/*
- * This file was at one time responsible for doing all deliveries, but this caused
- * big problems when the process was killed or stalled during the delivery process.
- * It now invokes separate queues that are delivering via delivery.php and pubsubpublish.php.
- */
-
 /*
  * The notifier is typically called with:
  *
@@ -51,97 +51,71 @@ require_once 'include/items.php';
  * and ITEM_ID is the id of the item in the database that needs to be sent to others.
  */
 
-class Notifier {
-	public static function execute($cmd, $item_id) {
-		global $a;
+class Notifier
+{
+	public static function execute($cmd, $target_id)
+	{
+		$a = BaseObject::getApp();
 
-		logger('notifier: invoked: '.$cmd.': '.$item_id, LOGGER_DEBUG);
+		Logger::log('Invoked: ' . $cmd . ': ' . $target_id, Logger::DEBUG);
 
-		$mail = false;
-		$fsuggest = false;
-		$relocate = false;
 		$top_level = false;
 		$recipients = [];
 		$url_recipients = [];
 
-		$normal_mode = true;
-		$recipients_relocate = [];
+		$delivery_contacts_stmt = null;
+		$target_item = [];
+		$items = [];
+		$delivery_queue_count = 0;
 
-		if ($cmd === 'mail') {
-			$normal_mode = false;
-			$mail = true;
-			$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
-					intval($item_id)
-			);
-			if (!count($message)) {
-				return;
-			}
-			$uid = $message[0]['uid'];
-			$recipients[] = $message[0]['contact-id'];
-			$item = $message[0];
-		} elseif ($cmd === 'suggest') {
-			$normal_mode = false;
-			$fsuggest = true;
-
-			$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
-				intval($item_id)
-			);
-			if (!count($suggest)) {
-				return;
-			}
-			$uid = $suggest[0]['uid'];
-			$recipients[] = $suggest[0]['cid'];
-			$item = $suggest[0];
-		} elseif ($cmd === 'removeme') {
-			$r = q("SELECT `contact`.*, `user`.`prvkey` AS `uprvkey`,
-					`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
-					`user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`, `user`.`guid`
-				FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-					WHERE `contact`.`uid` = %d AND `contact`.`self` LIMIT 1",
-					intval($item_id));
-			if (!$r) {
+		if ($cmd == Delivery::MAIL) {
+			$message = DBA::selectFirst('mail', ['uid', 'contact-id'], ['id' => $target_id]);
+			if (!DBA::isResult($message)) {
 				return;
 			}
-			$user = $r[0];
-
-			$r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id));
-			if (!$r) {
+			$uid = $message['uid'];
+			$recipients[] = $message['contact-id'];
+		} elseif ($cmd == Delivery::SUGGESTION) {
+			$suggest = DBA::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $target_id]);
+			if (!DBA::isResult($suggest)) {
 				return;
 			}
-			foreach ($r as $contact) {
-				Contact::terminateFriendship($user, $contact);
-			}
-			return;
-		} elseif ($cmd === 'relocate') {
-			$normal_mode = false;
-			$relocate = true;
-			$uid = $item_id;
-
-			$recipients_relocate = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND `network` IN ('%s', '%s')",
-						intval($uid), NETWORK_DFRN, NETWORK_DIASPORA);
+			$uid = $suggest['uid'];
+			$recipients[] = $suggest['cid'];
+		} elseif ($cmd == Delivery::REMOVAL) {
+			return self::notifySelfRemoval($target_id, $a->queue['priority'], $a->queue['created']);
+		} elseif ($cmd == Delivery::RELOCATION) {
+			$uid = $target_id;
+
+			$condition = ['uid' => $target_id, 'self' => false, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
+			$delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'network', 'batch'], $condition);
 		} else {
 			// find ancestors
-			$target_item = dba::fetch_first("SELECT `item`.*, `contact`.`uid` AS `cuid` FROM `item`
-						INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-						WHERE `item`.`id` = ? AND `visible` AND NOT `moderated`", $item_id);
+			$condition = ['id' => $target_id, 'visible' => true, 'moderated' => false];
+			$target_item = Item::selectFirst([], $condition);
 
-			if (!DBM::is_result($target_item) || !intval($target_item['parent'])) {
+			if (!DBA::isResult($target_item) || !intval($target_item['parent'])) {
 				return;
 			}
 
-			$parent_id = intval($target_item['parent']);
-			$uid = $target_item['cuid'];
-			$updated = $target_item['edited'];
-
-			$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
-				FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible AND NOT moderated ORDER BY `id` ASC",
-				intval($parent_id)
-			);
+			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;
+			}
 
-			if (!count($items)) {
+			$condition = ['parent' => $target_item['parent'], 'visible' => true, 'moderated' => false];
+			$params = ['order' => ['id']];
+			$items_stmt = Item::select([], $condition, $params);
+			if (!DBA::isResult($items_stmt)) {
 				return;
 			}
 
+			$items = Item::inArray($items_stmt);
+
 			// avoid race condition with deleting entries
 			if ($items[0]['deleted']) {
 				foreach ($items as $item) {
@@ -150,7 +124,7 @@ class Notifier {
 			}
 
 			if ((count($items) == 1) && ($items[0]['id'] === $target_item['id']) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
-				logger('notifier: top level post');
+				Logger::log('Top level post');
 				$top_level = true;
 			}
 		}
@@ -160,8 +134,6 @@ class Notifier {
 			return;
 		}
 
-		$walltowall = ($top_level && ($owner['id'] != $items[0]['contact-id']) ? true : false);
-
 		// Should the post be transmitted to Diaspora?
 		$diaspora_delivery = true;
 
@@ -174,23 +146,19 @@ class Notifier {
 		// Deliver directly to a forum, don't PuSH
 		$direct_forum_delivery = false;
 
-		// fill this in with a single salmon slap if applicable
-		$slap = '';
-
 		$followup = false;
 		$recipients_followup = [];
-		$conversants = [];
-		$sql_extra = '';
-		if (! ($mail || $fsuggest || $relocate)) {
-
-			$slap = OStatus::salmon($target_item, $owner);
 
+		if (!empty($target_item) && !empty($items)) {
 			$parent = $items[0];
 
-			$thr_parent = q("SELECT `network`, `author-link`, `owner-link` FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
-				dbesc($target_item["thr-parent"]), intval($target_item["uid"]));
+			$delivery_queue_count += self::activityPubDelivery($cmd, $target_item, $parent, $a->queue['priority'], $a->query_string['created']);
 
-			logger('GUID: '.$target_item["guid"].': Parent is '.$parent['network'].'. Thread parent is '.$thr_parent[0]['network'], LOGGER_DEBUG);
+			$fields = ['network', 'author-id', 'owner-id'];
+			$condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]];
+			$thr_parent = Item::selectFirst($fields, $condition);
+
+			Logger::log('GUID: ' . $target_item["guid"] . ': Parent is ' . $parent['network'] . '. Thread parent is ' . $thr_parent['network'], Logger::DEBUG);
 
 			// This is IMPORTANT!!!!
 
@@ -201,7 +169,7 @@ class Notifier {
 			// if $parent['wall'] == 1 we will already have the parent message in our array
 			// and we will relay the whole lot.
 
-			$localhost = str_replace('www.','',$a->get_hostname());
+			$localhost = str_replace('www.','',$a->getHostName());
 			if (strpos($localhost,':')) {
 				$localhost = substr($localhost,0,strpos($localhost,':'));
 			}
@@ -236,33 +204,24 @@ class Notifier {
 			}
 
 			// Special treatment for forum posts
-			if (($target_item['author-link'] != $target_item['owner-link']) &&
-				($owner['id'] != $target_item['contact-id']) &&
-				($target_item['uri'] === $target_item['parent-uri'])) {
-
-				$fields = ['forum', 'prv'];
-				$condition = ['id' => $target_item['contact-id']];
-				$contact = dba::selectFirst('contact', $fields, $condition);
-				if (!DBM::is_result($contact)) {
-					// Should never happen
-					return false;
-				}
+			if (self::isForumPost($target_item, $owner)) {
+				$relay_to_owner = true;
+				$direct_forum_delivery = true;
+			}
 
-				// Is the post from a forum?
-				if ($contact['forum'] || $contact['prv']) {
-					$relay_to_owner = true;
-					$direct_forum_delivery = true;
-				}
+			// Avoid that comments in a forum thread are sent to OStatus
+			if (self::isForumPost($parent, $owner)) {
+				$direct_forum_delivery = true;
 			}
+
 			if ($relay_to_owner) {
 				// local followup to remote post
 				$followup = true;
 				$public_message = false; // not public
-				$conversant_str = dbesc($parent['contact-id']);
 				$recipients = [$parent['contact-id']];
 				$recipients_followup  = [$parent['contact-id']];
 
-				logger('notifier: followup '.$target_item["guid"].' to '.$conversant_str, LOGGER_DEBUG);
+				Logger::log('Followup ' . $target_item['guid'] . ' to ' . $parent['contact-id'], Logger::DEBUG);
 
 				//if (!$target_item['private'] && $target_item['wall'] &&
 				if (!$target_item['private'] &&
@@ -270,21 +229,18 @@ class Notifier {
 						$target_item['deny_cid'].$target_item['deny_gid']) == 0))
 					$push_notify = true;
 
-				if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
+				if (($thr_parent && ($thr_parent['network'] == Protocol::OSTATUS)) || ($parent['network'] == Protocol::OSTATUS)) {
 					$push_notify = true;
 
-					if ($parent["network"] == NETWORK_OSTATUS) {
+					if ($parent["network"] == Protocol::OSTATUS) {
 						// Distribute the message to the DFRN contacts as if this wasn't a followup since OStatus can't relay comments
 						// Currently it is work at progress
-						$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s' AND NOT `blocked` AND NOT `pending` AND NOT `archive`",
-							intval($uid),
-							dbesc(NETWORK_DFRN)
-						);
-						if (DBM::is_result($r)) {
-							foreach ($r as $rr) {
-								$recipients_followup[] = $rr['id'];
-							}
+						$condition = ['uid' => $uid, 'network' => Protocol::DFRN, 'blocked' => false, 'pending' => false, 'archive' => false];
+						$followup_contacts_stmt = DBA::select('contact', ['id'], $condition);
+						while($followup_contact = DBA::fetch($followup_contacts_stmt)) {
+							$recipients_followup[] = $followup_contact['id'];
 						}
+						DBA::close($followup_contacts_stmt);
 					}
 				}
 
@@ -292,16 +248,16 @@ class Notifier {
 					$push_notify = false;
 				}
 
-				logger("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), LOGGER_DEBUG);
+				Logger::log('Notify ' . $target_item["guid"] .' via PuSH: ' . ($push_notify ? "Yes":"No"), Logger::DEBUG);
 			} else {
 				$followup = false;
 
-				logger('Distributing directly '.$target_item["guid"], LOGGER_DEBUG);
+				Logger::log('Distributing directly ' . $target_item["guid"], Logger::DEBUG);
 
 				// don't send deletions onward for other people's stuff
 
 				if ($target_item['deleted'] && !intval($target_item['wall'])) {
-					logger('notifier: ignoring delete notification for non-wall item');
+					Logger::log('Ignoring delete notification for non-wall item');
 					return;
 				}
 
@@ -321,19 +277,17 @@ class Notifier {
 				// a delivery fork. private groups (forum_mode == 2) do not uplink
 
 				if ((intval($parent['forum_mode']) == 1) && !$top_level && ($cmd !== 'uplink')) {
-					Worker::add($a->queue['priority'], 'Notifier', 'uplink', $item_id);
+					Worker::add($a->queue['priority'], 'Notifier', 'uplink', $target_id);
 				}
 
 				foreach ($items as $item) {
 					$recipients[] = $item['contact-id'];
-					$conversants[] = $item['contact-id'];
 					// pull out additional tagged people to notify (if public message)
 					if ($public_message && strlen($item['inform'])) {
 						$people = explode(',',$item['inform']);
 						foreach ($people as $person) {
 							if (substr($person,0,4) === 'cid:') {
 								$recipients[] = intval(substr($person,4));
-								$conversants[] = intval(substr($person,4));
 							} else {
 								$url_recipients[] = substr($person,4);
 							}
@@ -342,223 +296,320 @@ class Notifier {
 				}
 
 				if (count($url_recipients)) {
-					logger('notifier: '.$target_item["guid"].' url_recipients ' . print_r($url_recipients,true));
+					Logger::log('Deliver ' . $target_item["guid"] . ' to _recipients ' . json_encode($url_recipients));
 				}
 
-				$conversants = array_unique($conversants);
-
-				$recipients = array_unique(array_merge($recipients,$allow_people,$allow_groups));
-				$deny = array_unique(array_merge($deny_people,$deny_groups));
-				$recipients = array_diff($recipients,$deny);
-
-				$conversant_str = dbesc(implode(', ',$conversants));
+				$recipients = array_unique(array_merge($recipients, $allow_people, $allow_groups));
+				$deny = array_unique(array_merge($deny_people, $deny_groups));
+				$recipients = array_diff($recipients, $deny);
+
+				// If this is a public message and pubmail is set on the parent, include all your email contacts
+				if (
+					function_exists('imap_open')
+					&& !Config::get('system','imap_disabled')
+					&& $public_message
+					&& intval($target_item['pubmail'])
+				) {
+					$mail_contacts_stmt = DBA::select('contact', ['id'], ['uid' => $uid, 'network' => Protocol::MAIL]);
+					while ($mail_contact = DBA::fetch($mail_contacts_stmt)) {
+						$recipients[] = $mail_contact['id'];
+					}
+					DBA::close($mail_contacts_stmt);
+				}
 			}
 
 			// If the thread parent is OStatus then do some magic to distribute the messages.
 			// We have not only to look at the parent, since it could be a Friendica thread.
-			if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
+			if (($thr_parent && ($thr_parent['network'] == Protocol::OSTATUS)) || ($parent['network'] == Protocol::OSTATUS)) {
 				$diaspora_delivery = false;
 
-				logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent[0]['author-link']." - Owner: ".$thr_parent[0]['owner-link'], LOGGER_DEBUG);
+				Logger::log('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent['author-id']." - Owner: ".$thr_parent['owner-id'], Logger::DEBUG);
 
 				// Send a salmon to the parent author
-				$r = q("SELECT `url`, `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
-					dbesc(normalise_link($thr_parent[0]['author-link'])),
-					intval($uid));
-				if (DBM::is_result($r)) {
-					$probed_contact = $r[0];
-				} else {
-					$probed_contact = Probe::uri($thr_parent[0]['author-link']);
-				}
-
-				if ($probed_contact["notify"] != "") {
-					logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]);
+				$probed_contact = DBA::selectFirst('contact', ['url', 'notify'], ['id' => $thr_parent['author-id']]);
+				if (DBA::isResult($probed_contact) && !empty($probed_contact["notify"])) {
+					Logger::log('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]);
 					$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
 				}
 
 				// Send a salmon to the parent owner
-				$r = q("SELECT `url`, `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
-					dbesc(normalise_link($thr_parent[0]['owner-link'])),
-					intval($uid));
-				if (DBM::is_result($r)) {
-					$probed_contact = $r[0];
-				} else {
-					$probed_contact = Probe::uri($thr_parent[0]['owner-link']);
-				}
-
-				if ($probed_contact["notify"] != "") {
-					logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]);
+				$probed_contact = DBA::selectFirst('contact', ['url', 'notify'], ['id' => $thr_parent['owner-id']]);
+				if (DBA::isResult($probed_contact) && !empty($probed_contact["notify"])) {
+					Logger::log('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]);
 					$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
 				}
 
 				// Send a salmon notification to every person we mentioned in the post
 				$arr = explode(',',$target_item['tag']);
 				foreach ($arr as $x) {
-					//logger('Checking tag '.$x, LOGGER_DEBUG);
+					//Logger::log('Checking tag '.$x, Logger::DEBUG);
 					$matches = null;
 					if (preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
 							$probed_contact = Probe::uri($matches[1]);
 						if ($probed_contact["notify"] != "") {
-							logger('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
+							Logger::log('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
 							$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
 						}
 					}
 				}
 
 				// It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
-				$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."')";
+				$networks = [Protocol::OSTATUS, Protocol::DFRN];
 			} else {
-				$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."')";
+				$networks = [Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA, Protocol::MAIL];
 			}
 		} else {
 			$public_message = false;
 		}
 
-		// If this is a public message and pubmail is set on the parent, include all your email contacts
+		if (empty($delivery_contacts_stmt)) {
+			if ($followup) {
+				$recipients = $recipients_followup;
+			}
+			$condition = ['id' => $recipients, 'self' => false,
+				'blocked' => false, 'pending' => false, 'archive' => false];
+			if (!empty($networks)) {
+				$condition['network'] = $networks;
+			}
+			$delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'network', 'batch'], $condition);
+		}
+
+		$conversants = [];
+		$batch_delivery = false;
 
-		$mail_disabled = ((function_exists('imap_open') && (!Config::get('system','imap_disabled'))) ? 0 : 1);
+		if ($public_message && !in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION]) && !$followup) {
+			$relay_list = [];
 
-		if (!$mail_disabled) {
-			if (!strlen($target_item['allow_cid']) && !strlen($target_item['allow_gid'])
-				&& !strlen($target_item['deny_cid']) && !strlen($target_item['deny_gid'])
-				&& intval($target_item['pubmail'])) {
-				$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
-					intval($uid),
-					dbesc(NETWORK_MAIL)
+			if ($diaspora_delivery) {
+				$batch_delivery = true;
+
+				$relay_list_stmt = DBA::p(
+					"SELECT
+       					`batch`,
+       					ANY_VALUE(`id`) AS `id`,
+       					ANY_VALUE(`name`) AS `name`,
+       					ANY_VALUE(`network`) AS `network`
+					FROM `contact`
+					WHERE `network` = ?
+					AND `batch` != ''
+					AND `uid` = ?
+					AND `rel` != ?
+					AND NOT `blocked`
+					AND NOT `pending`
+					AND NOT `archive`
+					GROUP BY `batch`",
+					Protocol::DIASPORA,
+					$owner['uid'],
+					Contact::SHARING
 				);
-				if (DBM::is_result($r)) {
-					foreach ($r as $rr) {
-						$recipients[] = $rr['id'];
+				$relay_list = DBA::toArray($relay_list_stmt);
+
+				// Fetch the participation list
+				// The function will ensure that there are no duplicates
+				$relay_list = Diaspora::participantsForThread($target_id, $relay_list);
+
+				// Add the relay to the list, avoid duplicates.
+				// Don't send community posts to the relay. Forum posts via the Diaspora protocol are looking ugly.
+				if (!$followup && !self::isForumPost($target_item, $owner)) {
+					$relay_list = Diaspora::relayList($target_id, $relay_list);
+				}
+			}
+
+			$condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false,
+				'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
+
+			$r2 = DBA::toArray(DBA::select('contact', ['id', 'name', 'network'], $condition));
+
+			$r = array_merge($r2, $relay_list);
+
+			if (DBA::isResult($r)) {
+				foreach ($r as $rr) {
+					$conversants[] = $rr['id'];
+
+					$delivery_queue_count++;
+
+					Logger::log('Public delivery of item ' . $target_item["guid"] . ' (' . $target_id . ') to ' . json_encode($rr), Logger::DEBUG);
+
+					// Ensure that posts with our own protocol arrives before Diaspora posts arrive.
+					// Situation is that sometimes Friendica servers receive Friendica posts over the Diaspora protocol first.
+					// The conversion in Markdown reduces the formatting, so these posts should arrive after the Friendica posts.
+					if ($rr['network'] == Protocol::DIASPORA) {
+						$deliver_options = ['priority' => $a->queue['priority'], 'dont_fork' => true];
+					} else {
+						$deliver_options = ['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true];
 					}
+					Worker::add($deliver_options, 'Delivery', $cmd, $target_id, (int)$rr['id']);
 				}
 			}
-		}
 
-		if ($followup) {
-			$recip_str = implode(', ', $recipients_followup);
-		} else {
-			$recip_str = implode(', ', $recipients);
-		}
-		if ($relocate) {
-			$r = $recipients_relocate;
-		} else {
-			$r = q("SELECT `id`, `url`, `network`, `self` FROM `contact`
-				WHERE `id` IN (%s) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra,
-				dbesc($recip_str)
-			);
+			$push_notify = true;
 		}
 
 		// delivery loop
+		while ($contact = DBA::fetch($delivery_contacts_stmt)) {
+			// Don't deliver to Diaspora if it already had been done as batch delivery
+			if (($contact['network'] == Protocol::DIASPORA) && $batch_delivery) {
+				Logger::log('Already delivered  id ' . $target_id . ' via batch to ' . json_encode($contact), Logger::DEBUG);
+				continue;
+			}
 
-		if (DBM::is_result($r)) {
-			foreach ($r as $contact) {
-				if ($contact['self']) {
-					continue;
-				}
-				logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
+			// Don't deliver to folks who have already been delivered to
+			if (in_array($contact['id'], $conversants)) {
+				Logger::log('Already delivered id ' . $target_id. ' to ' . json_encode($contact), Logger::DEBUG);
+				continue;
+			}
 
-				Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
-						'Delivery', $cmd, $item_id, (int)$contact['id']);
+			$delivery_queue_count++;
+
+			Logger::log('Delivery of item ' . $target_id . ' to ' . json_encode($contact), Logger::DEBUG);
+
+			// Ensure that posts with our own protocol arrives before Diaspora posts arrive.
+			// Situation is that sometimes Friendica servers receive Friendica posts over the Diaspora protocol first.
+			// The conversion in Markdown reduces the formatting, so these posts should arrive after the Friendica posts.
+			if ($contact['network'] == Protocol::DIASPORA) {
+				$deliver_options = ['priority' => $a->queue['priority'], 'dont_fork' => true];
+			} else {
+				$deliver_options = ['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true];
 			}
+			Worker::add($deliver_options, 'Delivery', $cmd, $target_id, (int)$contact['id']);
 		}
+		DBA::close($delivery_contacts_stmt);
 
+
+		$url_recipients = array_filter($url_recipients);
 		// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
 		// They are especially used for notifications to OStatus users that don't follow us.
-
-		if ($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
-			if (!Config::get('system', 'dfrn_only')) {
-				foreach ($url_recipients as $url) {
-					if ($url) {
-						logger('notifier: urldelivery: ' . $url);
-						$deliver_status = Salmon::slapper($owner, $url, $slap);
-						/// @TODO Redeliver/queue these items on failure, though there is no contact record
-					}
-				}
+		if (!Config::get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) {
+			$delivery_queue_count += count($url_recipients);
+			$slap = OStatus::salmon($target_item, $owner);
+			foreach ($url_recipients as $url) {
+				Logger::log('Salmon delivery of item ' . $target_id . ' to ' . $url);
+				/// @TODO Redeliver/queue these items on failure, though there is no contact record
+				Salmon::slapper($owner, $url, $slap);
+				ItemDeliveryData::incrementQueueDone($target_id);
 			}
 		}
 
+		// Notify PuSH subscribers (Used for OStatus distribution of regular posts)
+		if ($push_notify) {
+			Logger::log('Activating internal PuSH for item '.$target_id, Logger::DEBUG);
 
-		if ($public_message) {
-
-			$r0 = [];
-			$r1 = [];
-
-			if ($diaspora_delivery) {
-				if (!$followup) {
-					$r0 = Diaspora::relayList($item_id);
-				}
-
-				$r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network`
-					FROM `contact` WHERE `network` = '%s' AND `batch` != ''
-					AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch`",
-					dbesc(NETWORK_DIASPORA),
-					intval($owner['uid']),
-					intval(CONTACT_IS_SHARING)
-				);
+			// Handling the pubsubhubbub requests
+			PushSubscriber::publishFeed($owner['uid'], $a->queue['priority']);
+		}
 
-				// Fetch the participation list
-				// The function will ensure that there are no duplicates
-				$r1 = Diaspora::participantsForThread($item_id, $r1);
+		if (!empty($target_item)) {
+			Logger::log('Calling hooks for ' . $cmd . ' ' . $target_id, Logger::DEBUG);
 
+			if (in_array($cmd, [Delivery::POST, Delivery::COMMENT])) {
+				ItemDeliveryData::update($target_item['id'], ['queue_count' => $delivery_queue_count]);
 			}
 
-			$r2 = q("SELECT `id`, `name`,`network` FROM `contact`
-				WHERE `network` in ('%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `rel` != %d",
-				dbesc(NETWORK_DFRN),
-				intval($owner['uid']),
-				intval(CONTACT_IS_SHARING)
-			);
+			Hook::fork($a->queue['priority'], 'notifier_normal', $target_item);
 
+			Hook::callAll('notifier_end', $target_item);
+		}
 
-			$r = array_merge($r2, $r1, $r0);
+		return;
+	}
 
-			if (DBM::is_result($r)) {
-				logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
+	/**
+	 * @param int    $self_user_id
+	 * @param int    $priority The priority the Notifier queue item was created with
+	 * @param string $created  The date the Notifier queue item was created on
+	 * @return bool
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	private static function notifySelfRemoval($self_user_id, $priority, $created)
+	{
+		$owner = User::getOwnerDataById($self_user_id);
+		if (!$owner) {
+			return false;
+		}
 
-				foreach ($r as $rr) {
+		$contacts_stmt = DBA::select('contact', [], ['self' => false, 'uid' => $self_user_id]);
+		if (!DBA::isResult($contacts_stmt)) {
+			return false;
+		}
 
-					// except for Diaspora batch jobs
-					// Don't deliver to folks who have already been delivered to
+		while($contact = DBA::fetch($contacts_stmt)) {
+			Contact::terminateFriendship($owner, $contact, true);
+		}
+		DBA::close($contacts_stmt);
 
-					if (($rr['network'] !== NETWORK_DIASPORA) && (in_array($rr['id'], $conversants))) {
-						logger('notifier: already delivered id=' . $rr['id']);
-						continue;
-					}
+		$inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser(0);
+		foreach ($inboxes as $inbox) {
+			Logger::log('Account removal for user ' . $self_user_id . ' to ' . $inbox .' via ActivityPub', Logger::DEBUG);
+			Worker::add(['priority' => PRIORITY_NEGLIGIBLE, 'created' => $created, 'dont_fork' => true],
+				'APDelivery', Delivery::REMOVAL, '', $inbox, $self_user_id);
+		}
 
-					if (!$mail && !$fsuggest && !$followup) {
-						logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
-						Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
-								'Delivery', $cmd, $item_id, (int)$rr['id']);
-					}
-				}
-			}
+		return true;
+	}
 
-			$push_notify = true;
+	/**
+	 * @param string $cmd
+	 * @param array  $target_item
+	 * @param array  $parent
+	 * @param int    $priority The priority the Notifier queue item was created with
+	 * @param string $created  The date the Notifier queue item was created on
+	 * @return int The number of delivery tasks created
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
+	 */
+	private static function activityPubDelivery($cmd, array $target_item, array $parent, $priority, $created)
+	{
+		$inboxes = [];
+
+		if ($target_item['origin']) {
+			$inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $target_item['contact-uid']);
+			Logger::log('Origin item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG);
+		} elseif (!DBA::exists('conversation', ['item-uri' => $target_item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB])) {
+			Logger::log('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' is no AP post. It will not be distributed.', Logger::DEBUG);
+			return 0;
+		} elseif ($parent['origin']) {
+			// Remote items are transmitted via the personal inboxes.
+			// Doing so ensures that the dedicated receiver will get the message.
+			$inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $target_item['contact-uid'], true, $target_item['id']);
+			Logger::log('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG);
+		}
 
+		if (empty($inboxes)) {
+			Logger::log('No inboxes found for item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . '. It will not be distributed.', Logger::DEBUG);
+			return 0;
 		}
 
-		// Notify PuSH subscribers (Used for OStatus distribution of regular posts)
-		if ($push_notify) {
-			// Set push flag for PuSH subscribers to this topic,
-			// they will be notified in queue.php
-			$condition = ['push' => false, 'nickname' => $owner['nickname']];
-			dba::update('push_subscriber', ['push' => true], $condition);
+		// Fill the item cache
+		ActivityPub\Transmitter::createCachedActivityFromItem($target_item['id'], true);
 
-			logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
+		foreach ($inboxes as $inbox) {
+			Logger::log('Deliver ' . $target_item['id'] .' to ' . $inbox .' via ActivityPub', Logger::DEBUG);
 
-			// Handling the pubsubhubbub requests
-			Worker::add(['priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true],
-					'PubSubPublish');
+			Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true],
+					'APDelivery', $cmd, $target_item['id'], $inbox, $target_item['contact-uid'] ?: $target_item['uid']);
 		}
 
-		logger('notifier: calling hooks', LOGGER_DEBUG);
+		return count($inboxes);
+	}
 
-		if ($normal_mode) {
-			Addon::forkHooks($a->queue['priority'], 'notifier_normal', $target_item);
+	private static function isForumPost(array $item, array $owner)
+	{
+		if (($item['author-id'] == $item['owner-id']) ||
+			($owner['id'] == $item['contact-id']) ||
+			($item['uri'] != $item['parent-uri'])) {
+			return false;
 		}
 
-		Addon::callHooks('notifier_end',$target_item);
+		$fields = ['forum', 'prv'];
+		$condition = ['id' => $item['contact-id']];
+		$contact = DBA::selectFirst('contact', $fields, $condition);
+		if (!DBA::isResult($contact)) {
+			// Should never happen
+			return false;
+		}
 
-		return;
+		// Is the post from a forum?
+		return ($contact['forum'] || $contact['prv']);
 	}
 }