X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=dc6caab3db9c95fe0cdece3100077ed633c7ac4c;hb=27d94023eef0263a3ce9750f79a73ac941a25304;hp=b3d3ecc1409e8c46439708ed40d81ae80170db4d;hpb=7a6706b0f72cb4a1c1e370e8363aec7faaf6703c;p=friendica.git

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index b3d3ecc140..dc6caab3db 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -2,24 +2,22 @@
 /**
  * @file src/Worker/Delivery.php
  */
-
 namespace Friendica\Worker;
 
-use Friendica\App;
-use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Item;
+use Friendica\Model\Queue;
 use Friendica\Model\User;
-use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
+use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
+use dba;
 
-require_once 'include/queue_fn.php';
-require_once 'include/html2plain.php';
-require_once 'include/datetime.php';
 require_once 'include/items.php';
-require_once 'include/bbcode.php';
 
 /// @todo This is some ugly code that needs to be split into several methods
 
@@ -29,17 +27,17 @@ class Delivery {
 
 		logger('delivery: invoked: '.$cmd.': '.$item_id.' to '.$contact_id, LOGGER_DEBUG);
 
-		$expire = false;
 		$mail = false;
 		$fsuggest = false;
 		$relocate = false;
 		$top_level = false;
-		$recipients = array();
-		$url_recipients = array();
+		$recipients = [];
 		$followup = false;
 
 		$normal_mode = true;
 
+		$item = null;
+
 		$recipients[] = $contact_id;
 
 		if ($cmd === 'mail') {
@@ -54,18 +52,6 @@ class Delivery {
 			$uid = $message[0]['uid'];
 			$recipients[] = $message[0]['contact-id'];
 			$item = $message[0];
-		} elseif ($cmd === 'expire') {
-			$normal_mode = false;
-			$expire = true;
-			$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
-				AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 30 MINUTE",
-				intval($item_id)
-			);
-			$uid = $item_id;
-			$item_id = 0;
-			if (!count($items)) {
-				return;
-			}
 		} elseif ($cmd === 'suggest') {
 			$normal_mode = false;
 			$fsuggest = true;
@@ -85,18 +71,17 @@ class Delivery {
 			$uid = $item_id;
 		} else {
 			// find ancestors
-			$r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1",
-				intval($item_id)
-			);
+			$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);
 
-			if (!DBM::is_result($r) || !intval($r[0]['parent'])) {
+			if (!DBM::is_result($target_item) || !intval($target_item['parent'])) {
 				return;
 			}
 
-			$target_item = $r[0];
-			$parent_id = intval($r[0]['parent']);
-			$uid = $r[0]['uid'];
-			$updated = $r[0]['edited'];
+			$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 = 1 AND moderated = 0 ORDER BY `id` ASC",
@@ -108,7 +93,7 @@ class Delivery {
 			}
 
 			$icontacts = null;
-			$contacts_arr = array();
+			$contacts_arr = [];
 			foreach ($items as $item) {
 				if (!in_array($item['contact-id'],$contacts_arr)) {
 					$contacts_arr[] = intval($item['contact-id']);
@@ -146,11 +131,12 @@ class Delivery {
 			return;
 		}
 
-		$walltowall = (($top_level && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
+		// 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);
 
 		$public_message = true;
 
-		if (!($mail || $fsuggest || $relocate)) {
+		if (!$mail && !$fsuggest && !$relocate) {
 			$parent = $items[0];
 
 			// This is IMPORTANT!!!!
@@ -161,16 +147,6 @@ class Delivery {
 			// if $parent['wall'] == 1 we will already have the parent message in our array
 			// and we will relay the whole lot.
 
-			// expire sends an entire group of expire messages and cannot be forwarded.
-			// However the conversation owner will be a part of the conversation and will
-			// be notified during this run.
-			// Other DFRN conversation members will be alerted during polled updates.
-
-			// Diaspora members currently are not notified of expirations, and other networks have
-			// either limited or no ability to process deletions. We should at least fix Diaspora
-			// by stringing togther an array of retractions and sending them onward.
-
-
 			$localhost = $a->get_hostname();
 			if (strpos($localhost,':')) {
 				$localhost = substr($localhost,0,strpos($localhost,':'));
@@ -185,7 +161,7 @@ class Delivery {
 
 			$relay_to_owner = false;
 
-			if (!$top_level && ($parent['wall'] == 0) && !$expire && stristr($target_item['uri'],$localhost)) {
+			if (!$top_level && ($parent['wall'] == 0) && stristr($target_item['uri'], $localhost)) {
 				$relay_to_owner = true;
 			}
 
@@ -195,37 +171,40 @@ class Delivery {
 				$followup = true;
 			}
 
-			if ((strlen($parent['allow_cid']))
-				|| (strlen($parent['allow_gid']))
-				|| (strlen($parent['deny_cid']))
-				|| (strlen($parent['deny_gid']))
+			if (strlen($parent['allow_cid'])
+				|| strlen($parent['allow_gid'])
+				|| strlen($parent['deny_cid'])
+				|| strlen($parent['deny_gid'])
 				|| $parent["private"]) {
 				$public_message = false; // private recipients, not public
 			}
 
 		}
 
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0",
-			intval($contact_id)
+		// We don't deliver our items to blocked or pending contacts, and not to ourselves either
+		$contact = dba::selectFirst('contact', [],
+			['id' => $contact_id, 'blocked' => false, 'pending' => false, 'self' => false]
 		);
-
-		if (DBM::is_result($r)) {
-			$contact = $r[0];
-		}
-		if ($contact['self']) {
+		if (!DBM::is_result($contact)) {
 			return;
 		}
+
 		$deliver_status = 0;
 
+		// Transmit via Diaspora if not possible via Friendica
+		if (($item['uid'] == 0) && ($contact['network'] == NETWORK_DFRN)) {
+			$contact['network'] = NETWORK_DIASPORA;
+		}
+
 		logger("main delivery by delivery: followup=$followup mail=$mail fsuggest=$fsuggest relocate=$relocate - network ".$contact['network']);
 
-		switch($contact['network']) {
+		switch ($contact['network']) {
 
 			case NETWORK_DFRN:
 				logger('notifier: '.$target_item["guid"].' dfrndelivery: '.$contact['name']);
 
 				if ($mail) {
-					$item['body'] = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
+					$item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']);
 					$atom = DFRN::mail($item, $owner);
 				} elseif ($fsuggest) {
 					$atom = DFRN::fsuggest($item, $owner);
@@ -233,7 +212,7 @@ class Delivery {
 				} elseif ($relocate) {
 					$atom = DFRN::relocate($owner, $uid);
 				} elseif ($followup) {
-					$msgitems = array();
+					$msgitems = [];
 					foreach ($items as $item) {  // there is only one item
 						if (!$item['parent']) {
 							return;
@@ -245,7 +224,7 @@ class Delivery {
 					}
 					$atom = DFRN::entries($msgitems,$owner);
 				} else {
-					$msgitems = array();
+					$msgitems = [];
 					foreach ($items as $item) {
 						if (!$item['parent']) {
 							return;
@@ -256,13 +235,14 @@ class Delivery {
 							return;
 						}
 
-						$item_contact = get_item_contact($item,$icontacts);
+						$item_contact = self::getItemContact($item,$icontacts);
 						if (!$item_contact) {
 							return;
 						}
 
 						if ($normal_mode) {
-							if ($item_id == $item['id'] || $item['id'] == $item['parent']) {
+							// Only add the parent when we don't delete other items.
+							if ($item_id == $item['id'] || (($item['id'] == $item['parent']) && ($cmd != 'drop'))) {
 								$item["entry:comment-allow"] = true;
 								$item["entry:cid"] = (($top_level) ? $contact['id'] : 0);
 								$msgitems[] = $item;
@@ -283,7 +263,6 @@ class Delivery {
 				// perform local delivery if we are on the same site
 
 				if (link_compare($basepath,System::baseUrl())) {
-
 					$nickname = basename($contact['url']);
 					if ($contact['issued-id']) {
 						$sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
@@ -318,7 +297,7 @@ class Delivery {
 						}
 
 						$ssl_policy = Config::get('system','ssl_policy');
-						fix_contact_ssl_policy($x[0],$ssl_policy);
+						$x[0] = Contact::updateSslPolicy($x[0], $ssl_policy);
 
 						// If we are setup as a soapbox we aren't accepting top level posts from this person
 
@@ -331,8 +310,8 @@ class Delivery {
 					}
 				}
 
-				if (!was_recently_delayed($contact['id'])) {
-					$deliver_status = DFRN::deliver($owner,$contact,$atom);
+				if (!Queue::wasDelayed($contact['id'])) {
+					$deliver_status = DFRN::deliver($owner, $contact, $atom);
 				} else {
 					$deliver_status = (-1);
 				}
@@ -341,7 +320,7 @@ class Delivery {
 
 				if ($deliver_status < 0) {
 					logger('notifier: delivery failed: queuing message');
-					add_to_queue($contact['id'],NETWORK_DFRN,$atom);
+					Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']);
 
 					// The message could not be delivered. We mark the contact as "dead"
 					Contact::markForArchival($contact);
@@ -378,36 +357,37 @@ class Delivery {
 				}
 
 				if ($cmd === 'wall-new' || $cmd === 'comment-new') {
-
 					$it = null;
 					if ($cmd === 'wall-new') {
 						$it = $items[0];
 					} else {
-						$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-							intval($item_id),
-							intval($uid)
+						$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
+							intval($item_id)
 						);
-						if (DBM::is_result($r))
+						if (DBM::is_result($r)) {
 							$it = $r[0];
+						}
 					}
-					if (!$it)
+					if (!$it) {
 						break;
-
+					}
 
 					$local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 						intval($uid)
 					);
-					if (!count($local_user))
+					if (!count($local_user)) {
 						break;
+					}
 
 					$reply_to = '';
 					$r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 						intval($uid)
 					);
-					if ($r1 && $r1[0]['reply_to'])
+					if ($r1 && $r1[0]['reply_to']) {
 						$reply_to = $r1[0]['reply_to'];
+					}
 
-					$subject  = (($it['title']) ? Email::encodeHeader($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
+					$subject  = (($it['title']) ? Email::encodeHeader($it['title'],'UTF-8') : L10n::t("\x28no subject\x29")) ;
 
 					// only expose our real email address to true friends
 
@@ -419,7 +399,7 @@ class Delivery {
 							$headers  = 'From: '.Email::encodeHeader($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n";
 						}
 					} else {
-						$headers  = 'From: '. Email::encodeHeader($local_user[0]['username'],'UTF-8') .' <'. t('noreply') .'@'.$a->get_hostname() .'>'. "\n";
+						$headers  = 'From: '. Email::encodeHeader($local_user[0]['username'],'UTF-8') .' <'. L10n::t('noreply') .'@'.$a->get_hostname() .'>'. "\n";
 					}
 
 					//if ($reply_to)
@@ -435,8 +415,9 @@ class Delivery {
 						$headers .= "References: <".Email::iri2msgid($it["parent-uri"]).">";
 
 						// If Threading is enabled, write down the correct parent
-						if (($it["thr-parent"] != "") && ($it["thr-parent"] != $it["parent-uri"]))
+						if (($it["thr-parent"] != "") && ($it["thr-parent"] != $it["parent-uri"])) {
 							$headers .= " <".Email::iri2msgid($it["thr-parent"]).">";
+						}
 						$headers .= "\n";
 
 						if (!$it['title']) {
@@ -451,39 +432,42 @@ class Delivery {
 									dbesc($it['parent-uri']),
 									intval($uid));
 
-								if (DBM::is_result($r) && ($r[0]['title'] != ''))
+								if (DBM::is_result($r) && ($r[0]['title'] != '')) {
 									$subject = $r[0]['title'];
+								}
 							}
 						}
-						if (strncasecmp($subject,'RE:',3))
+						if (strncasecmp($subject,'RE:',3)) {
 							$subject = 'Re: '.$subject;
+						}
 					}
 					Email::send($addr, $subject, $headers, $it);
 				}
 				break;
 
 			case NETWORK_DIASPORA:
-				if ($public_message)
+				if ($public_message) {
 					$loc = 'public batch '.$contact['batch'];
-				else
+				} else {
 					$loc = $contact['name'];
+				}
 
 				logger('delivery: diaspora batch deliver: '.$loc);
 
-				if (Config::get('system','dfrn_only') || !Config::get('system','diaspora_enabled'))
+				if (Config::get('system','dfrn_only') || !Config::get('system','diaspora_enabled')) {
 					break;
-
+				}
 				if ($mail) {
 					Diaspora::sendMail($item,$owner,$contact);
 					break;
 				}
 
-				if (!$normal_mode)
+				if (!$normal_mode) {
 					break;
-
-				if (!$contact['pubkey'] && !$public_message)
+				}
+				if (!$contact['pubkey'] && !$public_message) {
 					break;
-
+				}
 				if (($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
 					// top-level retraction
 					logger('diaspora retract: '.$loc);
@@ -519,4 +503,17 @@ class Delivery {
 
 		return;
 	}
+
+	private static function getItemContact($item, $contacts)
+	{
+		if (!count($contacts) || !is_array($item)) {
+			return false;
+		}
+		foreach ($contacts as $contact) {
+			if ($contact['id'] == $item['contact-id']) {
+				return $contact;
+			}
+		}
+		return false;
+	}
 }