Merge remote-tracking branch 'upstream/develop' into reduce-update-contacts

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

diff --git a/src/Worker/RemoveUnusedAvatars.php b/src/Worker/RemoveUnusedAvatars.php
index 7fdbeb7eccd847805f67bb8f3bc27835b75259cf..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
  *
@@ -34,24 +34,29 @@ class RemoveUnusedAvatars
 {
        public static function execute()
        {
-               $condition = ["`uid` = ? AND NOT `self` AND NOT `nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` != ?)
-                       AND `id` IN (SELECT `contact-id` FROM `photo`) AND NOT `id` IN (SELECT `author-id` FROM `post-user`)
-                       AND NOT `id` IN (SELECT `owner-id` FROM `post-user`) AND NOT `id` IN (SELECT `causer-id` FROM `post-user`)
-                       AND NOT `id` IN (SELECT `cid` FROM `post-tag`) AND NOT `id` IN (SELECT `contact-id` FROM `post-user`)", 0, 0];
+               $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` 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`);";
 
-               $total = DBA::count('contact', $condition);
+               $ret = DBA::fetchFirst("SELECT COUNT(*) AS `total` " . $sql, 0, '', '', '', 0);
+               $total = $ret['total'] ?? 0;
                Logger::notice('Starting removal', ['total' => $total]);
                $count = 0;
-               $contacts = DBA::select('contact', ['id'], $condition);
+               $contacts = DBA::p("SELECT `contact`.`id` " . $sql, 0, '', '', '', 0);
                while ($contact = DBA::fetch($contacts)) {
                        Contact::update(['photo' => '', 'thumb' => '', 'micro' => ''], ['id' => $contact['id']]);
-                       Photo::delete(['contact-id' => $contact['id'], 'album' => Photo::CONTACT_PHOTOS]);
+                       Photo::delete(['contact-id' => $contact['id'], 'photo-type' => [Photo::CONTACT_AVATAR, Photo::CONTACT_BANNER]]);
                        if ((++$count % 1000) == 0) {
                                if (!Worker::isInMaintenanceWindow()) {
                                        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);