X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDelivery.php;h=c09181d3e6b5a3aa1d84953e0e0bba04f79733e8;hb=60532ee7e4152af9997e0d7b69c7b35262d5528d;hp=e42b5a10195f4c5035ffedbdc949873f38f0d857;hpb=a1ee75eba7a4d712adfbcdf578e4aca94789be6a;p=friendica.git diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index e42b5a1019..c09181d3e6 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']; @@ -102,12 +104,12 @@ class Delivery DBA::close($itemdata); if (empty($target_item)) { - Logger::log('Item ' . $target_id . "wasn't found. Quitting here."); + Logger::notice('Item ' . $target_id . "wasn't found. Quitting here."); return; } if (empty($parent)) { - Logger::log('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here."); + Logger::notice('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here."); self::setFailedQueue($cmd, $target_item); return; } @@ -117,7 +119,7 @@ class Delivery } elseif (!empty($target_item['uid'])) { $uid = $target_item['uid']; } else { - Logger::log('Only public users for item ' . $target_id, Logger::DEBUG); + Logger::info('Only public users for item ' . $target_id); self::setFailedQueue($cmd, $target_item); return; } @@ -166,7 +168,7 @@ class Delivery */ if (!$top_level && ($parent['wall'] == 0) && stristr($target_item['uri'], $localhost)) { - Logger::log('Followup ' . $target_item["guid"], Logger::DEBUG); + Logger::info('Followup ' . $target_item["guid"]); // local followup to remote post $followup = true; } @@ -210,7 +212,8 @@ 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; } @@ -269,7 +272,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; @@ -284,7 +287,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) { @@ -394,7 +397,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; } @@ -415,22 +418,22 @@ class Delivery $deliver_status = Diaspora::sendAccountMigration($owner, $contact, $owner['uid']); } elseif ($target_item['deleted'] && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) { // top-level retraction - Logger::log('diaspora retract: ' . $loc); + Logger::notice('diaspora retract: ' . $loc); $deliver_status = Diaspora::sendRetraction($target_item, $owner, $contact, $public_message); } elseif ($followup) { // send comments and likes to owner to relay - Logger::log('diaspora followup: ' . $loc); + Logger::notice('diaspora followup: ' . $loc); $deliver_status = Diaspora::sendFollowup($target_item, $owner, $contact, $public_message); } elseif ($target_item['uri'] !== $target_item['parent-uri']) { // we are the relay - send comments, likes and relayable_retractions to our conversants - Logger::log('diaspora relay: ' . $loc); + Logger::notice('diaspora relay: ' . $loc); $deliver_status = Diaspora::sendRelay($target_item, $owner, $contact, $public_message); } elseif ($top_level && !$walltowall) { // currently no workable solution for sending walltowall - Logger::log('diaspora status: ' . $loc); + Logger::notice('diaspora status: ' . $loc); $deliver_status = Diaspora::sendStatus($target_item, $owner, $contact, $public_message); } else { - Logger::log('Unknown mode ' . $cmd . ' for ' . $loc); + Logger::notice('Unknown mode ' . $cmd . ' for ' . $loc); return; } @@ -477,7 +480,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; }