X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItemDeliveryData.php;h=a26c80b1cb1f356a18f3a01f9b70f887362995ae;hb=7b7132971a64a92a685a5fd860fe4709dce1765a;hp=8d273e22b964bf664c14d5ac7bc5841cdfe1f151;hpb=3282ce53894b624893ee2989747a59866ab4b137;p=friendica.git

diff --git a/src/Model/ItemDeliveryData.php b/src/Model/ItemDeliveryData.php
index 8d273e22b9..a26c80b1cb 100644
--- a/src/Model/ItemDeliveryData.php
+++ b/src/Model/ItemDeliveryData.php
@@ -1,12 +1,28 @@
 <?php
-
 /**
- * @file src/Model/ItemDeliveryData.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\Model;
 
 use Friendica\Database\DBA;
+use \BadMethodCallException;
 
 class ItemDeliveryData
 {
@@ -20,8 +36,16 @@ class ItemDeliveryData
 		// New delivery fields with virtual field name in item fields
 		'queue_count' => 'delivery_queue_count',
 		'queue_done'  => 'delivery_queue_done',
+		'queue_failed'  => 'delivery_queue_failed',
 	];
 
+	const ACTIVITYPUB = 1;
+	const DFRN = 2;
+	const LEGACY_DFRN = 3;
+	const DIASPORA = 4;
+	const OSTATUS = 5;
+	const MAIL = 6;
+
 	/**
 	 * Extract delivery data from the provided item fields
 	 *
@@ -31,7 +55,7 @@ class ItemDeliveryData
 	public static function extractFields(array &$fields)
 	{
 		$delivery_data = [];
-		foreach (ItemDeliveryData::FIELD_LIST as $key => $field) {
+		foreach (array_merge(ItemDeliveryData::FIELD_LIST, ItemDeliveryData::LEGACY_FIELD_LIST) as $key => $field) {
 			if (is_int($key) && isset($fields[$field])) {
 				// Legacy field moved from item table
 				$delivery_data[$field] = $fields[$field];
@@ -52,12 +76,60 @@ class ItemDeliveryData
 	 * Avoids racing condition between multiple delivery threads.
 	 *
 	 * @param integer $item_id
+	 * @param integer $protocol
+	 * @return bool
+	 * @throws \Exception
+	 */
+	public static function incrementQueueDone($item_id, $protocol = 0)
+	{
+		$sql = '';
+
+		switch ($protocol) {
+			case self::ACTIVITYPUB:
+				$sql = ", `activitypub` = `activitypub` + 1";
+				break;
+			case self::DFRN:
+				$sql = ", `dfrn` = `dfrn` + 1";
+				break;
+			case self::LEGACY_DFRN:
+				$sql = ", `legacy_dfrn` = `legacy_dfrn` + 1";
+				break;
+			case self::DIASPORA:
+				$sql = ", `diaspora` = `diaspora` + 1";
+				break;
+			case self::OSTATUS:
+				$sql = ", `ostatus` = `ostatus` + 1";
+				break;
+		}
+
+		return DBA::e('UPDATE `item-delivery-data` SET `queue_done` = `queue_done` + 1' . $sql . ' WHERE `iid` = ?', $item_id);
+	}
+
+	/**
+	 * Increments the queue_failed for the given item ID.
+	 *
+	 * Avoids racing condition between multiple delivery threads.
+	 *
+	 * @param integer $item_id
+	 * @return bool
+	 * @throws \Exception
+	 */
+	public static function incrementQueueFailed($item_id)
+	{
+		return DBA::e('UPDATE `item-delivery-data` SET `queue_failed` = `queue_failed` + 1 WHERE `iid` = ?', $item_id);
+	}
+
+	/**
+	 * Increments the queue_count for the given item ID.
+	 *
+	 * @param integer $item_id
+	 * @param integer $increment
 	 * @return bool
 	 * @throws \Exception
 	 */
-	public static function incrementQueueDone($item_id)
+	public static function incrementQueueCount(int $item_id, int $increment = 1)
 	{
-		return DBA::e('UPDATE `item-delivery-data` SET `queue_done` = `queue_done` + 1 WHERE `iid` = ?', $item_id);
+		return DBA::e('UPDATE `item-delivery-data` SET `queue_count` = `queue_count` + ? WHERE `iid` = ?', $increment, $item_id);
 	}
 
 	/**
@@ -71,7 +143,7 @@ class ItemDeliveryData
 	public static function insert($item_id, array $fields)
 	{
 		if (empty($item_id)) {
-			throw new \BadMethodCallException('Empty item_id');
+			throw new BadMethodCallException('Empty item_id');
 		}
 
 		$fields['iid'] = $item_id;
@@ -92,7 +164,7 @@ class ItemDeliveryData
 	public static function update($item_id, array $fields)
 	{
 		if (empty($item_id)) {
-			throw new \BadMethodCallException('Empty item_id');
+			throw new BadMethodCallException('Empty item_id');
 		}
 
 		if (empty($fields)) {
@@ -113,7 +185,7 @@ class ItemDeliveryData
 	public static function delete($item_id)
 	{
 		if (empty($item_id)) {
-			throw new \BadMethodCallException('Empty item_id');
+			throw new BadMethodCallException('Empty item_id');
 		}
 
 		return DBA::delete('item-delivery-data', ['iid' => $item_id]);