Now using the correct function call ...

diff --git a/src/Model/ItemDeliveryData.php b/src/Model/ItemDeliveryData.php
index 7c64427eff7571ebb0608e833b37d63f62890d0c..3e2a75598a57dd2f6b0df41646eb8613542cf915 100644 (file)
--- a/src/Model/ItemDeliveryData.php
+++ b/src/Model/ItemDeliveryData.php
@@ -29,6 +29,7 @@ class ItemDeliveryData
        const LEGACY_DFRN = 3;
        const DIASPORA = 4;
        const OSTATUS = 5;
+       const MAIL = 6;
 
        /**
         * Extract delivery data from the provided item fields

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 541583be5a51512acd02d493cc71f80313a91342..c98c60f4263fbcbd5f3d93bb3f568fa626e4db16 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -481,7 +481,7 @@ class Delivery extends BaseObject
         * @param array  $contact     Contact record of the receiver
         * @param array  $owner       Owner record of the sender
         * @param array  $target_item Item record of the content
-        * @param array  $thr_parent  Item record of the thread parent
+        * @param array  $thr_parent  Item record of the direct parent in the thread
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
@@ -490,7 +490,6 @@ class Delivery extends BaseObject
                if (Config::get('system','dfrn_only')) {
                        return;
                }
-               // WARNING: does not currently convert to RFC2047 header encodings, etc.
 
                $addr = $contact['addr'];
                if (!strlen($addr)) {
@@ -545,7 +544,7 @@ class Delivery extends BaseObject
                if ($target_item['uri'] !== $target_item['parent-uri']) {
                        $headers .= 'References: <' . Email::iri2msgid($target_item['parent-uri']) . '>';
 
-                       // If Threading is enabled, write down the correct parent
+                       // Export more references on deeper nested threads
                        if (($target_item['thr-parent'] != '') && ($target_item['thr-parent'] != $target_item['parent-uri'])) {
                                $headers .= ' <' . Email::iri2msgid($target_item['thr-parent']) . '>';
                        }
@@ -575,7 +574,7 @@ class Delivery extends BaseObject
 
                Email::send($addr, $subject, $headers, $target_item);
 
-               Model\ItemDeliveryData::incrementQueueFailed($target_item['id']);
+               Model\ItemDeliveryData::incrementQueueDone($target_item['id'], Model\ItemDeliveryData::MAIL);
 
                Logger::info('Delivered via mail', ['guid' => $target_item['guid'], 'to' => $addr, 'subject' => $subject]);
        }