Replace worker_daemon_mode config entry with key-value entry

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

diff --git a/src/Worker/RemoveUnusedAvatars.php b/src/Worker/RemoveUnusedAvatars.php
index 41a24325e745e610da58cb3e802dd6480f21e8c1..27a6ac676f39e0d9dec53e3c8a444354c5f64785 100644 (file)
--- a/src/Worker/RemoveUnusedAvatars.php
+++ b/src/Worker/RemoveUnusedAvatars.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -37,11 +37,11 @@ class RemoveUnusedAvatars
                $sql = "FROM `contact` INNER JOIN `photo` ON `contact`.`id` = `contact-id`
                        WHERE `contact`.`uid` = ? AND NOT `self` AND (`photo` != ? OR `thumb` != ? OR `micro` != ?)
                                AND NOT `nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` != ?)
-                               AND NOT `contact`.`id` IN (SELECT `author-id` FROM `post-user`)
-                               AND NOT `contact`.`id` IN (SELECT `owner-id` FROM `post-user`)
-                               AND NOT `contact`.`id` IN (SELECT `causer-id` FROM `post-user`)
-                               AND NOT `contact`.`id` IN (SELECT `cid` FROM `post-tag`)
-                               AND NOT `contact`.`id` IN (SELECT `contact-id` FROM `post-user`);";
+                               AND NOT `contact`.`id` IN (SELECT `author-id` FROM `post-user` WHERE `author-id` = `contact`.`id`)
+                               AND NOT `contact`.`id` IN (SELECT `owner-id` FROM `post-user` WHERE `owner-id` = `contact`.`id`)
+                               AND NOT `contact`.`id` IN (SELECT `causer-id` FROM `post-user` WHERE `causer-id` IS NOT NULL AND `causer-id` = `contact`.`id`)
+                               AND NOT `contact`.`id` IN (SELECT `cid` FROM `post-tag` WHERE `cid` = `contact`.`id`)
+                               AND NOT `contact`.`id` IN (SELECT `contact-id` FROM `post-user` WHERE `contact-id` = `contact`.`id`);";
 
                $ret = DBA::fetchFirst("SELECT COUNT(*) AS `total` " . $sql, 0, '', '', '', 0);
                $total = $ret['total'] ?? 0;
@@ -56,7 +56,7 @@ class RemoveUnusedAvatars
                                        Logger::notice('We are outside of the maintenance window, quitting');
                                        return;
                                }
-                               Logger::notice('In removal', ['count' => $count, 'total' => $total]);
+                               Logger::info('In removal', ['count' => $count, 'total' => $total]);
                        }
                }
                DBA::close($contacts);