X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=36d576cffe7b09fd1861c3b68adcab056ee3ccb0;hb=ab83d0dd27e46e733ecb49f25789bfb318852ac7;hp=2a88933d506fc6f8ec98e579af23dcf024c4f6c8;hpb=99a145f7cff984f19e8adbc018a8b631aaa58e0f;p=friendica.git diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 2a88933d50..36d576cffe 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -1,6 +1,6 @@ $post_uriid]); - if (!DBA::isResult($target_item)) { + try { + $target_item = DI::fsuggest()->selectOneById($post_uriid)->toArray(); + } catch (FriendSuggestNotFoundException $e) { + DI::logger()->info('Cannot find FriendSuggestion', ['id' => $post_uriid]); return; } $uid = $target_item['uid']; @@ -212,15 +213,11 @@ class Delivery // 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, 'uri-id' => $post_uriid, 'followup' => $followup, 'network' => $contact['network']]); switch ($contact['network']) { @@ -276,7 +273,7 @@ class Delivery private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup, $server_protocol) { // Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora - if (Diaspora::isReshare($target_item['body']) && !empty(FContact::getByURL($contact['addr'], false))) { + if (Diaspora::isReshare($target_item['body'] ?? '') && !empty(FContact::getByURL($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; @@ -291,7 +288,7 @@ class Delivery } elseif ($cmd == self::SUGGESTION) { $item = $target_item; $atom = DFRN::fsuggest($item, $owner); - DBA::delete('fsuggest', ['id' => $item['id']]); + DI::fsuggest()->delete(new FriendSuggests([DI::fsuggest()->selectOneById($item['id'])])); } elseif ($cmd == self::RELOCATION) { $atom = DFRN::relocate($owner, $owner['uid']); } elseif ($followup) { @@ -316,40 +313,6 @@ class Delivery 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. @@ -381,17 +344,9 @@ class Delivery 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]); @@ -443,7 +398,7 @@ class Delivery 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; } @@ -526,7 +481,7 @@ class Delivery */ 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; }