From e294045223992056051659f620be5a49ece6d8e8 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Tue, 9 May 2023 12:23:57 +0200 Subject: [PATCH 1/2] Properly clear cached avatars Signed-off-by: jld3103 --- lib/private/Avatar/AvatarManager.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/private/Avatar/AvatarManager.php b/lib/private/Avatar/AvatarManager.php index 5c4f04de6d610..4125c8eb0a852 100644 --- a/lib/private/Avatar/AvatarManager.php +++ b/lib/private/Avatar/AvatarManager.php @@ -160,13 +160,8 @@ public function getAvatar(string $userId) : IAvatar { public function clearCachedAvatars() { $users = $this->config->getUsersForUserValue('avatar', 'generated', 'true'); foreach ($users as $userId) { - try { - $folder = $this->appData->getFolder($userId); - $folder->delete(); - } catch (NotFoundException $e) { - $this->logger->debug("No cache for the user $userId. Ignoring..."); - } - $this->config->setUserValue($userId, 'avatar', 'generated', 'false'); + // This also bumps the avatar version leading to cache invalidation in browsers + $this->getAvatar($userId)->remove(); } } From 2a19753cf744998b7daf3cf11fb1144325d9a7e2 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Tue, 9 May 2023 12:27:46 +0200 Subject: [PATCH 2/2] Clear generated avatar caches Signed-off-by: jld3103 --- lib/private/Repair/ClearGeneratedAvatarCache.php | 7 ++++--- tests/lib/Repair/ClearGeneratedAvatarCacheTest.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/private/Repair/ClearGeneratedAvatarCache.php b/lib/private/Repair/ClearGeneratedAvatarCache.php index 844bf6cf346f9..fb3b42847dcc6 100644 --- a/lib/private/Repair/ClearGeneratedAvatarCache.php +++ b/lib/private/Repair/ClearGeneratedAvatarCache.php @@ -42,7 +42,7 @@ public function __construct(IConfig $config, AvatarManager $avatarManager, IJobL } public function getName(): string { - return 'Clear every generated avatar on major updates'; + return 'Clear every generated avatar'; } /** @@ -51,8 +51,9 @@ public function getName(): string { private function shouldRun(): bool { $versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0'); - // was added to 25.0.0.10 - return version_compare($versionFromBeforeUpdate, '25.0.0.10', '<='); + // This job only runs if the server was on a version lower than or equal to 27.0.0 before the upgrade. + // To clear the avatar cache again, bump the version to the currently released version (and change the operator to <= if it's not the master branch) and wait for the next release. + return version_compare($versionFromBeforeUpdate, '27.0.0', '<'); } public function run(IOutput $output): void { diff --git a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php index 44fc709c72af3..0e3347cd5ac5f 100644 --- a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php +++ b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php @@ -61,7 +61,7 @@ public function shouldRunDataProvider() { ['15.0.0.3', true], ['13.0.5.2', true], ['12.0.0.0', true], - ['26.0.0.1', false], + ['26.0.0.1', true], ['15.0.0.2', true], ['13.0.0.0', true], ['27.0.0.5', false]