X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FRemoveUnusedAvatars.php;h=da9ca7b04e48298b937d9f9708a4a239e38bc107;hb=2595b5e12f525c86d6e941579bf41cad3eafe76d;hp=d8efbe3fb9deb7675ea4600f6a628e50e34c79cb;hpb=47904f99c2d9456013f9437ced48e7cc8bea8e35;p=friendica.git

diff --git a/src/Worker/RemoveUnusedAvatars.php b/src/Worker/RemoveUnusedAvatars.php
index d8efbe3fb9..da9ca7b04e 100644
--- 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,18 +34,23 @@ 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`)
+				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`);";
 
-		$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)) {
-			DBA::update('contact', ['photo' => '', 'thumb' => '', 'micro' => ''], ['id' => $contact['id']]);
-			Photo::delete(['contact-id' => $contact['id'], 'album' => Photo::CONTACT_PHOTOS]);
+			Contact::update(['photo' => '', 'thumb' => '', 'micro' => ''], ['id' => $contact['id']]);
+			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');
@@ -103,7 +108,7 @@ class RemoveUnusedAvatars
 		Logger::notice('Contact fix done', ['total' => $total, 'updated1' => $updated1, 'updated2' => $updated2, 'deleted' => $deleted]);
 	}
 
-	public static function deleteDuplicates()
+	private static function deleteDuplicates()
 	{
 		$size = [4 => 'photo', 5 => 'thumb', 6 => 'micro'];