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

Merge pull request #11565 from annando/force-avatar-update 

Pass the "force" parameter to the avatar update
This commit is contained in:
Tobias Diekershoff 2022-05-27 09:52:10 +02:00 committed by GitHub
parent e793438e0d b05aa824f7
commit d3624af1b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 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);

9
src/Contact/Avatar.php
View File

@ -44,11 +44,12 @@ class Avatar
/** /**
* Returns a field array with locally cached avatar pictures * Returns a field array with locally cached avatar pictures
* *
* @param array $contact * @param array $contact Contact array
* @param string $avatar * @param string $avatar Link to avatar picture
* @param bool $force force picture update
* @return array * @return array
*/ */
public static function fetchAvatarContact(array $contact, string $avatar): array public static function fetchAvatarContact(array $contact, string $avatar, bool $force = false): array
{ {
$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(), 'photo' => '', 'thumb' => '', 'micro' => '']; $fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(), 'photo' => '', 'thumb' => '', 'micro' => ''];
@ -61,7 +62,7 @@ class Avatar
return $fields; return $fields;
} }
if ($avatar != $contact['avatar']) { if (($avatar != $contact['avatar']) || $force) {
self::deleteCache($contact); self::deleteCache($contact);
Logger::debug('Avatar file name changed', ['new' => $avatar, 'old' => $contact['avatar']]); Logger::debug('Avatar file name changed', ['new' => $avatar, 'old' => $contact['avatar']]);
} elseif (self::isCacheFile($contact['photo']) && self::isCacheFile($contact['thumb']) && self::isCacheFile($contact['micro'])) { } elseif (self::isCacheFile($contact['photo']) && self::isCacheFile($contact['thumb']) && self::isCacheFile($contact['micro'])) {

2
src/Model/Contact.php
View File

@ -2049,7 +2049,7 @@ class Contact
} }
} else { } else {
Photo::delete(['uid' => $uid, 'contact-id' => $cid, 'photo-type' => Photo::CONTACT_AVATAR]); Photo::delete(['uid' => $uid, 'contact-id' => $cid, 'photo-type' => Photo::CONTACT_AVATAR]);
$fields = Avatar::fetchAvatarContact($contact, $avatar); $fields = Avatar::fetchAvatarContact($contact, $avatar, $force);
$update = ($avatar . $fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['avatar'] . $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force; $update = ($avatar . $fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['avatar'] . $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
} }