workerqueue now has a "command" field

[friendica.git] / src / Worker / UpdatePublicContacts.php

diff --git a/src/Worker/UpdatePublicContacts.php b/src/Worker/UpdatePublicContacts.php
index 453606bfa08d22931dc9428d6007c25c6fc257f2..939d9fa8d77eadeaa4e1cfaea1d3c2971acce9a9 100644 (file)
--- a/src/Worker/UpdatePublicContacts.php
+++ b/src/Worker/UpdatePublicContacts.php
@@ -25,6 +25,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 
 /**
@@ -35,22 +36,61 @@ class UpdatePublicContacts
        public static function execute()
        {
                $count = 0;
-               $last_updated = DateTimeFormat::utc('now - 1 week');
-               $condition = ["`network` IN (?, ?, ?, ?) AND `uid` = ? AND NOT `self` AND `last-update` < ?",
-                       Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, 0, $last_updated];
+               $ids = [];
+               $base_condition = ['network' => Protocol::FEDERATED, 'uid' => 0, 'self' => false];
 
-               $oldest_date = '';
-               $oldest_id = '';
-               $contacts = DBA::select('contact', ['id', 'last-update'], $condition, ['limit' => 100, 'order' => ['last-update']]);
-               while ($contact = DBA::fetch($contacts)) {
-                       if (empty($oldest_id)) {
-                               $oldest_id = $contact['id'];
-                               $oldest_date = $contact['last-update'];
-                       }
-                       Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id']);
+               $existing = Worker::countWorkersByCommand('UpdateContact');
+               Logger::info('Already existing jobs', ['existing' => $existing]);
+               if ($existing > 100) {
+                       return;
+               }
+
+               $limit = 100 - $existing;
+
+               if (!DI::config()->get('system', 'update_active_contacts')) {
+                       $part = 3;
+                       // Add every contact (mostly failed ones) that hadn't been updated for six months
+                       $condition = DBA::mergeConditions($base_condition,
+                               ["`last-update` < ?", DateTimeFormat::utc('now - 6 month')]);
+                       $ids = self::getContactsToUpdate($condition, $ids, round($limit / $part));
+
+                       // Add every non failed contact that hadn't been updated for a month
+                       $condition = DBA::mergeConditions($base_condition,
+                               ["NOT `failed` AND `last-update` < ?", DateTimeFormat::utc('now - 1 month')]);
+                       $ids = self::getContactsToUpdate($condition, $ids, round($limit / $part));
+               } else {
+                       $part = 1;
+               }
+
+               // Add every contact our system interacted with and hadn't been updated for a week
+               $condition = DBA::mergeConditions($base_condition, ["(`id` IN (SELECT `author-id` FROM `item`) OR
+                       `id` IN (SELECT `owner-id` FROM `item`) OR `id` IN (SELECT `causer-id` FROM `item`) OR
+                       `id` IN (SELECT `cid` FROM `post-tag`) OR `id` IN (SELECT `cid` FROM `user-contact`)) AND
+                       `last-update` < ?", DateTimeFormat::utc('now - 1 week')]);
+               $ids = self::getContactsToUpdate($condition, $ids, round($limit / $part));
+
+               foreach ($ids as $id) {
+                       Worker::add(PRIORITY_LOW, "UpdateContact", $id);
                        ++$count;
                }
-               Logger::info('Initiated update for public contacts', ['interval' => $count, 'id' => $oldest_id, 'oldest' => $oldest_date]);
+
+               Logger::info('Initiated update for public contacts', ['count' => $count]);
+       }
+
+       /**
+        * Returns contact ids based on a given condition
+        *
+        * @param array $condition
+        * @param array $ids
+        * @return array contact ids
+        */
+       private static function getContactsToUpdate(array $condition, array $ids = [], int $limit)
+       {
+               $contacts = DBA::select('contact', ['id'], $condition, ['limit' => $limit, 'order' => ['last-update']]);
+               while ($contact = DBA::fetch($contacts)) {
+                       $ids[] = $contact['id'];
+               }
                DBA::close($contacts);
+               return $ids;
        }
 }