diff --git a/lib/Controller/JsController.php b/lib/Controller/JsController.php index 302de3d..a8be206 100644 --- a/lib/Controller/JsController.php +++ b/lib/Controller/JsController.php @@ -20,6 +20,7 @@ namespace OCA\SideMenu\Controller; use OC\User\User; +use OCA\SideMenu\AppInfo\Application; use OCA\SideMenu\Service\ConfigProxy; use OCA\Theming\ThemingDefaults; use OCP\AppFramework\Controller; @@ -28,12 +29,10 @@ use OCP\AppFramework\Http\Attribute\NoAdminRequired; use OCP\AppFramework\Http\Attribute\NoCSRFRequired; use OCP\AppFramework\Http\Attribute\PublicPage; use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\TemplateResponse; use OCP\IRequest; use OCP\IUserSession; use OCP\L10N\IFactory; -use OCP\IAvatarManager; -use OCP\INavigationManager; -use OCP\IURLGenerator; class JsController extends Controller { @@ -45,13 +44,14 @@ class JsController extends Controller protected ConfigProxy $config, protected ThemingDefaults $themingDefaults, protected IFactory $l10nFactory, - protected IAvatarManager $avatarManager, - protected IUserSession $userSession, - protected INavigationManager $navigationManager, - protected IURLGenerator $urlGenerator, ) { parent::__construct($appName, $request); - $this->user = $this->userSession->getUser(); + + $this->themingDefaults = $themingDefaults; + + $this->user = \OC::$server[IUserSession::class]->getUser(); + $this->config = $config; + $this->l10nFactory = $l10nFactory; } #[NoCSRFRequired] @@ -99,25 +99,25 @@ class JsController extends Controller $targetBlankApps = $userTargetBlankApps; } - $isAvatarSet = $this->avatarManager->getAvatar($this->user->getUID())->exists(); + $isAvatarSet = \OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists(); if ($useAvatar && $isAvatarSet) { - $avatar = $this->urlGenerator->linkToRoute('core.avatar.getAvatar', [ - 'userId' => $this->user->getUID(), + $avatar = \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [ + 'userId' => $this->user->getUid(), 'size' => 128, 'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0), ]); } if ($this->config->getAppValueBool('show-settings', '0')) { - $settingsNav = $this->navigationManager->getAll('settings'); + $settingsNav = \OC::$server->getNavigationManager()->getAll('settings'); if (isset($settingsNav['settings'])) { $settings = [ 'href' => $settingsNav['settings']['href'], 'name' => $settingsNav['settings']['name'], - 'avatar' => $this->urlGenerator->linkToRoute('core.avatar.getAvatar', [ - 'userId' => $this->user->getUID(), + 'avatar' => \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [ + 'userId' => $this->user->getUid(), 'size' => 32, 'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0), ]), @@ -126,7 +126,7 @@ class JsController extends Controller } } - $indexUrl = $this->urlGenerator->linkTo('', 'index.php'); + $indexUrl = \OC::$server->getURLGenerator()->linkTo('', 'index.php'); return [ 'opener-position' => $this->config->getAppValue('opener-position', 'before'), diff --git a/package.json b/package.json index 0a23693..c0b1a94 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "file-loader": "^6.2.0", "mini-css-extract-plugin": "^2.9.1", "postcss-loader": "^8.1.1", - "prettier": "3.4.2", + "prettier": "3.6.2", "sass": "^1.78.0", "sass-loader": "^16.0.1", "source-map-loader": "^5.0.0",