X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FWorker%2FRemoveUnusedAvatars.php;h=58670c87350a45bc928e06a79aadb608d4427b0c;hb=2647514603852fe5fb9f47f0bf153dd20c124ce6;hp=028c4a9291547ea4ebf2fd6fae21f480b85bfa17;hpb=38a5358bfa646ae13a4a1a385741890fa88d9b7f;p=friendica.git

diff --git a/src/Worker/RemoveUnusedAvatars.php b/src/Worker/RemoveUnusedAvatars.php
index 028c4a9291..58670c8735 100644
--- a/src/Worker/RemoveUnusedAvatars.php
+++ b/src/Worker/RemoveUnusedAvatars.php
@@ -22,9 +22,9 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 
 /**
@@ -56,5 +56,73 @@ class RemoveUnusedAvatars
 		}
 		DBA::close($contacts);
 		Logger::notice('Removal done', ['count' => $count, 'total' => $total]);
+
+		self::fixPhotoContacts();
+		self::deleteDuplicates();
+	}
+
+	private static function fixPhotoContacts()
+	{
+		$total = 0;
+		$deleted = 0;
+		$updated1 = 0;
+		$updated2 = 0;
+		Logger::notice('Starting contact fix');
+		$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']);
+			$resource = Photo::ridFromURI($photo_contact['photo']);
+			if ($photo['resource-id'] == $resource) {
+				$contact = DBA::selectFirst('contact', [], ['nurl' => $photo_contact['nurl'], 'uid' => 0]);
+				if (!empty($contact['photo']) && ($contact['photo'] == $photo_contact['photo'])) {
+					Logger::notice('Photo updated to public user', ['id' => $photo['id'], 'contact-id' => $contact['id']]);
+					DBA::update('photo', ['contact-id' => $contact['id']], ['id' => $photo['id']]);
+					$updated1++;
+				}
+			} else {
+				$updated = false;
+				$contacts = DBA::select('contact', [], ['nurl' => $photo_contact['nurl']]);
+				while ($contact = DBA::fetch($contacts)) {
+					if ($photo['resource-id'] == Photo::ridFromURI($contact['photo'])) {
+						Logger::notice('Photo updated to given user', ['id' => $photo['id'], 'contact-id' => $contact['id'], 'uid' => $contact['uid']]);
+						DBA::update('photo', ['contact-id' => $contact['id'], 'uid' => $contact['uid']], ['id' => $photo['id']]);
+						$updated = true;
+						$updated2++;
+					}
+				}		
+				DBA::close($contacts);
+				if (!$updated) {
+					Logger::notice('Photo deleted', ['id' => $photo['id']]);
+					Photo::delete(['id' => $photo['id']]);
+					$deleted++;
+				}
+			}
+		}
+		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]);
 	}
 }