X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=a2088fde5dcbb3c28fb69d148bff5b60c8fb24bc;hb=52c5b0e0f303c359c480671a84c4fc19ca190bd0;hp=fbc8fb8b25a21013c1447e33fc040a7e4d3ae9d4;hpb=81de61c6a7f6c0b2a3f50b50a8fc21c261bdb70f;p=friendica.git diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index fbc8fb8b25..a2088fde5d 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -4,22 +4,22 @@ */ namespace Friendica\Worker; -use Friendica\BaseObject; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model; use Friendica\Protocol\DFRN; use Friendica\Protocol\Diaspora; use Friendica\Protocol\Email; +use Friendica\Protocol\Activity; use Friendica\Util\Strings; use Friendica\Util\Network; use Friendica\Core\Worker; -class Delivery extends BaseObject +class Delivery { const MAIL = 'mail'; const SUGGESTION = 'suggest'; @@ -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. @@ -139,7 +139,7 @@ class Delivery extends BaseObject // if $parent['wall'] == 1 we will already have the parent message in our array // and we will relay the whole lot. - $localhost = self::getApp()->getHostName(); + $localhost = DI::baseUrl()->getHostname(); if (strpos($localhost, ':')) { $localhost = substr($localhost, 0, strpos($localhost, ':')); } @@ -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: @@ -250,6 +250,13 @@ class Delivery extends BaseObject */ private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup) { + // Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora + if (Diaspora::isReshare($target_item['body']) && !empty(Diaspora::personByHandle($contact['addr'], false))) { + Logger::info('Reshare will be transmitted via Diaspora', ['url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id']]); + self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); + return; + } + Logger::info('Deliver ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' via DFRN to ' . (($contact['addr'] ?? '') ?: $contact['url'])); if ($cmd == self::MAIL) { @@ -284,7 +291,7 @@ class Delivery extends BaseObject // perform local delivery if we are on the same site - if (Strings::compareLink($basepath, System::baseUrl())) { + if (Strings::compareLink($basepath, DI::baseUrl())) { $condition = ['nurl' => Strings::normaliseLink($contact['url']), 'self' => true]; $target_self = DBA::selectFirst('contact', ['uid'], $condition); if (!DBA::isResult($target_self)) { @@ -481,15 +488,15 @@ 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 direct parent in the thread * @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; } - // WARNING: does not currently convert to RFC2047 header encodings, etc. $addr = $contact['addr']; if (!strlen($addr)) { @@ -500,12 +507,27 @@ class Delivery extends BaseObject return; } + if ($target_item['verb'] != Activity::POST) { + 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,23 +541,23 @@ 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"; + $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' getHostname() . '>' . "\n"; } $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"]).">"; + // 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']) . '>'; } $headers .= "\n"; @@ -562,5 +584,9 @@ class Delivery extends BaseObject } Email::send($addr, $subject, $headers, $target_item); + + Model\ItemDeliveryData::incrementQueueDone($target_item['id'], Model\ItemDeliveryData::MAIL); + + Logger::info('Delivered via mail', ['guid' => $target_item['guid'], 'to' => $addr, 'subject' => $subject]); } }