X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FNotifier.php;h=dac3346f95a6adef8d93f10f51185adddf0bf97c;hb=8eba329111e832d7efdacf4f6a6fa85b0f7abbf3;hp=859f92d9907bc6b8cab414dd5b56a1446c55265a;hpb=1e6193a14e30c18e81645d5125a2aa25a90fe6df;p=friendica.git diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index 859f92d990..dac3346f95 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -11,10 +11,12 @@ 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; use Friendica\Model\Item; +use Friendica\Model\ItemDeliveryData; use Friendica\Model\PushSubscriber; use Friendica\Model\User; use Friendica\Network\Probe; @@ -65,6 +67,7 @@ class Notifier $delivery_contacts_stmt = null; $target_item = []; $items = []; + $delivery_queue_count = 0; if ($cmd == Delivery::MAIL) { $message = DBA::selectFirst('mail', ['uid', 'contact-id'], ['id' => $target_id]); @@ -150,7 +153,9 @@ class Notifier if (!empty($target_item) && !empty($items)) { $parent = $items[0]; - self::activityPubDelivery($cmd, $target_item, $parent, $a->queue['priority'], $a->query_string['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']; $condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]]; @@ -202,13 +207,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; } @@ -408,7 +413,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); } } @@ -416,19 +421,33 @@ 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'], $condition)); $r = array_merge($r2, $relay_list); if (DBA::isResult($r)) { foreach ($r as $rr) { + 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 (Config::get('debug', 'total_ap_delivery') && !empty($rr['url']) && ($rr['network'] == Protocol::DFRN) && !empty(APContact::getByURL($rr['url'], false))) { + Logger::log('Skipping contact ' . $rr['url'] . ' since it will be delivered via AP', Logger::DEBUG); + continue; + } + $conversants[] = $rr['id']; + + $delivery_queue_count++; + Logger::log('Public delivery of item ' . $target_item["guid"] . ' (' . $target_id . ') to ' . json_encode($rr), Logger::DEBUG); // 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]; @@ -442,6 +461,16 @@ class Notifier // delivery loop while ($contact = DBA::fetch($delivery_contacts_stmt)) { + 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 (Config::get('debug', 'total_ap_delivery') && ($contact['network'] == Protocol::DFRN) && !empty(APContact::getByURL($contact['url'], false))) { + Logger::log('Skipping contact ' . $contact['url'] . ' since it will be delivered via AP', Logger::DEBUG); + 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); @@ -454,6 +483,8 @@ class Notifier continue; } + $delivery_queue_count++; + Logger::log('Delivery of item ' . $target_id . ' to ' . json_encode($contact), Logger::DEBUG); // Ensure that posts with our own protocol arrives before Diaspora posts arrive. @@ -468,16 +499,17 @@ 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. if (!Config::get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) { + $delivery_queue_count += count($url_recipients); $slap = OStatus::salmon($target_item, $owner); foreach ($url_recipients as $url) { 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); } } @@ -492,6 +524,10 @@ 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); @@ -500,11 +536,30 @@ class Notifier return; } + /** + * 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 - * @param string $created The date the Notifier queue item was created on + * @param int $priority The priority the Notifier queue item was created with + * @param string $created The date the Notifier queue item was created on * @return bool + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private static function notifySelfRemoval($self_user_id, $priority, $created) { @@ -537,29 +592,37 @@ class Notifier * @param string $cmd * @param array $target_item * @param array $parent - * @param int $priority The priority the Notifier queue item was created with - * @param string $created The date the Notifier queue item was created on + * @param int $priority The priority the Notifier queue item was created with + * @param string $created The date the Notifier queue item was created on + * @return int The number of delivery tasks created + * @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 = []; + $uid = $target_item['contact-uid'] ?: $target_item['uid']; + if ($target_item['origin']) { - $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $target_item['contact-uid']); + $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; + return 0; } elseif ($parent['origin']) { // Remote items are transmitted via the personal inboxes. // Doing so ensures that the dedicated receiver will get the message. - $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $target_item['contact-uid'], true, $target_item['id']); + $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $uid, true, $target_item['id']); Logger::log('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG); } if (empty($inboxes)) { Logger::log('No inboxes found for item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . '. It will not be distributed.', Logger::DEBUG); - return; + return 0; } // Fill the item cache @@ -569,27 +632,9 @@ class Notifier Logger::log('Deliver ' . $target_item['id'] .' to ' . $inbox .' via ActivityPub', Logger::DEBUG); Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true], - 'APDelivery', $cmd, $target_item['id'], $inbox, $target_item['contact-uid']); - } - } - - 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; + 'APDelivery', $cmd, $target_item['id'], $inbox, $uid); } - // Is the post from a forum? - return ($contact['forum'] || $contact['prv']); + return count($inboxes); } }