1 files changed, 19 insertions, 39 deletions

diff --git a/lib/private/Repair/ClearGeneratedAvatarCache.php b/lib/private/Repair/ClearGeneratedAvatarCache.php
index 314299a0528..0f743afbb4c 100644
--- a/lib/private/Repair/ClearGeneratedAvatarCache.php
+++ b/lib/private/Repair/ClearGeneratedAvatarCache.php
@@ -1,68 +1,48 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- * @author Michael Weimann <mail@michael-weimann.eu>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 namespace OC\Repair;
 
 use OC\Avatar\AvatarManager;
+use OCP\BackgroundJob\IJobList;
 use OCP\IConfig;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 
 class ClearGeneratedAvatarCache implements IRepairStep {
+	protected AvatarManager $avatarManager;
+	private IConfig $config;
+	private IJobList $jobList;
 
-	/** @var AvatarManager */
-	protected $avatarManager;
-
-	/** @var IConfig */
-	private $config;
-
-	public function __construct(IConfig $config, AvatarManager $avatarManager) {
+	public function __construct(IConfig $config, AvatarManager $avatarManager, IJobList $jobList) {
 		$this->config = $config;
 		$this->avatarManager = $avatarManager;
+		$this->jobList = $jobList;
 	}
 
-	public function getName() {
-		return 'Clear every generated avatar on major updates';
+	public function getName(): string {
+		return 'Clear every generated avatar';
 	}
 
 	/**
 	 * Check if this repair step should run
-	 *
-	 * @return boolean
 	 */
-	private function shouldRun() {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+	private function shouldRun(): bool {
+		$versionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0.0');
 
-		// was added to 15.0.0.4
-		return version_compare($versionFromBeforeUpdate, '15.0.0.4', '<=');
+		// 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) {
+	public function run(IOutput $output): void {
 		if ($this->shouldRun()) {
 			try {
-				$this->avatarManager->clearCachedAvatars();
-				$output->info('Avatar cache cleared');
+				$this->jobList->add(ClearGeneratedAvatarCacheJob::class, []);
+				$output->info('Avatar cache clearing job added');
 			} catch (\Exception $e) {
 				$output->warning('Unable to clear the avatar cache');
 			}