Improve accuracy of User::getList with type = blocked

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

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index 4a23e86f9b9effa9c06a46a297d072786679db23..3ce5fb4605a4aa505ccf5a4df72eff5ca2e9d6b3 100644 (file)
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -25,6 +25,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\DI;
+use Friendica\Model\Tag;
 
 class Cron
 {
@@ -54,10 +55,10 @@ class Cron
                }
 
                // Fork the cron jobs in separate parts to avoid problems when one of them is crashing
-               Hook::fork($a->queue['priority'], "cron");
+               Hook::fork($a->queue['priority'], 'cron');
 
                // Poll contacts
-               Worker::add(PRIORITY_HIGH, 'PollContacts');
+               Worker::add(PRIORITY_MEDIUM, 'PollContacts');
 
                // Update contact information
                Worker::add(PRIORITY_LOW, 'UpdatePublicContacts');              
@@ -71,19 +72,20 @@ class Cron
                // Call possible post update functions
                Worker::add(PRIORITY_LOW, 'PostUpdate');
 
-               // Repair entries in the database
-               Worker::add(PRIORITY_LOW, 'RepairDatabase');
-
                // Hourly cron calls
                if (DI::config()->get('system', 'last_cron_hourly', 0) + 3600 < time()) {
 
+                       // Update trending tags cache for the community page
+                       Tag::setLocalTrendingHashtags(24, 20);
+                       Tag::setGlobalTrendingHashtags(24, 20);
+
                        // Search for new contacts in the directory
                        if (DI::config()->get('system', 'synchronize_directory')) {
                                Worker::add(PRIORITY_LOW, 'PullDirectory');
                        }
 
                        // Delete all done workerqueue entries                  
-                       Worker::add(PRIORITY_LOW, 'ClearWorkerqueue');
+                       Worker::add(PRIORITY_LOW, 'CleanWorkerQueue');
 
                        // Clear cache entries
                        Worker::add(PRIORITY_LOW, 'ClearCache');
@@ -91,8 +93,8 @@ class Cron
                        DI::config()->set('system', 'last_cron_hourly', time());
                }
 
-               // Daily cron calls
-               if (DI::config()->get('system', 'last_cron_daily', 0) + 86400 < time()) {
+               // Daily maintenance cron calls
+               if (Worker::isInMaintenanceWindow(true)) {
 
                        Worker::add(PRIORITY_LOW, 'UpdateContactBirthdays');
 
@@ -103,9 +105,12 @@ class Cron
 
                        Worker::add(PRIORITY_LOW, 'UpdateGServers');
 
+                       // Repair entries in the database
+                       Worker::add(PRIORITY_LOW, 'RepairDatabase');
+
                        Worker::add(PRIORITY_LOW, 'Expire');
 
-                       Worker::add(PRIORITY_MEDIUM, 'DBClean');
+                       Worker::add(PRIORITY_LOW, 'ExpirePosts');
 
                        Worker::add(PRIORITY_LOW, 'ExpireConversations');
 
@@ -114,7 +119,7 @@ class Cron
                        // check upstream version?
                        Worker::add(PRIORITY_LOW, 'CheckVersion');
 
-                       Worker::add(PRIORITY_LOW, 'CheckdeletedContacts');
+                       Worker::add(PRIORITY_LOW, 'CheckDeletedContacts');
 
                        if (DI::config()->get('system', 'optimize_tables')) {
                                Worker::add(PRIORITY_LOW, 'OptimizeTables');
@@ -126,7 +131,5 @@ class Cron
                Logger::notice('end');
 
                DI::config()->set('system', 'last_cron', time());
-
-               return;
        }
 }