Merge remote-tracking branch 'upstream/2022.09-rc' into cooldown

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

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index c2109e66a3ea4bce82de5f568f4fa9c630a834be..12ea6e60a36c8fffd9217301f74b0124b5d9f2db 100644 (file)
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -92,6 +92,9 @@ class Cron
                        // Remove old pending posts from the queue
                        Queue::clear();
 
+                       // Process all unprocessed entries
+                       Queue::processAll();
+
                        // Search for new contacts in the directory
                        if (DI::config()->get('system', 'synchronize_directory')) {
                                Worker::add(PRIORITY_LOW, 'PullDirectory');
@@ -112,7 +115,7 @@ class Cron
 
                        Worker::add(PRIORITY_LOW, 'ExpirePosts');
 
-                       Worker::add(PRIORITY_LOW, 'ExpireConversations');
+                       Worker::add(PRIORITY_LOW, 'ExpireActivities');
 
                        Worker::add(PRIORITY_LOW, 'RemoveUnusedTags');
 
@@ -129,9 +132,6 @@ class Cron
                                Worker::add(PRIORITY_LOW, 'OptimizeTables');
                        }
 
-                       // Process all unprocessed entries
-                       Queue::processAll();
-
                        // Resubscribe to relay servers
                        Relay::reSubscribe();