From 8c901ebd74d3a6ebdb0cc1fdfa830efc20ef8b63 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 26 May 2022 19:06:16 +0000 Subject: [PATCH 1/2] Issue-11560: Fix error when creating avatar cache file --- src/Console/MoveToAvatarCache.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/Console/MoveToAvatarCache.php b/src/Console/MoveToAvatarCache.php index 08c30c2153..1eb2d49e83 100644 --- a/src/Console/MoveToAvatarCache.php +++ b/src/Console/MoveToAvatarCache.php @@ -28,6 +28,7 @@ use Friendica\Model\Contact; use Friendica\Model\Photo; use Friendica\Util\Images; use Friendica\Object\Image; +use Friendica\Core\Config\Capability\IManageConfigValues; /** * tool to move cached avatars to the avatar file cache. @@ -51,6 +52,11 @@ class MoveToAvatarCache extends \Asika\SimpleConsole\Console */ private $l10n; + /** + * @var IManageConfigValues + */ + private $config; + protected function getHelp() { $help = <<dba = $dba; $this->baseurl = $baseurl; $this->l10n = $l10n; + $this->config = $config; } protected function doExecute() { + if ($this->config->get('system', 'avatar_cache')) { + $this->err($this->l10n->t('The avatar cache needs to be enabled to use this command.')); + return 2; + } + + $fields = ['id', 'avatar', 'photo', 'thumb', 'micro', 'uri-id', 'url', 'avatar']; $condition = ["`avatar` != ? AND `photo` LIKE ? AND `uid` = ? AND `uri-id` != ? AND NOT `uri-id` IS NULL", '', $this->baseurl->get() . '/photo/%', 0, 0]; $count = 0; $total = $this->dba->count('contact', $condition); - $contacts = $this->dba->select('contact', ['id', 'avatar', 'photo', 'uri-id', 'url', 'avatar'], $condition, ['order' => ['id']]); + $contacts = $this->dba->select('contact', $fields, $condition, ['order' => ['id']]); while ($contact = $this->dba->fetch($contacts)) { $this->out(++$count . '/' . $total . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t", false); $resourceid = Photo::ridFromURI($contact['photo']); @@ -100,7 +113,7 @@ HELP; $total = $this->dba->fetch($totals)['total'] ?? 0; $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'], ['id', 'avatar', 'photo', 'uri-id', 'url', 'avatar']); + $contact = Contact::getById($photo['contact-id'], $fields); if (empty($contact)) { continue; } From 4475b3ff3968b10ca05300f91b38f3130e6f8924 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 26 May 2022 20:01:07 +0000 Subject: [PATCH 2/2] Updated messages.po --- view/lang/C/messages.po | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 97a987bb88..04eb82b2dd 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2022.05-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-24 20:12+0000\n" +"POT-Creation-Date: 2022-05-26 20:00+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1641,27 +1641,31 @@ msgstr "" msgid "The contact has been blocked from the node" msgstr "" -#: src/Console/MoveToAvatarCache.php:92 +#: src/Console/MoveToAvatarCache.php:90 +msgid "The avatar cache needs to be enabled to use this command." +msgstr "" + +#: src/Console/MoveToAvatarCache.php:105 #, php-format msgid "no resource in photo %s" msgstr "" -#: src/Console/MoveToAvatarCache.php:118 +#: src/Console/MoveToAvatarCache.php:133 #, php-format msgid "no photo with id %s" msgstr "" -#: src/Console/MoveToAvatarCache.php:127 +#: src/Console/MoveToAvatarCache.php:142 #, php-format msgid "no image data for photo with id %s" msgstr "" -#: src/Console/MoveToAvatarCache.php:136 +#: src/Console/MoveToAvatarCache.php:151 #, php-format msgid "invalid image for id %s" msgstr "" -#: src/Console/MoveToAvatarCache.php:149 +#: src/Console/MoveToAvatarCache.php:164 #, php-format msgid "Quit on invalid photo %s" msgstr "" @@ -3579,45 +3583,45 @@ msgid "" "credentials in your Settings -> Social Networks page." msgstr "" -#: src/Model/Contact.php:2572 +#: src/Model/Contact.php:2577 msgid "The profile address specified does not provide adequate information." msgstr "" -#: src/Model/Contact.php:2574 +#: src/Model/Contact.php:2579 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: src/Model/Contact.php:2577 +#: src/Model/Contact.php:2582 msgid "An author or name was not found." msgstr "" -#: src/Model/Contact.php:2580 +#: src/Model/Contact.php:2585 msgid "No browser URL could be matched to this address." msgstr "" -#: src/Model/Contact.php:2583 +#: src/Model/Contact.php:2588 msgid "" "Unable to match @-style Identity Address with a known protocol or email " "contact." msgstr "" -#: src/Model/Contact.php:2584 +#: src/Model/Contact.php:2589 msgid "Use mailto: in front of address to force email check." msgstr "" -#: src/Model/Contact.php:2590 +#: src/Model/Contact.php:2595 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "" -#: src/Model/Contact.php:2595 +#: src/Model/Contact.php:2600 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: src/Model/Contact.php:2654 +#: src/Model/Contact.php:2659 msgid "Unable to retrieve contact information." msgstr ""