X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FNotifier.php;h=61b296a26543a2b3c7d40c41f33255a3db876505;hb=f828350ba215e7ba724b0310f76f50885b111778;hp=edb0df33adbbcf0d63968dcb6b5ae1cfc055f61d;hpb=26b6cbcb3b15d98c807223d9849a806e6a21ef46;p=friendica.git

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index edb0df33ad..61b296a265 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -10,22 +10,19 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
 use Friendica\Model\User;
+use Friendica\Model\PushSubscriber;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
+use Friendica\Worker\Delivery;
 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:
  *
@@ -57,9 +54,6 @@ class Notifier {
 
 		logger('notifier: invoked: '.$cmd.': '.$item_id, LOGGER_DEBUG);
 
-		$mail = false;
-		$fsuggest = false;
-		$relocate = false;
 		$top_level = false;
 		$recipients = [];
 		$url_recipients = [];
@@ -67,32 +61,23 @@ class Notifier {
 		$normal_mode = true;
 		$recipients_relocate = [];
 
-		if ($cmd === 'mail') {
+		if ($cmd == Delivery::MAIL) {
 			$normal_mode = false;
-			$mail = true;
-			$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
-					intval($item_id)
-			);
-			if (!count($message)) {
+			$message = dba::selectFirst('mail', ['uid', 'contact-id'], ['id' => $item_id]);
+			if (!DBM::is_result($message)) {
 				return;
 			}
-			$uid = $message[0]['uid'];
-			$recipients[] = $message[0]['contact-id'];
-			$item = $message[0];
-		} elseif ($cmd === 'suggest') {
+			$uid = $message['uid'];
+			$recipients[] = $message['contact-id'];
+		} elseif ($cmd == Delivery::SUGGESTION) {
 			$normal_mode = false;
-			$fsuggest = true;
-
-			$suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1",
-				intval($item_id)
-			);
-			if (!count($suggest)) {
+			$suggest = dba::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $item_id]);
+			if (!DBM::is_result($suggest)) {
 				return;
 			}
-			$uid = $suggest[0]['uid'];
-			$recipients[] = $suggest[0]['cid'];
-			$item = $suggest[0];
-		} elseif ($cmd === 'removeme') {
+			$uid = $suggest['uid'];
+			$recipients[] = $suggest['cid'];
+		} elseif ($cmd == Delivery::REMOVAL) {
 			$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`
@@ -112,36 +97,35 @@ class Notifier {
 				Contact::terminateFriendship($user, $contact);
 			}
 			return;
-		} elseif ($cmd === 'relocate') {
+		} elseif ($cmd == Delivery::RELOCATION) {
 			$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);
 		} 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' => $item_id, 'visible' => true, 'moderated' => false];
+			$target_item = Item::selectFirst([], $condition);
 
 			if (!DBM::is_result($target_item) || !intval($target_item['parent'])) {
 				return;
 			}
 
 			$parent_id = intval($target_item['parent']);
-			$uid = $target_item['cuid'];
+			$uid = $target_item['contact-uid'];
 			$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)
-			);
+			$condition = ['parent' => $parent_id, 'visible' => true, 'moderated' => false];
+			$params = ['order' => ['id']];
+			$ret = Item::select([], $condition, $params);
 
-			if (!count($items)) {
+			if (!DBM::is_result($ret)) {
 				return;
 			}
 
+			$items = dba::inArray($ret);
+
 			// avoid race condition with deleting entries
 			if ($items[0]['deleted']) {
 				foreach ($items as $item) {
@@ -174,23 +158,18 @@ 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 (!in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION, Delivery::RELOCATION])) {
 			$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"]));
+			$fields = ['network', 'author-id', 'owner-id'];
+			$condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]];
+			$thr_parent = dba::selectFirst('item', $fields, $condition);
 
-			logger('GUID: '.$target_item["guid"].': Parent is '.$parent['network'].'. Thread parent is '.$thr_parent[0]['network'], LOGGER_DEBUG);
+			logger('GUID: '.$target_item["guid"].': Parent is '.$parent['network'].'. Thread parent is '.$thr_parent['network'], LOGGER_DEBUG);
 
 			// This is IMPORTANT!!!!
 
@@ -236,7 +215,7 @@ class Notifier {
 			}
 
 			// Special treatment for forum posts
-			if (($target_item['author-link'] != $target_item['owner-link']) &&
+			if (($target_item['author-id'] != $target_item['owner-id']) &&
 				($owner['id'] != $target_item['contact-id']) &&
 				($target_item['uri'] === $target_item['parent-uri'])) {
 
@@ -270,7 +249,7 @@ 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'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
 					$push_notify = true;
 
 					if ($parent["network"] == NETWORK_OSTATUS) {
@@ -356,37 +335,21 @@ class Notifier {
 
 			// 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'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_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('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"] != "") {
+				$probed_contact = dba::selectFirst('contact', ['url', 'notify'], ['id' => $thr_parent['author-id']]);
+				if (DBM::is_result($probed_contact) && !empty($probed_contact["notify"])) {
 					logger('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"] != "") {
+				$probed_contact = dba::selectFirst('contact', ['url', 'notify'], ['id' => $thr_parent['owner-id']]);
+				if (DBM::is_result($probed_contact) && !empty($probed_contact["notify"])) {
 					logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]);
 					$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
 				}
@@ -406,19 +369,16 @@ class Notifier {
 				}
 
 				// 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 = [NETWORK_OSTATUS, NETWORK_DFRN];
 			} else {
-				$sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."')";
+				$networks = [NETWORK_OSTATUS, NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_MAIL];
 			}
 		} else {
 			$public_message = false;
 		}
 
 		// If this is a public message and pubmail is set on the parent, include all your email contacts
-
-		$mail_disabled = ((function_exists('imap_open') && (!Config::get('system','imap_disabled'))) ? 0 : 1);
-
-		if (!$mail_disabled) {
+		if (function_exists('imap_open') && !Config::get('system','imap_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'])) {
@@ -434,27 +394,24 @@ class Notifier {
 			}
 		}
 
-		if ($followup) {
-			$recip_str = implode(', ', $recipients_followup);
-		} else {
-			$recip_str = implode(', ', $recipients);
-		}
-		if ($relocate) {
+		if (($cmd == Delivery::RELOCATION)) {
 			$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)
-			);
+			if ($followup) {
+				$recipients = $recipients_followup;
+			}
+			$condition = ['id' => $recipients, 'self' => false,
+				'blocked' => false, 'pending' => false, 'archive' => false];
+			if (!empty($networks)) {
+				$condition['network'] = $networks;
+			}
+			$contacts = dba::select('contact', ['id', 'url', 'network'], $condition);
+			$r = dba::inArray($contacts);
 		}
 
 		// delivery loop
-
 		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);
 
 				Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
@@ -464,30 +421,21 @@ class Notifier {
 
 		// 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) && $normal_mode) {
+			$slap = OStatus::salmon($target_item, $owner);
+			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 ($public_message) {
-
-			$r0 = [];
 			$r1 = [];
 
 			if ($diaspora_delivery) {
-				if (!$followup) {
-					$r0 = Diaspora::relayList();
-				}
-
 				$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`",
@@ -500,23 +448,22 @@ class Notifier {
 				// The function will ensure that there are no duplicates
 				$r1 = Diaspora::participantsForThread($item_id, $r1);
 
+				// Add the relay to the list, avoid duplicates
+				if (!$followup) {
+					$r1 = Diaspora::relayList($item_id, $r1);
+				}
 			}
 
-			$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)
-			);
+			$condition = ['network' => NETWORK_DFRN, 'uid' => $owner['uid'], 'blocked' => false,
+				'pending' => false, 'archive' => false, 'rel' => [CONTACT_IS_FOLLOWER, CONTACT_IS_FRIEND]];
+			$r2 = dba::inArray(dba::select('contact', ['id', 'name', 'network'], $condition));
 
-
-			$r = array_merge($r2, $r1, $r0);
+			$r = array_merge($r2, $r1);
 
 			if (DBM::is_result($r)) {
 				logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
 
 				foreach ($r as $rr) {
-
 					// except for Diaspora batch jobs
 					// Don't deliver to folks who have already been delivered to
 
@@ -525,7 +472,7 @@ class Notifier {
 						continue;
 					}
 
-					if (!$mail && !$fsuggest && !$followup) {
+					if (!in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION]) && !$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']);
@@ -534,24 +481,17 @@ class Notifier {
 			}
 
 			$push_notify = true;
-
 		}
 
 		// 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
-			q("UPDATE `push_subscriber` SET `push` = 1 ".
-			  "WHERE `nickname` = '%s' AND `push` = 0", dbesc($owner['nickname']));
-
 			logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
 
 			// Handling the pubsubhubbub requests
-			Worker::add(['priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true],
-					'PubSubPublish');
+			PushSubscriber::publishFeed($owner['uid'], $a->queue['priority']);
 		}
 
-		logger('notifier: calling hooks', LOGGER_DEBUG);
+		logger('notifier: calling hooks for ' . $cmd . ' ' . $item_id, LOGGER_DEBUG);
 
 		if ($normal_mode) {
 			Addon::forkHooks($a->queue['priority'], 'notifier_normal', $target_item);