X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=c69628398af70f3a22da087b09ebaeb38df3fbeb;hb=cd82c527f5b2b7512e903b9db1b693e376376364;hp=37a4ec445a999ad85805db8685f4ffcca7d72fe7;hpb=6ccf038053431ae55100f061ee96d4549fe8f8ed;p=friendica.git

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 37a4ec445a..c69628398a 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -1,11 +1,26 @@
 <?php
 /**
- * @file src/Worker/Delivery.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -43,14 +58,12 @@ class Delivery
 		if ($cmd == self::MAIL) {
 			$target_item = DBA::selectFirst('mail', [], ['id' => $target_id]);
 			if (!DBA::isResult($target_item)) {
-				self::setFailedQueue($cmd, $target_id);
 				return;
 			}
 			$uid = $target_item['uid'];
 		} elseif ($cmd == self::SUGGESTION) {
 			$target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]);
 			if (!DBA::isResult($target_item)) {
-				self::setFailedQueue($cmd, $target_id);
 				return;
 			}
 			$uid = $target_item['uid'];
@@ -60,7 +73,6 @@ class Delivery
 		} else {
 			$item = Model\Item::selectFirst(['parent'], ['id' => $target_id]);
 			if (!DBA::isResult($item) || empty($item['parent'])) {
-				self::setFailedQueue($cmd, $target_id);
 				return;
 			}
 			$parent_id = intval($item['parent']);
@@ -82,13 +94,12 @@ class Delivery
 
 			if (empty($target_item)) {
 				Logger::log('Item ' . $target_id . "wasn't found. Quitting here.");
-				self::setFailedQueue($cmd, $target_id);
 				return;
 			}
 
 			if (empty($parent)) {
 				Logger::log('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here.");
-				self::setFailedQueue($cmd, $target_id);
+				self::setFailedQueue($cmd, $target_item);
 				return;
 			}
 
@@ -98,7 +109,7 @@ class Delivery
 				$uid = $target_item['uid'];
 			} else {
 				Logger::log('Only public users for item ' . $target_id, Logger::DEBUG);
-				self::setFailedQueue($cmd, $target_id);
+				self::setFailedQueue($cmd, $target_item);
 				return;
 			}
 
@@ -112,7 +123,7 @@ class Delivery
 
 			if (!empty($contact_id) && Model\Contact::isArchived($contact_id)) {
 				Logger::info('Contact is archived', ['id' => $contact_id, 'cmd' => $cmd, 'item' => $target_item['id']]);
-				self::setFailedQueue($cmd, $target_id);
+				self::setFailedQueue($cmd, $target_item);
 				return;
 			}
 
@@ -161,7 +172,7 @@ class Delivery
 				&& empty($parent['allow_gid'])
 				&& empty($parent['deny_cid'])
 				&& empty($parent['deny_gid'])
-				&& !$parent["private"]) {
+				&& ($parent["private"] != Model\Item::PRIVATE)) {
 				$public_message = true;
 			}
 		}
@@ -172,7 +183,7 @@ class Delivery
 
 		$owner = Model\User::getOwnerDataById($uid);
 		if (!DBA::isResult($owner)) {
-			self::setFailedQueue($cmd, $target_id);
+			self::setFailedQueue($cmd, $target_item);
 			return;
 		}
 
@@ -181,12 +192,12 @@ class Delivery
 			['id' => $contact_id, 'blocked' => false, 'pending' => false, 'self' => false]
 		);
 		if (!DBA::isResult($contact)) {
-			self::setFailedQueue($cmd, $target_id);
+			self::setFailedQueue($cmd, $target_item);
 			return;
 		}
 
 		if (Network::isUrlBlocked($contact['url'])) {
-			self::setFailedQueue($cmd, $target_id);
+			self::setFailedQueue($cmd, $target_item);
 			return;
 		}
 
@@ -227,20 +238,20 @@ class Delivery
 	/**
 	 * Increased the "failed" counter in the item delivery data
 	 *
-	 * @param string  $cmd Command
-	 * @param integer $id  Item id
+	 * @param string $cmd  Command
+	 * @param array  $item Item array
 	 */
-	private static function setFailedQueue(string $cmd, int $id)
+	private static function setFailedQueue(string $cmd, array $item)
 	{
 		if (!in_array($cmd, [Delivery::POST, Delivery::POKE])) {
 			return;
 		}
 
-		Model\ItemDeliveryData::incrementQueueFailed($id);
+		Model\Post\DeliveryData::incrementQueueFailed($item['uri-id'] ?? $item['id']);
 	}
 
 	/**
-	 * @brief Deliver content via DFRN
+	 * Deliver content via DFRN
 	 *
 	 * @param string  $cmd            Command
 	 * @param array   $contact        Contact record of the receiver
@@ -320,13 +331,13 @@ class Delivery
 			DFRN::import($atom, $target_importer);
 
 			if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
-				Model\ItemDeliveryData::incrementQueueDone($target_item['id'], Model\ItemDeliveryData::DFRN);
+				Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::DFRN);
 			}
 
 			return;
 		}
 
-		$protocol = Model\ItemDeliveryData::DFRN;
+		$protocol = Model\Post\DeliveryData::DFRN;
 
 		// We don't have a relationship with contacts on a public post.
 		// Se we transmit with the new method and via Diaspora as a fallback
@@ -342,9 +353,9 @@ class Delivery
 
 				if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
 					if (($deliver_status >= 200) && ($deliver_status <= 299)) {
-						Model\ItemDeliveryData::incrementQueueDone($target_item['id'], $protocol);
+						Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol);
 					} else {
-						Model\ItemDeliveryData::incrementQueueFailed($target_item['id']);
+						Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']);
 					}
 				}
 				return;
@@ -361,11 +372,11 @@ class Delivery
 			if ($deliver_status < 200) {
 				// Legacy DFRN
 				$deliver_status = DFRN::deliver($owner, $contact, $atom);
-				$protocol = Model\ItemDeliveryData::LEGACY_DFRN;
+				$protocol = Model\Post\DeliveryData::LEGACY_DFRN;
 			}
 		} else {
 			$deliver_status = DFRN::deliver($owner, $contact, $atom);
-			$protocol = Model\ItemDeliveryData::LEGACY_DFRN;
+			$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]);
@@ -375,7 +386,7 @@ class Delivery
 			Model\Contact::unmarkForArchival($contact);
 
 			if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
-				Model\ItemDeliveryData::incrementQueueDone($target_item['id'], $protocol);
+				Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol);
 			}
 		} else {
 			// The message could not be delivered. We mark the contact as "dead"
@@ -383,13 +394,13 @@ class Delivery
 
 			Logger::info('Delivery failed: defer message', ['id' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
 			if (!Worker::defer() && in_array($cmd, [Delivery::POST, Delivery::POKE])) {
-				Model\ItemDeliveryData::incrementQueueFailed($target_item['id']);
+				Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']);
 			}
 		}
 	}
 
 	/**
-	 * @brief Deliver content via Diaspora
+	 * Deliver content via Diaspora
 	 *
 	 * @param string  $cmd            Command
 	 * @param array   $contact        Contact record of the receiver
@@ -415,7 +426,7 @@ class Delivery
 
 		Logger::notice('Deliver via Diaspora', ['target' => $target_item['id'], 'guid' => $target_item['guid'], 'to' => $loc]);
 
-		if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) {
+		if (DI::config()->get('system', 'dfrn_only') || !DI::config()->get('system', 'diaspora_enabled')) {
 			return;
 		}
 
@@ -460,7 +471,7 @@ class Delivery
 			Model\Contact::unmarkForArchival($contact);
 
 			if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
-				Model\ItemDeliveryData::incrementQueueDone($target_item['id'], Model\ItemDeliveryData::DIASPORA);
+				Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::DIASPORA);
 			}
 		} else {
 			// The message could not be delivered. We mark the contact as "dead"
@@ -475,16 +486,16 @@ class Delivery
 				Logger::info('Delivery failed: defer message', ['id' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
 				// defer message for redelivery
 				if (!Worker::defer() && in_array($cmd, [Delivery::POST, Delivery::POKE])) {
-					Model\ItemDeliveryData::incrementQueueFailed($target_item['id']);
+					Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']);
 				}
 			} elseif (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
-				Model\ItemDeliveryData::incrementQueueFailed($target_item['id']);
+				Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']);
 			}
 		}
 	}
 
 	/**
-	 * @brief Deliver content via mail
+	 * Deliver content via mail
 	 *
 	 * @param string $cmd         Command
 	 * @param array  $contact     Contact record of the receiver
@@ -496,7 +507,7 @@ class Delivery
 	 */
 	private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent)
 	{
-		if (Config::get('system','dfrn_only')) {
+		if (DI::config()->get('system','dfrn_only')) {
 			return;
 		}
 
@@ -537,7 +548,7 @@ class Delivery
 			$reply_to = $mailacct['reply_to'];
 		}
 
-		$subject  = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : L10n::t("\x28no subject\x29"));
+		$subject  = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : DI::l10n()->t("\x28no subject\x29"));
 
 		// only expose our real email address to true friends
 
@@ -549,7 +560,8 @@ class Delivery
 				$headers  = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n";
 			}
 		} else {
-			$headers  = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . DI::baseUrl()->getHostname() . '>' . "\n";
+			$sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHostname());
+			$headers  = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <' . $sender . '>' . "\n";
 		}
 
 		$headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";
@@ -587,7 +599,7 @@ class Delivery
 
 		Email::send($addr, $subject, $headers, $target_item);
 
-		Model\ItemDeliveryData::incrementQueueDone($target_item['id'], Model\ItemDeliveryData::MAIL);
+		Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::MAIL);
 
 		Logger::info('Delivered via mail', ['guid' => $target_item['guid'], 'to' => $addr, 'subject' => $subject]);
 	}