<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Email;
use Friendica\Protocol\Activity;
-use Friendica\Util\Strings;
use Friendica\Util\Network;
use Friendica\Core\Worker;
-use Friendica\Model\Conversation;
use Friendica\Model\FContact;
use Friendica\Model\Item;
-use Friendica\Model\Post;
use Friendica\Protocol\Relay;
class Delivery
{
Logger::info('Invoked', ['cmd' => $cmd, 'target' => $post_uriid, 'sender_uid' => $sender_uid, 'contact' => $contact_id]);
- if (!empty($sender_uid)) {
- $post = Post::selectFirst(['id'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]);
- if (!DBA::isResult($post)) {
- Logger::warning('Post not found', ['uri-id' => $post_uriid, 'uid' => $sender_uid]);
- return;
- }
- $target_id = $post['id'];
- } elseif (!in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION, Delivery::REMOVAL, Delivery::RELOCATION])) {
- $post = Post::selectFirst(['id', 'uid', 'uri-id'], ['item-id' => $post_uriid]);
- if (DBA::isResult($post)) {
- $target_id = $post['id'];
- $sender_uid = $post['uid'];
- $post_uriid = $post['uri-id'];
- }
- } else {
- $target_id = $post_uriid;
- }
-
$top_level = false;
$followup = false;
$public_message = false;
$items = [];
if ($cmd == self::MAIL) {
- $target_item = DBA::selectFirst('mail', [], ['id' => $target_id]);
+ $target_item = DBA::selectFirst('mail', [], ['id' => $post_uriid]);
if (!DBA::isResult($target_item)) {
return;
}
$uid = $target_item['uid'];
} elseif ($cmd == self::SUGGESTION) {
- $target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]);
+ $target_item = DBA::selectFirst('fsuggest', [], ['id' => $post_uriid]);
if (!DBA::isResult($target_item)) {
return;
}
$uid = $target_item['uid'];
} elseif ($cmd == self::RELOCATION) {
- $uid = $target_id;
+ $uid = $post_uriid;
$target_item = [];
} else {
- $item = Model\Post::selectFirst(['parent'], ['id' => $target_id]);
+ $item = Model\Post::selectFirst(['id', 'parent'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]);
if (!DBA::isResult($item) || empty($item['parent'])) {
+ Logger::warning('Post not found', ['uri-id' => $post_uriid, 'uid' => $sender_uid]);
return;
}
+ $target_id = intval($item['id']);
$parent_id = intval($item['parent']);
$condition = ['id' => [$target_id, $parent_id], 'visible' => true];
}
if (empty($items)) {
- Logger::log('No delivery data for ' . $cmd . ' - Item ID: ' .$target_id . ' - Contact ID: ' . $contact_id);
+ Logger::notice('No delivery data', ['command' => $cmd, 'uri-id' => $post_uriid, 'cid' => $contact_id]);
}
$owner = Model\User::getOwnerDataById($uid);
// Also transmit via Diaspora if this is a direct answer to a Diaspora comment.
// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
// Also transmit relayed posts from Diaspora contacts via Diaspora.
- if (!empty($parent) && !empty($thr_parent) && in_array(Protocol::DIASPORA, [$parent['network'], $thr_parent['network'], $target_item['network']])) {
+ if (($contact['network'] != Protocol::DIASPORA) && in_array(Protocol::DIASPORA, [$parent['network'] ?? '', $thr_parent['network'] ?? '', $target_item['network']])) {
+ Logger::info('Enforcing the Diaspora protocol', ['id' => $contact['id'], 'network' => $contact['network'], 'parent' => $parent['network'], 'thread-parent' => $thr_parent['network'], 'post' => $target_item['network']]);
$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']]);
+ Logger::notice('Delivering', ['cmd' => $cmd, 'uri-id' => $post_uriid, 'followup' => $followup, 'network' => $contact['network']]);
switch ($contact['network']) {
case Protocol::DFRN:
Logger::debug('Notifier entry: ' . $contact["url"] . ' ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' entry: ' . $atom);
- // perform local delivery if we are on the same site
- 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)) {
- return;
- }
- $target_uid = $target_self['uid'];
-
- // Check if the user has got this contact
- $cid = Model\Contact::getIdForURL($owner['url'], $target_uid);
- if (!$cid) {
- // Otherwise there should be a public contact
- $cid = Model\Contact::getIdForURL($owner['url']);
- if (!$cid) {
- return;
- }
- }
-
- $target_importer = DFRN::getImporter($cid, $target_uid);
- if (empty($target_importer)) {
- // This should never happen
- return;
- }
-
- DFRN::import($atom, $target_importer, Conversation::PARCEL_LOCAL_DFRN, Conversation::PUSH);
-
- if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
- Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::DFRN);
- }
-
- return;
- }
-
$protocol = Model\Post\DeliveryData::DFRN;
// We don't have a relationship with contacts on a public post.
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return;
}
- } elseif ($cmd != self::RELOCATION) {
+ } else {
// DFRN payload over Diaspora transport layer
$deliver_status = DFRN::transmit($owner, $contact, $atom);
- if (($deliver_status < 200) && (empty($server_protocol) || ($server_protocol == Model\Post\DeliveryData::LEGACY_DFRN))) {
- // Legacy DFRN
- $deliver_status = DFRN::deliver($owner, $contact, $atom);
- $protocol = Model\Post\DeliveryData::LEGACY_DFRN;
- }
- } else {
- $deliver_status = DFRN::deliver($owner, $contact, $atom);
- $protocol = Model\Post\DeliveryData::LEGACY_DFRN;
}
Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id'], 'return' => $deliver_status]);
Logger::notice('Deliver via Diaspora', ['target' => $target_item['id'], 'guid' => $target_item['guid'], 'to' => $loc]);
- if (DI::config()->get('system', 'dfrn_only') || !DI::config()->get('system', 'diaspora_enabled')) {
+ if (!DI::config()->get('system', 'diaspora_enabled')) {
return;
}
*/
private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent)
{
- if (DI::config()->get('system','dfrn_only')) {
+ if (DI::config()->get('system','imap_disabled')) {
return;
}
projects / friendica.git / blobdiff