X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FWorker%2FCron.php;h=21f67c030bab8a96333707e216a9efa98e2adacd;hb=4faf08c0643d3e6bbe2a0a77be2ff8c1dbea4d5c;hp=5fdda1396ca6c3a0574ad5a99cfd8418871ad5f9;hpb=259b99e6e94cd6714e65bb128af9cbe776fd3325;p=friendica.git

diff --git a/src/Core/Worker/Cron.php b/src/Core/Worker/Cron.php
index 5fdda1396c..21f67c030b 100644
--- a/src/Core/Worker/Cron.php
+++ b/src/Core/Worker/Cron.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -164,14 +164,13 @@ class Cron
 	 */
 	private static function deliverAPPosts()
 	{
-		$deliveries = DBA::p("SELECT `item-uri`.`uri` AS `inbox`, MAX(`failed`) AS `failed` FROM `post-delivery` INNER JOIN `item-uri` ON `item-uri`.`id` = `post-delivery`.`inbox-id` GROUP BY `inbox` ORDER BY RAND()");
+		$deliveries = DBA::p("SELECT `item-uri`.`uri` AS `inbox`, MAX(`gsid`) AS `gsid`, MAX(`shared`) AS `shared`, MAX(`failed`) AS `failed` FROM `post-delivery` INNER JOIN `item-uri` ON `item-uri`.`id` = `post-delivery`.`inbox-id` LEFT JOIN `inbox-status` ON `inbox-status`.`url` = `item-uri`.`uri` GROUP BY `inbox` ORDER BY RAND()");
 		while ($delivery = DBA::fetch($deliveries)) {
 			if ($delivery['failed'] > 0) {
 				Logger::info('Removing failed deliveries', ['inbox' => $delivery['inbox'], 'failed' => $delivery['failed']]);
 				Post\Delivery::removeFailed($delivery['inbox']);
 			}
-
-			if ($delivery['failed'] == 0) {
+			if (($delivery['failed'] == 0) && $delivery['shared'] && !empty($delivery['gsid']) && GServer::isReachableById($delivery['gsid'])) {
 				$result = ActivityPub\Delivery::deliver($delivery['inbox']);
 				Logger::info('Directly deliver inbox', ['inbox' => $delivery['inbox'], 'result' => $result['success']]);
 				continue;
@@ -190,6 +189,8 @@ class Cron
 			}
 		}
 
+		DBA::close($deliveries);
+
 		// Optimizing this table only last seconds
 		if (DI::config()->get('system', 'optimize_tables')) {
 			Logger::info('Optimize start');
@@ -210,7 +211,7 @@ class Cron
 				Delivery::removeFailedQueue($delivery['gsid']);
 			}
 
-			if (($delivery['failed'] < 3) || GServer::reachableById($delivery['gsid'])) {
+			if (($delivery['failed'] < 3) || GServer::isReachableById($delivery['gsid'])) {
 				$priority = Worker::PRIORITY_HIGH;
 			} elseif ($delivery['failed'] < 6) {
 				$priority = Worker::PRIORITY_MEDIUM;