nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't move mail and feed

Browse source
This commit is contained in:
Michael 2022-05-27 06:32:19 +00:00
parent 0a43fe857c
commit b05aa824f7
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Console/MoveToAvatarCache.php
View file

@ -29,6 +29,7 @@ use Friendica\Model\Photo;
use Friendica\Util\Images; use Friendica\Util\Images;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\Protocol;
/** /**
* tool to move cached avatars to the avatar file cache. * tool to move cached avatars to the avatar file cache.
@ -86,14 +87,14 @@ HELP;
protected function doExecute() protected function doExecute()
{ {
if ($this->config->get('system', 'avatar_cache')) { if (!$this->config->get('system', 'avatar_cache')) {
$this->err($this->l10n->t('The avatar cache needs to be enabled to use this command.')); $this->err($this->l10n->t('The avatar cache needs to be enabled to use this command.'));
return 2; return 2;
} }
$fields = ['id', 'avatar', 'photo', 'thumb', 'micro', 'uri-id', 'url', 'avatar']; $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", $condition = ["`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]; '', $this->baseurl->get() . '/photo/%', 0, 0, Protocol::MAIL, Protocol::FEED];
$count = 0; $count = 0;
$total = $this->dba->count('contact', $condition); $total = $this->dba->count('contact', $condition);
@ -114,7 +115,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); $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)) { while ($photo = $this->dba->fetch($photos)) {
$contact = Contact::getById($photo['contact-id'], $fields); $contact = Contact::getById($photo['contact-id'], $fields);
if (empty($contact)) { if (empty($contact) || in_array($contact['network'], [Protocol::MAIL, Protocol::FEED])) {
continue; continue;
} }
$this->out(++$count . '/' . $total . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t", false); $this->out(++$count . '/' . $total . "\t" . $contact['id'] . "\t" . $contact['url'] . "\t", false);