Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix generated avatars cache #38143

Merged
merged 2 commits into from
May 16, 2023
Merged

Fix generated avatars cache #38143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e294045
Properly clear cached avatars
provokateurin May 9, 2023
2a19753
Clear generated avatar caches
provokateurin May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions lib/private/Avatar/AvatarManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
szaimen marked this conversation as resolved.
Show resolved Hide resolved
// This also bumps the avatar version leading to cache invalidation in browsers
$this->getAvatar($userId)->remove();
}
}

Expand Down
7 changes: 4 additions & 3 deletions lib/private/Repair/ClearGeneratedAvatarCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}

/**
Expand All @@ -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
provokateurin marked this conversation as resolved.
Show resolved Hide resolved
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', '<');
szaimen marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little tempted to remove this check and always clear the avatar cache. That will make things easier in the future, but of course increase the load if it's not intended to clear the avatar cache.

}

public function run(IOutput $output): void {
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/Repair/ClearGeneratedAvatarCacheTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down