X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=94a0f4902b0ba3c441e0cfe915b6c740fd985711;hb=5367620467f690774966c77cf5049ace9e6552a8;hp=97478ee18e4aef4b1c85487db744cc9d36ac1b34;hpb=a6a79d9c7e659af6899150538306e5c7a6bd2a57;p=friendica.git diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 97478ee18e..94a0f4902b 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -1,16 +1,30 @@ . + * */ + 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; @@ -20,7 +34,7 @@ use Friendica\Util\Strings; use Friendica\Util\Network; use Friendica\Core\Worker; -class Delivery extends BaseObject +class Delivery { const MAIL = 'mail'; const SUGGESTION = 'suggest'; @@ -140,7 +154,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, ':')); } @@ -162,7 +176,7 @@ class Delivery extends BaseObject && empty($parent['allow_gid']) && empty($parent['deny_cid']) && empty($parent['deny_gid']) - && !$parent["private"]) { + && ($parent["private"] != Model\Item::PRIVATE)) { $public_message = true; } } @@ -198,6 +212,11 @@ class Delivery extends BaseObject $contact['network'] = Protocol::DIASPORA; } + // Ensure that local contacts are delivered locally + if (Model\Contact::isLocal($contact['url'])) { + $contact['network'] = Protocol::DFRN; + } + Logger::notice('Delivering', ['cmd' => $cmd, 'target' => $target_id, 'followup' => $followup, 'network' => $contact['network']]); switch ($contact['network']) { @@ -236,7 +255,7 @@ class Delivery extends BaseObject } /** - * @brief Deliver content via DFRN + * Deliver content via DFRN * * @param string $cmd Command * @param array $contact Contact record of the receiver @@ -251,6 +270,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) { @@ -281,11 +307,8 @@ class Delivery extends BaseObject Logger::debug('Notifier entry: ' . $contact["url"] . ' ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' entry: ' . $atom); - $basepath = implode('/', array_slice(explode('/', $contact['url']), 0, 3)); - // perform local delivery if we are on the same site - - if (Strings::compareLink($basepath, System::baseUrl())) { + if (Model\Contact::isLocal($contact['url'])) { $condition = ['nurl' => Strings::normaliseLink($contact['url']), 'self' => true]; $target_self = DBA::selectFirst('contact', ['uid'], $condition); if (!DBA::isResult($target_self)) { @@ -381,7 +404,7 @@ class Delivery extends BaseObject } /** - * @brief Deliver content via Diaspora + * Deliver content via Diaspora * * @param string $cmd Command * @param array $contact Contact record of the receiver @@ -407,7 +430,7 @@ class Delivery extends BaseObject Logger::notice('Deliver via Diaspora', ['target' => $target_item['id'], 'guid' => $target_item['guid'], 'to' => $loc]); - if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) { + if (DI::config()->get('system', 'dfrn_only') || !DI::config()->get('system', 'diaspora_enabled')) { return; } @@ -476,7 +499,7 @@ class Delivery extends BaseObject } /** - * @brief Deliver content via mail + * Deliver content via mail * * @param string $cmd Command * @param array $contact Contact record of the receiver @@ -488,7 +511,7 @@ class Delivery extends BaseObject */ private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent) { - if (Config::get('system','dfrn_only')) { + if (DI::config()->get('system','dfrn_only')) { return; } @@ -500,7 +523,7 @@ class Delivery extends BaseObject if (!in_array($cmd, [self::POST, self::POKE])) { return; } -Logger::info('Blubb', $target_item); + if ($target_item['verb'] != Activity::POST) { return; } @@ -529,7 +552,7 @@ Logger::info('Blubb', $target_item); $reply_to = $mailacct['reply_to']; } - $subject = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : L10n::t("\x28no subject\x29")); + $subject = ($target_item['title'] ? Email::encodeHeader($target_item['title'], 'UTF-8') : DI::l10n()->t("\x28no subject\x29")); // only expose our real email address to true friends @@ -541,7 +564,8 @@ Logger::info('Blubb', $target_item); $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"; + $sender = DI::config()->get('config', 'sender_email', 'noreply@' . DI::baseUrl()->getHostname()); + $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <' . $sender . '>' . "\n"; } $headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";