*/
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';
}
$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.
// 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, ':'));
}
break;
case Protocol::MAIL:
- self::deliverMail($cmd, $contact, $owner, $target_item);
+ self::deliverMail($cmd, $contact, $owner, $target_item, $thr_parent);
break;
default:
*/
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) {
// 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)) {
* @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)) {
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']]);
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') . ' <noreply@' . self::getApp()->getHostName() . '>' . "\n";
+ $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . DI::baseUrl()->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";
}
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]);
}
}
projects / friendica.git / blobdiff