X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FNotifier.php;h=20023792d51925ca550b1b3685a7f49f284ab535;hb=9b7432781b1a3e33713b17b55ab94529f6f9de36;hp=512fbe88440d3d951ea758eef836e62ddd5799ad;hpb=3392c7a8be6b40931cce90f1e6d9360529d3e832;p=friendica.git diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index 512fbe8844..20023792d5 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -11,6 +11,7 @@ use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\Model\APContact; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\Group; @@ -31,23 +32,7 @@ require_once 'include/items.php'; * * Worker::add(PRIORITY_HIGH, "Notifier", COMMAND, ITEM_ID); * - * where COMMAND is one of the following: - * - * activity (in diaspora.php, dfrn_confirm.php, profiles.php) - * comment-import (in diaspora.php, items.php) - * comment-new (in item.php) - * drop (in diaspora.php, items.php, photos.php) - * edit_post (in item.php) - * event (in events.php) - * like (in like.php, poke.php) - * mail (in message.php) - * suggest (in fsuggest.php) - * tag (in photos.php, poke.php, tagger.php) - * tgroup (in items.php) - * wall-new (in photos.php, item.php) - * removeme (in Contact.php) - * relocate (in uimport.php) - * + * where COMMAND is one of the constants that are defined in Worker/Delivery.php * and ITEM_ID is the id of the item in the database that needs to be sent to others. */ @@ -75,6 +60,14 @@ class Notifier } $uid = $message['uid']; $recipients[] = $message['contact-id']; + + $mail = ActivityPub\Transmitter::ItemArrayFromMail($target_id); + $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($mail, $uid, true); + foreach ($inboxes as $inbox) { + Logger::info('Delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_id, 'inbox' => $inbox]); + Worker::add(['priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true], + 'APDelivery', $cmd, $target_id, $inbox, $uid); + } } elseif ($cmd == Delivery::SUGGESTION) { $suggest = DBA::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $target_id]); if (!DBA::isResult($suggest)) { @@ -88,7 +81,7 @@ class Notifier $uid = $target_id; $condition = ['uid' => $target_id, 'self' => false, 'network' => [Protocol::DFRN, Protocol::DIASPORA]]; - $delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'network', 'batch'], $condition); + $delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'network', 'protocol', 'batch'], $condition); } else { // find ancestors $condition = ['id' => $target_id, 'visible' => true, 'moderated' => false]; @@ -152,14 +145,23 @@ class Notifier if (!empty($target_item) && !empty($items)) { $parent = $items[0]; - $delivery_queue_count += self::activityPubDelivery($cmd, $target_item, $parent, $a->queue['priority'], $a->queue['created']); + if (!self::isRemovalActivity($cmd, $owner, Protocol::ACTIVITYPUB)) { + $delivery_queue_count += self::activityPubDelivery($cmd, $target_item, $parent, $a->queue['priority'], $a->queue['created'], $owner); + } - $fields = ['network', 'author-id', 'owner-id']; + $fields = ['network', 'author-id', 'author-link', 'owner-id']; $condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]]; $thr_parent = Item::selectFirst($fields, $condition); Logger::log('GUID: ' . $target_item["guid"] . ': Parent is ' . $parent['network'] . '. Thread parent is ' . $thr_parent['network'], Logger::DEBUG); + // Only deliver threaded replies (comment to a comment) to Diaspora + // when the original comment author does support the Diaspora protocol. + if ($target_item['parent-uri'] != $target_item['thr-parent']) { + $diaspora_delivery = Diaspora::isSupportedByContactUrl($thr_parent['author-link']); + Logger::info('Threaded comment', ['diaspora_delivery' => (int)$diaspora_delivery]); + } + // This is IMPORTANT!!!! // We will only send a "notify owner to relay" or followup message if the referenced post @@ -188,7 +190,7 @@ class Notifier } - if (($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && !$top_level) { + if (($cmd === Delivery::UPLINK) && (intval($parent['forum_mode']) == 1) && !$top_level) { $relay_to_owner = true; } @@ -204,13 +206,13 @@ class Notifier } // Special treatment for forum posts - if (self::isForumPost($target_item, $owner)) { + if (Item::isForumPost($target_item, $owner)) { $relay_to_owner = true; $direct_forum_delivery = true; } // Avoid that comments in a forum thread are sent to OStatus - if (self::isForumPost($parent, $owner)) { + if (Item::isForumPost($parent, $owner)) { $direct_forum_delivery = true; } @@ -269,15 +271,15 @@ class Notifier } $allow_people = expand_acl($parent['allow_cid']); - $allow_groups = Group::expand(expand_acl($parent['allow_gid']),true); + $allow_groups = Group::expand($uid, expand_acl($parent['allow_gid']),true); $deny_people = expand_acl($parent['deny_cid']); - $deny_groups = Group::expand(expand_acl($parent['deny_gid'])); + $deny_groups = Group::expand($uid, expand_acl($parent['deny_gid'])); // if our parent is a public forum (forum_mode == 1), uplink to the origional author causing // a delivery fork. private groups (forum_mode == 2) do not uplink - if ((intval($parent['forum_mode']) == 1) && !$top_level && ($cmd !== 'uplink')) { - Worker::add($a->queue['priority'], 'Notifier', 'uplink', $target_id); + if ((intval($parent['forum_mode']) == 1) && !$top_level && ($cmd !== Delivery::UPLINK)) { + Worker::add($a->queue['priority'], 'Notifier', Delivery::UPLINK, $target_id); } foreach ($items as $item) { @@ -354,9 +356,11 @@ class Notifier } // It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora - $networks = [Protocol::OSTATUS, Protocol::DFRN]; + $networks = [Protocol::DFRN]; + } elseif ($diaspora_delivery) { + $networks = [Protocol::DFRN, Protocol::DIASPORA, Protocol::MAIL]; } else { - $networks = [Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA, Protocol::MAIL]; + $networks = [Protocol::DFRN, Protocol::MAIL]; } } else { $public_message = false; @@ -371,7 +375,7 @@ class Notifier if (!empty($networks)) { $condition['network'] = $networks; } - $delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'network', 'batch'], $condition); + $delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'network', 'protocol', 'batch'], $condition); } $conversants = []; @@ -385,10 +389,11 @@ class Notifier $relay_list_stmt = DBA::p( "SELECT - `batch`, - ANY_VALUE(`id`) AS `id`, - ANY_VALUE(`name`) AS `name`, - ANY_VALUE(`network`) AS `network` + `batch`, + ANY_VALUE(`id`) AS `id`, + ANY_VALUE(`name`) AS `name`, + ANY_VALUE(`network`) AS `network`, + ANY_VALUE(`protocol`) AS `protocol` FROM `contact` WHERE `network` = ? AND `batch` != '' @@ -410,7 +415,7 @@ class Notifier // Add the relay to the list, avoid duplicates. // Don't send community posts to the relay. Forum posts via the Diaspora protocol are looking ugly. - if (!$followup && !self::isForumPost($target_item, $owner)) { + if (!$followup && !Item::isForumPost($target_item, $owner)) { $relay_list = Diaspora::relayList($target_id, $relay_list); } } @@ -418,12 +423,27 @@ class Notifier $condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false, 'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]; - $r2 = DBA::toArray(DBA::select('contact', ['id', 'name', 'network'], $condition)); + $r2 = DBA::toArray(DBA::select('contact', ['id', 'url', 'name', 'network', 'protocol'], $condition)); $r = array_merge($r2, $relay_list); if (DBA::isResult($r)) { foreach ($r as $rr) { + if (!empty($rr['id']) && Contact::isArchived($rr['id'])) { + Logger::info('Contact is archived', $rr); + continue; + } + + if (self::isRemovalActivity($cmd, $owner, $rr['network'])) { + Logger::log('Skipping dropping for ' . $rr['url'] . ' since the network supports account removal commands.', Logger::DEBUG); + continue; + } + + if (self::skipDFRN($rr, $target_item, $cmd)) { + Logger::info('Contact can be delivered via AP, so skip delivery via legacy DFRN', ['url' => $rr['url']]); + continue; + } + $conversants[] = $rr['id']; $delivery_queue_count++; @@ -433,7 +453,8 @@ class Notifier // Ensure that posts with our own protocol arrives before Diaspora posts arrive. // Situation is that sometimes Friendica servers receive Friendica posts over the Diaspora protocol first. // The conversion in Markdown reduces the formatting, so these posts should arrive after the Friendica posts. - if ($rr['network'] == Protocol::DIASPORA) { + // This is only important for high and medium priority tasks and not for Low priority jobs like deletions. + if (($rr['network'] == Protocol::DIASPORA) && in_array($a->queue['priority'], [PRIORITY_HIGH, PRIORITY_MEDIUM])) { $deliver_options = ['priority' => $a->queue['priority'], 'dont_fork' => true]; } else { $deliver_options = ['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true]; @@ -447,6 +468,21 @@ class Notifier // delivery loop while ($contact = DBA::fetch($delivery_contacts_stmt)) { + if (!empty($contact['id']) && Contact::isArchived($contact['id'])) { + Logger::info('Contact is archived', $contact); + continue; + } + + if (self::isRemovalActivity($cmd, $owner, $contact['network'])) { + Logger::log('Skipping dropping for ' . $contact['url'] . ' since the network supports account removal commands.', Logger::DEBUG); + continue; + } + + if (self::skipDFRN($contact, $target_item, $cmd)) { + Logger::info('Contact can be delivered via AP, so skip delivery via legacy DFRN', ['url' => $contact['url']]); + continue; + } + // Don't deliver to Diaspora if it already had been done as batch delivery if (($contact['network'] == Protocol::DIASPORA) && $batch_delivery) { Logger::log('Already delivered id ' . $target_id . ' via batch to ' . json_encode($contact), Logger::DEBUG); @@ -475,7 +511,6 @@ class Notifier } DBA::close($delivery_contacts_stmt); - $url_recipients = array_filter($url_recipients); // send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts // They are especially used for notifications to OStatus users that don't follow us. @@ -486,7 +521,7 @@ class Notifier Logger::log('Salmon delivery of item ' . $target_id . ' to ' . $url); /// @TODO Redeliver/queue these items on failure, though there is no contact record Salmon::slapper($owner, $url, $slap); - ItemDeliveryData::incrementQueueDone($target_id); + ItemDeliveryData::incrementQueueDone($target_id, ItemDeliveryData::OSTATUS); } } @@ -501,18 +536,72 @@ class Notifier if (!empty($target_item)) { Logger::log('Calling hooks for ' . $cmd . ' ' . $target_id, Logger::DEBUG); - if (in_array($cmd, [Delivery::POST, Delivery::COMMENT])) { - ItemDeliveryData::update($target_item['id'], ['queue_count' => $delivery_queue_count]); - } - Hook::fork($a->queue['priority'], 'notifier_normal', $target_item); Hook::callAll('notifier_end', $target_item); + + // Workaround for pure connector posts + if ($delivery_queue_count == 0) { + ItemDeliveryData::incrementQueueDone($target_item['id']); + $delivery_queue_count = 1; + } + + if (in_array($cmd, [Delivery::POST, Delivery::POKE])) { + ItemDeliveryData::update($target_item['id'], ['queue_count' => $delivery_queue_count]); + } } return; } + /** + * Checks if the current delivery process needs to be transported via DFRN. + * + * @param array $contact Receiver of the post + * @param array $item The post + * @param string $cmd Notifier command + * @return bool + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + private static function skipDFRN($contact, $item, $cmd) + { + // Don't skip when author or owner don't have AP profiles + if ((!empty($item['author-link']) && empty(APContact::getByURL($item['author-link'], false))) || (!empty($item['owner-link']) && empty(APContact::getByURL($item['owner-link'], false)))) { + return false; + } + + // Don't skip DFRN delivery for these commands + if (in_array($cmd, [Delivery::SUGGESTION, Delivery::REMOVAL, Delivery::RELOCATION, Delivery::POKE])) { + return false; + } + + // Skip DFRN when the item will be (forcefully) delivered via AP + if (Config::get('debug', 'total_ap_delivery') && ($contact['network'] == Protocol::DFRN) && !empty(APContact::getByURL($contact['url'], false))) { + return true; + } + + // Skip DFRN delivery if the contact speaks ActivityPub + return in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && ($contact['protocol'] == Protocol::ACTIVITYPUB); + } + + /** + * Checks if the current action is a deletion command of a account removal activity + * For Diaspora and ActivityPub we don't need to send single item deletion calls. + * These protocols do have a dedicated command for deleting a whole account. + * + * @param string $cmd Notifier command + * @param array $owner Sender of the post + * @param string $network Receiver network + * @return bool + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + private static function isRemovalActivity($cmd, $owner, $network) + { + return ($cmd == Delivery::DELETION) && $owner['account_removed'] && in_array($network, [Protocol::ACTIVITYPUB, Protocol::DIASPORA]); + } + /** * @param int $self_user_id * @param int $priority The priority the Notifier queue item was created with @@ -540,7 +629,7 @@ class Notifier $inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser(0); foreach ($inboxes as $inbox) { - Logger::log('Account removal for user ' . $self_user_id . ' to ' . $inbox .' via ActivityPub', Logger::DEBUG); + Logger::info('Account removal via ActivityPub', ['uid' => $self_user_id, 'inbox' => $inbox]); Worker::add(['priority' => PRIORITY_NEGLIGIBLE, 'created' => $created, 'dont_fork' => true], 'APDelivery', Delivery::REMOVAL, '', $inbox, $self_user_id); } @@ -558,7 +647,7 @@ class Notifier * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - private static function activityPubDelivery($cmd, array $target_item, array $parent, $priority, $created) + private static function activityPubDelivery($cmd, array $target_item, array $parent, $priority, $created, $owner) { $inboxes = []; @@ -567,6 +656,9 @@ class Notifier if ($target_item['origin']) { $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $uid); Logger::log('Origin item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG); + } elseif (Item::isForumPost($target_item, $owner)) { + $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $uid, false, 0, true); + Logger::log('Forum item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG); } elseif (!DBA::exists('conversation', ['item-uri' => $target_item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB])) { Logger::log('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' is no AP post. It will not be distributed.', Logger::DEBUG); return 0; @@ -586,7 +678,7 @@ class Notifier ActivityPub\Transmitter::createCachedActivityFromItem($target_item['id'], true); foreach ($inboxes as $inbox) { - Logger::log('Deliver ' . $target_item['id'] .' to ' . $inbox .' via ActivityPub', Logger::DEBUG); + Logger::info('Delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]); Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true], 'APDelivery', $cmd, $target_item['id'], $inbox, $uid); @@ -594,24 +686,4 @@ class Notifier return count($inboxes); } - - private static function isForumPost(array $item, array $owner) - { - if (($item['author-id'] == $item['owner-id']) || - ($owner['id'] == $item['contact-id']) || - ($item['uri'] != $item['parent-uri'])) { - return false; - } - - $fields = ['forum', 'prv']; - $condition = ['id' => $item['contact-id']]; - $contact = DBA::selectFirst('contact', $fields, $condition); - if (!DBA::isResult($contact)) { - // Should never happen - return false; - } - - // Is the post from a forum? - return ($contact['forum'] || $contact['prv']); - } }