From: Michael Date: Sun, 29 May 2022 06:50:34 +0000 (+0000) Subject: Don't touch local avatars X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=02473d8a0e22e65d18b2b6d505d8795379e256ec;p=friendica.git Don't touch local avatars --- diff --git a/src/Console/MoveToAvatarCache.php b/src/Console/MoveToAvatarCache.php index a10997620b..441dff682d 100644 --- a/src/Console/MoveToAvatarCache.php +++ b/src/Console/MoveToAvatarCache.php @@ -93,13 +93,16 @@ HELP; } $fields = ['id', 'avatar', 'photo', 'thumb', 'micro', 'uri-id', 'url', 'avatar', 'network']; - $condition = ["`avatar` != ? AND `photo` LIKE ? AND `uid` = ? AND `uri-id` != ? AND NOT `uri-id` IS NULL AND NOT `network` IN (?, ?)", + $condition = ["NOT `self` AND `avatar` != ? AND `photo` LIKE ? AND `uid` = ? AND `uri-id` != ? AND NOT `uri-id` IS NULL AND NOT `network` IN (?, ?)", '', $this->baseurl->get() . '/photo/%', 0, 0, Protocol::MAIL, Protocol::FEED]; $count = 0; $total = $this->dba->count('contact', $condition); $contacts = $this->dba->select('contact', $fields, $condition, ['order' => ['id']]); while ($contact = $this->dba->fetch($contacts)) { + if (Contact::isLocal($contact['url'])) { + continue; + } $this->out(++$count . '/' . $total . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t", false); $resourceid = Photo::ridFromURI($contact['photo']); if (empty($resourceid)) { @@ -115,7 +118,7 @@ HELP; $photos = $this->dba->p("SELECT `resource-id`, MAX(`contact-id`) AS `contact-id` FROM `photo` WHERE `contact-id` != ? AND `photo-type` = ? GROUP BY `resource-id`;", 0, Photo::CONTACT_AVATAR); while ($photo = $this->dba->fetch($photos)) { $contact = Contact::getById($photo['contact-id'], $fields); - if (empty($contact) || in_array($contact['network'], [Protocol::MAIL, Protocol::FEED])) { + if (empty($contact) || in_array($contact['network'], [Protocol::MAIL, Protocol::FEED]) || Contact::isLocal($contact['url'])) { continue; } $this->out(++$count . '/' . $total . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t", false);