Merge pull request #225 from nextcloud/chore/remove-deprecated-code

refactor: Remove deprecated code and refactor
nextcloud · Mar 6, 2024 · c6440c6 · c6440c6
2 parents 5370cda + 9b82f82
commit c6440c6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 74 deletions.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -28,17 +28,16 @@
 namespace OCA\Files_DownloadLimit\AppInfo;
 
 use OCA\Files_DownloadLimit\Capabilities;
-use OCA\Files\Event\LoadSidebar;
 use OCA\Files_DownloadLimit\Listener\BeforeTemplateRenderedListener;
 use OCA\Files_DownloadLimit\Listener\LoadSidebarListener;
 use OCA\Files_DownloadLimit\Listener\ShareLinkAccessedListener;
 use OCA\Files_Sharing\Event\BeforeTemplateRenderedEvent;
 use OCA\Files_Sharing\Event\ShareLinkAccessedEvent;
+use OCA\Files\Event\LoadSidebar;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\EventDispatcher\IEventDispatcher;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'files_downloadlimit';
@@ -48,13 +47,9 @@ public function __construct(array $urlParams = []) {
 	}
 
 	public function register(IRegistrationContext $context): void {
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $this->getContainer()->query(IEventDispatcher::class);
-
-		// Add listeners
-		$eventDispatcher->addServiceListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
-		$eventDispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
-		$eventDispatcher->addServiceListener(ShareLinkAccessedEvent::class, ShareLinkAccessedListener::class);
+		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
+		$context->registerEventListener(LoadSidebar::class, LoadSidebarListener::class);
+		$context->registerEventListener(ShareLinkAccessedEvent::class, ShareLinkAccessedListener::class);
 
 		$context->registerCapability(Capabilities::class);
 	}

diff --git a/lib/Controller/ApiController.php b/lib/Controller/ApiController.php
@@ -30,8 +30,8 @@
 use OCA\Files_DownloadLimit\Db\Limit;
 use OCA\Files_DownloadLimit\Db\LimitMapper;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\AppFramework\OCSController;
@@ -43,37 +43,21 @@
 use OCP\Share\IShare;
 
 class ApiController extends OCSController {
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IManager */
-	private $shareManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var LimitMapper */
-	private $mapper;
-
-	public function __construct(IRequest $request,
-								IConfig $config,
-								IManager $shareManager,
-								IUserSession $userSession,
-								LimitMapper $mapper) {
+	public function __construct(
+		IRequest $request,
+		private IConfig $config,
+		private IManager $shareManager,
+		private IUserSession $userSession,
+		private LimitMapper $mapper,
+	) {
 		parent::__construct(Application::APP_ID, $request);
-		$this->config = $config;
-		$this->shareManager = $shareManager;
-		$this->userSession = $userSession;
-		$this->mapper = $mapper;
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Set the download limit for a given link share
 	 */
-	public function setDownloadLimit(string $token, int $limit): Response {
+	#[NoAdminRequired]
+	public function setDownloadLimit(string $token, int $limit): DataResponse {
 		$this->validateToken($token);
 
 		// Count needs to be at least 1
@@ -106,11 +90,10 @@ public function setDownloadLimit(string $token, int $limit): Response {
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Remove the download limit for a given link share
 	 */
-	public function removeDownloadLimit(string $token): Response {
+	#[NoAdminRequired]
+	public function removeDownloadLimit(string $token): DataResponse {
 		$this->validateToken($token);
 
 		try {
@@ -119,16 +102,15 @@ public function removeDownloadLimit(string $token): Response {
 		} catch (DoesNotExistException $e) {
 			// Ignore if does not exists
 		}
-	
+
 		return new DataResponse();
 	}
 
 	/**
-	 * @NoAdminRequired
-	 *
 	 * Get the download limit for a given link share
 	 */
-	public function getDownloadLimit(string $token): Response {
+	#[NoAdminRequired]
+	public function getDownloadLimit(string $token): DataResponse {
 		$this->validateToken($token);
 
 		try {

diff --git a/lib/Listener/BeforeTemplateRenderedListener.php b/lib/Listener/BeforeTemplateRenderedListener.php
@@ -35,17 +35,10 @@
 use OCP\Util;
 
 class BeforeTemplateRenderedListener implements IEventListener {
-
-	/** @var IInitialState  */
-	private $initialStateService;
-
-	/** @var LimitMapper  */
-	private $limitMapper;
-
-	public function __construct(IInitialState $initialStateService,
-								LimitMapper $limitMapper) {
-		$this->initialStateService = $initialStateService;
-		$this->limitMapper = $limitMapper;
+	public function __construct(
+		private IInitialState $initialStateService,
+		private LimitMapper $limitMapper,
+	) {
 	}
 
 	public function handle(Event $event): void {
@@ -55,9 +48,6 @@ public function handle(Event $event): void {
 
 		try {
 			$shareLimit = $this->limitMapper->get($event->getShare()->getToken());
-		} catch (\Exception $e) {
-			// No limits are set, ignoring...
-			return;
 		} catch (\Throwable $e) {
 			// No limits are set, ignoring...
 			return;
@@ -67,6 +57,7 @@ public function handle(Event $event): void {
 			'limit' => $shareLimit->getLimit(),
 			'downloads' => $shareLimit->getDownloads(),
 		]);
+
 		Util::addScript(Application::APP_ID, Application::APP_ID . '-public');
 	}
 }
diff --git a/lib/Listener/ShareLinkAccessedListener.php b/lib/Listener/ShareLinkAccessedListener.php
@@ -26,7 +26,6 @@
 
 namespace OCA\Files_DownloadLimit\Listener;
 
-use OCA\Files_DownloadLimit\Db\Limit;
 use OCA\Files_DownloadLimit\Db\LimitMapper;
 use OCA\Files_Sharing\Event\ShareLinkAccessedEvent;
 use OCP\AppFramework\Db\DoesNotExistException;
@@ -36,22 +35,11 @@
 use OCP\Share\IManager;
 
 class ShareLinkAccessedListener implements IEventListener {
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IManager */
-	private $manager;
-
-	/** @var LimitMapper */
-	private $mapper;
-
-	public function __construct(IConfig $config,
-								IManager $manager,
-								LimitMapper $mapper) {
-		$this->config = $config;
-		$this->manager = $manager;
-		$this->mapper = $mapper;
+	public function __construct(
+		private IConfig $config,
+		private IManager $manager,
+		private LimitMapper $mapper,
+	) {
 	}
 
 	public function handle(Event $event): void {
@@ -81,7 +69,7 @@ public function handle(Event $event): void {
 				$this->mapper->delete($shareLimit);
 				return;
 			}
-			
+
 			// Else, we just update the current download count
 			$shareLimit->setDownloads($downloads);
 			$this->mapper->update($shareLimit);