clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10462 from annando/duplicate-avatars 

Removal of duplicated photo entries for a contact
This commit is contained in:
Hypolite Petovan 2021-07-04 09:56:47 -04:00 committed by GitHub
parent 4a1bcb13d5 4f6be0bd03
commit c0579bcad9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Module/Photo.php
View File

@ -214,7 +214,7 @@ class Photo extends BaseModule
If (($contact['uid'] != 0) && empty($contact['photo']) && empty($contact['avatar'])) { If (($contact['uid'] != 0) && empty($contact['photo']) && empty($contact['avatar'])) {
$contact = Contact::getByURL($contact['url'], false, ['avatar', 'photo', 'xmpp', 'addr']); $contact = Contact::getByURL($contact['url'], false, ['avatar', 'photo', 'xmpp', 'addr']);
} }
if (!empty($contact['photo'])) { if (!empty($contact['photo']) && !empty($contact['avatar'])) {
// Fetch photo directly // Fetch photo directly
$resourceid = MPhoto::ridFromURI($contact['photo']); $resourceid = MPhoto::ridFromURI($contact['photo']);
if (!empty($resourceid)) { if (!empty($resourceid)) {
@ -223,7 +223,8 @@ class Photo extends BaseModule
return $photo; return $photo;
} }
} }
$url = $contact['photo']; // We continue with the avatar link when the photo link is invalid
$url = $contact['avatar'];
} elseif (!empty($contact['avatar'])) { } elseif (!empty($contact['avatar'])) {
$url = $contact['avatar']; $url = $contact['avatar'];
} elseif ($customsize <= Proxy::PIXEL_MICRO) { } elseif ($customsize <= Proxy::PIXEL_MICRO) {

26
src/Worker/RemoveUnusedAvatars.php
View File

@ -58,6 +58,7 @@ class RemoveUnusedAvatars
Logger::notice('Removal done', ['count' => $count, 'total' => $total]); Logger::notice('Removal done', ['count' => $count, 'total' => $total]);
self::fixPhotoContacts(); self::fixPhotoContacts();
self::deleteDuplicates();
} }
private static function fixPhotoContacts() private static function fixPhotoContacts()
@ -67,7 +68,7 @@ class RemoveUnusedAvatars
$updated1 = 0; $updated1 = 0;
$updated2 = 0; $updated2 = 0;
Logger::notice('Starting contact fix'); 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)) { while ($photo = DBA::fetch($photos)) {
$total++; $total++;
$photo_contact = Contact::getById($photo['contact-id']); $photo_contact = Contact::getById($photo['contact-id']);
@ -101,4 +102,27 @@ class RemoveUnusedAvatars
DBA::close($photos); DBA::close($photos);
Logger::notice('Contact fix done', ['total' => $total, 'updated1' => $updated1, 'updated2' => $updated2, 'deleted' => $deleted]); 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]);
}
} }