deleted circles shares

Signed-off-by: Maxence Lange <[email protected]> fix psalm Signed-off-by: Maxence Lange <[email protected]>
nextcloud · Feb 1, 2023 · bdee2be · bdee2be
1 parent d7bd763
commit bdee2be
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/apps/files_sharing/lib/Controller/DeletedShareAPIController.php b/apps/files_sharing/lib/Controller/DeletedShareAPIController.php
@@ -159,6 +159,11 @@ private function formatShare(IShare $share): array {
 				$result = array_merge($result, $this->getDeckShareHelper()->formatShare($share));
 			} catch (QueryException $e) {
 			}
+		} elseif ($share->getShareType() === IShare::TYPE_CIRCLE) {
+			try {
+				$result = array_merge($result, $this->getCirclesShareHelper()->formatShare($share));
+			} catch (QueryException $e) {
+			}
 		}
 
 		return $result;
@@ -171,8 +176,9 @@ public function index(): DataResponse {
 		$groupShares = $this->shareManager->getDeletedSharedWith($this->userId, IShare::TYPE_GROUP, null, -1, 0);
 		$roomShares = $this->shareManager->getDeletedSharedWith($this->userId, IShare::TYPE_ROOM, null, -1, 0);
 		$deckShares = $this->shareManager->getDeletedSharedWith($this->userId, IShare::TYPE_DECK, null, -1, 0);
+		$circlesShares = $this->shareManager->getDeletedSharedWith($this->userId, IShare::TYPE_CIRCLE, null, -1, 0);
 
-		$shares = array_merge($groupShares, $roomShares, $deckShares);
+		$shares = array_merge($groupShares, $roomShares, $deckShares, $circlesShares);
 
 		$shares = array_map(function (IShare $share) {
 			return $this->formatShare($share);
@@ -239,4 +245,21 @@ private function getDeckShareHelper() {
 
 		return $this->serverContainer->get('\OCA\Deck\Sharing\ShareAPIHelper');
 	}
+
+	/**
+	 * Returns the helper of ShareAPIHelper for circles shares.
+	 *
+	 * If the Circles application is not enabled or the helper is not available
+	 * a QueryException is thrown instead.
+	 *
+	 * @return \OCA\Circles\ShareAPIHelper
+	 * @throws QueryException
+	 */
+	private function getCirclesShareHelper() {
+		if (!$this->appManager->isEnabledForUser('circles')) {
+			throw new QueryException();
+		}
+
+		return $this->serverContainer->get('\OCA\Circles\ShareByCircleProvider');
+	}
 }
diff --git a/psalm.xml b/psalm.xml
@@ -124,6 +124,7 @@
 		<UndefinedDocblockClass>
 			<errorLevel type="suppress">
 				<!-- Helper classes for sharing API integration from other apps -->
+				<referencedClass name="OCA\Circles\ShareAPIHelper" />
 				<referencedClass name="OCA\Deck\Sharing\ShareAPIHelper" />
 				<referencedClass name="OCA\Talk\Share\Helper\DeletedShareAPIController" />
 			</errorLevel>