Clear avatar cache with frontend repair

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

2 files changed, 76 insertions, 4 deletions

diff --git a/lib/private/Repair/ClearFrontendCaches.php b/lib/private/Repair/ClearFrontendCaches.php
index 0a92aa8d201..22add525adb 100644
--- a/lib/private/Repair/ClearFrontendCaches.php
+++ b/lib/private/Repair/ClearFrontendCaches.php
@@ -23,11 +23,11 @@
 
 namespace OC\Repair;
 
-use OC\Template\JSCombiner;
-use OC\Template\SCSSCacher;
 use OCP\ICacheFactory;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
+use OC\Template\JSCombiner;
+use OC\Template\SCSSCacher;
 
 class ClearFrontendCaches implements IRepairStep {
 
@@ -44,8 +44,8 @@ class ClearFrontendCaches implements IRepairStep {
 								SCSSCacher $SCSSCacher,
 								JSCombiner $JSCombiner) {
 		$this->cacheFactory = $cacheFactory;
-		$this->scssCacher = $SCSSCacher;
-		$this->jsCombiner = $JSCombiner;
+		$this->scssCacher   = $SCSSCacher;
+		$this->jsCombiner   = $JSCombiner;
 	}
 
 	public function getName() {
diff --git a/lib/private/Repair/ClearGeneratedAvatarCache.php b/lib/private/Repair/ClearGeneratedAvatarCache.php
new file mode 100644
index 00000000000..631e793de3e
--- /dev/null
+++ b/lib/private/Repair/ClearGeneratedAvatarCache.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @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/>.
+ *
+ */
+
+namespace OC\Repair;
+
+use OC\AvatarManager;
+use OCP\IConfig;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+use OCP\Util;
+
+class ClearGeneratedAvatarCache implements IRepairStep {
+
+	/** @var AvatarManager */
+	protected $avatarManager;
+
+	/** @var IConfig */
+	private $config;
+
+	public function __construct(IConfig $config, AvatarManager $avatarManager) {
+		$this->config        = $config;
+		$this->avatarManager = $avatarManager;
+	}
+
+	public function getName() {
+		return 'Clear every generated avatar on major updates';
+	}
+
+	/**
+	 * Check if this repair step should run
+	 *
+	 * @return boolean
+	 */
+	private function shouldRun() {
+		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
+
+		// was added to 15.0.0.4
+		return version_compare($versionFromBeforeUpdate, '15.0.0.4', '<=');
+	}
+
+	public function run(IOutput $output) {
+		if ($this->shouldRun()) {
+			try {
+				$this->avatarManager->clearCachedAvatars();
+				$output->info('Avatar cache cleared');
+			} catch (\Exception $e) {
+				$output->warning('Unable to clear the avatar cache');
+			}
+
+		}
+	}
+}