From 37bdafcc964f1f94da51f0ff008eddecfba094a4 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 22 Nov 2019 22:15:04 +0000 Subject: [PATCH 1/2] Use the "reply-to" header of the original post when answering via mail --- src/Protocol/Email.php | 2 +- src/Worker/Delivery.php | 34 +++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php index 3df39af007..8e3edd7831 100644 --- a/src/Protocol/Email.php +++ b/src/Protocol/Email.php @@ -321,7 +321,7 @@ class Email } /** - * Function send is used by Protocol::EMAIL and Protocol::EMAIL2 code + * Function send is used by Protocol::EMAIL code * (not to notify the user, but to send items to email contacts) * * @param string $addr address diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index fbc8fb8b25..541583be5a 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -103,7 +103,7 @@ class Delivery extends BaseObject } $condition = ['uri' => $target_item['thr-parent'], 'uid' => $target_item['uid']]; - $thr_parent = Model\Item::selectFirst(['network'], $condition); + $thr_parent = Model\Item::selectFirst(['network', 'object'], $condition); if (!DBA::isResult($thr_parent)) { // Shouldn't happen. But when this does, we just take the parent as thread parent. // That's totally okay for what we use this variable here. @@ -209,7 +209,7 @@ class Delivery extends BaseObject break; case Protocol::MAIL: - self::deliverMail($cmd, $contact, $owner, $target_item); + self::deliverMail($cmd, $contact, $owner, $target_item, $thr_parent); break; default: @@ -481,10 +481,11 @@ 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 * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - private static function deliverMail($cmd, $contact, $owner, $target_item) + private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent) { if (Config::get('system','dfrn_only')) { return; @@ -500,12 +501,23 @@ class Delivery extends BaseObject return; } + if (!empty($thr_parent['object'])) { + $data = json_decode($thr_parent['object'], true); + if (!empty($data['reply_to'])) { + $addr = $data['reply_to'][0]['mailbox'] . '@' . $data['reply_to'][0]['host']; + Logger::info('Use "reply-to" address of the thread parent', ['addr' => $addr]); + } elseif (!empty($data['from'])) { + $addr = $data['from'][0]['mailbox'] . '@' . $data['from'][0]['host']; + Logger::info('Use "from" address of the thread parent', ['addr' => $addr]); + } + } + $local_user = DBA::selectFirst('user', [], ['uid' => $owner['uid']]); if (!DBA::isResult($local_user)) { return; } - Logger::log('Deliver ' . $target_item["guid"] . ' via mail to ' . $contact['addr']); + Logger::info('About to deliver via mail', ['guid' => $target_item['guid'], 'to' => $addr]); $reply_to = ''; $mailacct = DBA::selectFirst('mailacct', ['reply_to'], ['uid' => $owner['uid']]); @@ -519,10 +531,10 @@ class Delivery extends BaseObject if (($contact['rel'] == Model\Contact::FRIEND) && !$contact['blocked']) { if ($reply_to) { - $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $reply_to.'>' . "\n"; + $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $reply_to . '>' . "\n"; $headers .= 'Sender: ' . $local_user['email'] . "\n"; } else { - $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8').' <' . $local_user['email'] . '>' . "\n"; + $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n"; } } else { $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' getHostName() . '>' . "\n"; @@ -531,11 +543,11 @@ class Delivery extends BaseObject $headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n"; if ($target_item['uri'] !== $target_item['parent-uri']) { - $headers .= "References: <" . Email::iri2msgid($target_item["parent-uri"]) . ">"; + $headers .= 'References: <' . Email::iri2msgid($target_item['parent-uri']) . '>'; // If Threading is enabled, write down the correct parent - if (($target_item["thr-parent"] != "") && ($target_item["thr-parent"] != $target_item["parent-uri"])) { - $headers .= " <".Email::iri2msgid($target_item["thr-parent"]).">"; + if (($target_item['thr-parent'] != '') && ($target_item['thr-parent'] != $target_item['parent-uri'])) { + $headers .= ' <' . Email::iri2msgid($target_item['thr-parent']) . '>'; } $headers .= "\n"; @@ -562,5 +574,9 @@ class Delivery extends BaseObject } Email::send($addr, $subject, $headers, $target_item); + + Model\ItemDeliveryData::incrementQueueFailed($target_item['id']); + + Logger::info('Delivered via mail', ['guid' => $target_item['guid'], 'to' => $addr, 'subject' => $subject]); } } From 2dcf6d9e2b11ddb5cdbbe0c287638013ac0d936f Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 23 Nov 2019 04:31:40 +0000 Subject: [PATCH 2/2] Now using the correct function call ... --- src/Model/ItemDeliveryData.php | 1 + src/Worker/Delivery.php | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Model/ItemDeliveryData.php b/src/Model/ItemDeliveryData.php index 7c64427eff..3e2a75598a 100644 --- 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 541583be5a..c98c60f426 100644 --- 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]); }