X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FRemoveUnusedAvatars.php;h=da9ca7b04e48298b937d9f9708a4a239e38bc107;hb=7921766c59c1050737ff7fed7c242257e866d149;hp=ad5b04781d740990225f9612d74a5e93c295c4cf;hpb=1da6fa0043d5d4c9cea0cac056cfb769878b05e3;p=friendica.git

diff --git a/src/Worker/RemoveUnusedAvatars.php b/src/Worker/RemoveUnusedAvatars.php
index ad5b04781d..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');
@@ -58,6 +63,7 @@ class RemoveUnusedAvatars
 		Logger::notice('Removal done', ['count' => $count, 'total' => $total]);
 
 		self::fixPhotoContacts();
+		self::deleteDuplicates();
 	}
 
 	private static function fixPhotoContacts()
@@ -67,7 +73,7 @@ class RemoveUnusedAvatars
 		$updated1 = 0;
 		$updated2 = 0;
 		Logger::notice('Starting contact fix');
-		$photos = DBA::select('photo', [], ["`uid` = ? AND `contact-id` IN (SELECT `id` FROM `contact` WHERE `uid` != ?)", 0, 0]);
+		$photos = DBA::select('photo', [], ["`uid` = ? AND `contact-id` IN (SELECT `id` FROM `contact` WHERE `uid` != ?) AND `contact-id` != ? AND `scale` IN (?, ?, ?)", 0, 0, 0, 4, 5, 6]);
 		while ($photo = DBA::fetch($photos)) {
 			$total++;
 			$photo_contact = Contact::getById($photo['contact-id']);
@@ -101,4 +107,27 @@ class RemoveUnusedAvatars
 		DBA::close($photos);
 		Logger::notice('Contact fix done', ['total' => $total, 'updated1' => $updated1, 'updated2' => $updated2, 'deleted' => $deleted]);
 	}
+
+	private static function deleteDuplicates()
+	{
+		$size = [4 => 'photo', 5 => 'thumb', 6 => 'micro'];
+
+		$total = 0;
+		$deleted = 0;
+		Logger::notice('Starting duplicate removal');
+		$photos = DBA::p("SELECT `photo`.`id`, `photo`.`uid`, `photo`.`scale`, `photo`.`album`, `photo`.`contact-id`, `photo`.`resource-id`, `contact`.`photo`, `contact`.`thumb`, `contact`.`micro` FROM `photo` INNER JOIN `contact` ON `contact`.`id` = `photo`.`contact-id` and `photo`.`contact-id` != ? AND `photo`.`scale` IN (?, ?, ?)", 0, 4, 5, 6);
+		while ($photo = DBA::fetch($photos)) {
+			$resource = Photo::ridFromURI($photo[$size[$photo['scale']]]);
+			if ($resource != $photo['resource-id'] && !empty($resource)) {
+				$total++;
+				if (DBA::exists('photo', ['resource-id' => $resource, 'scale' => $photo['scale']])) {
+					Logger::notice('Photo deleted', ['id' => $photo['id']]);
+					Photo::delete(['id' => $photo['id']]);
+					$deleted++;
+				}
+			}
+		}
+		DBA::close($photos);
+		Logger::notice('Duplicate removal done', ['total' => $total, 'deleted' => $deleted]);
+	}
 }