WIP: try to generate user themed icons

Signed-off-by: Simon L <szaimen@e.mail.de>
nextcloud · Nov 15, 2022 · 4680a29 · 4680a29
1 parent 102617f
commit 4680a29
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/apps/theming/lib/Controller/IconController.php b/apps/theming/lib/Controller/IconController.php
@@ -86,14 +86,15 @@ public function __construct(
 	 * @throws \Exception
 	 */
 	public function getThemedIcon(string $app, string $image): Response {
+		$color = $this->themingDefaults->getColorPrimary();
 		try {
-			$iconFile = $this->imageManager->getCachedImage('icon-' . $app . '-' . str_replace('/', '_',$image));
+			$iconFile = $this->imageManager->getCachedImage('icon-' . $app . '-' . str_replace('/', '_',$image) . $color);
 		} catch (NotFoundException $exception) {
 			$icon = $this->iconBuilder->colorSvg($app, $image);
 			if ($icon === false || $icon === '') {
 				return new NotFoundResponse();
 			}
-			$iconFile = $this->imageManager->setCachedImage('icon-' . $app . '-' . str_replace('/', '_',$image), $icon);
+			$iconFile = $this->imageManager->setCachedImage('icon-' . $app . '-' . str_replace('/', '_',$image) . $color, $icon);
 		}
 		$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
 		$response->cacheFor(86400, false, true);

diff --git a/apps/theming/lib/Service/JSDataService.php b/apps/theming/lib/Service/JSDataService.php
@@ -30,22 +30,26 @@
 use OCA\Theming\ThemingDefaults;
 use OCA\Theming\Util;
 use OCP\IConfig;
+use OCP\IUserSession;
 
 class JSDataService implements \JsonSerializable {
 	private ThemingDefaults $themingDefaults;
 	private Util $util;
 	private IConfig $appConfig;
+	private IUserSession $userSession;
 	private ThemesService $themesService;
 
 	public function __construct(
 		ThemingDefaults $themingDefaults,
 		Util $util,
 		IConfig $appConfig,
+		IUserSession $userSession,
 		ThemesService $themesService
 	) {
 		$this->themingDefaults = $themingDefaults;
 		$this->util = $util;
 		$this->appConfig = $appConfig;
+		$this->userSession = $userSession;
 		$this->themesService = $themesService;
 	}
 
@@ -60,6 +64,7 @@ public function jsonSerialize(): array {
 			'privacyUrl' => $this->themingDefaults->getPrivacyUrl(),
 			'inverted' => $this->util->invertTextColor($this->themingDefaults->getColorPrimary()),
 			'cacheBuster' => $this->appConfig->getAppValue(Application::APP_ID, 'cachebuster', '0'),
+			'userCacheBuster' => $this->util->getUserCacheBuster(Application::APP_ID, $this->appConfig, $this->userSession),
 			'enabledThemes' => $this->themesService->getEnabledThemes(),
 		];
 	}

diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
@@ -420,6 +420,11 @@ public function replaceImagePath($app, $image) {
 		}
 
 		if ($route) {
+			$userCacheBusterValue = $this->util->getUserCacheBuster(Application::APP_ID, $this->config, $this->userSession);
+			$cacheBusterValue = '';
+			if ($userCacheBusterValue) {
+				$cacheBusterValue = $userCacheBusterValue;
+			}
 			return $route . '?v=' . $cacheBusterValue;
 		}
 

diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
@@ -34,6 +34,7 @@
 use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\IConfig;
+use OCP\IUserSession;
 use Mexitek\PHPColors\Color;
 
 class Util {
@@ -266,4 +267,14 @@ public function isBackgroundThemed() {
 		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', '');
 		return $backgroundLogo !== '' && $backgroundLogo !== 'backgroundColor';
 	}
+
+	public function getUserCacheBuster(string $appId, IConfig $config, ?IUserSession $user): string {
+		$userId = $user->getUser() ? $user->getUser()->getUID() : '';
+		$cacheBusterValue = '';
+		if ($userId) {
+			$userCacheBusterValue = (int)$config->getUserValue($userId, $appId, 'userCacheBuster', '0');
+			$cacheBusterValue = substr(sha1($userId . '_' . $userCacheBusterValue), 0, 8);
+		}
+		return $cacheBusterValue;
+	}
 }
diff --git a/core/js/mimetype.js b/core/js/mimetype.js
@@ -108,7 +108,11 @@ OC.MimeType = {
 		path += '.svg';
 
 		if(OCA.Theming) {
-			path += "?v=" + OCA.Theming.cacheBuster;
+			if (OCA.Theming.userCacheBuster) {
+				path += "?v=" + OCA.Theming.userCacheBuster;
+			} else {
+				path += "?v=" + OCA.Theming.cacheBuster;
+			}
 		}
 
 		// Cache the result