Skip to content

Commit

Permalink
deleted circles shares
Browse files Browse the repository at this point in the history
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
  • Loading branch information
ArtificialOwl committed Nov 30, 2022
1 parent d8d15c3 commit 594baac
Showing 1 changed file with 24 additions and 1 deletion.
25 changes: 24 additions & 1 deletion apps/files_sharing/lib/Controller/DeletedShareAPIController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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');
}
}

0 comments on commit 594baac

Please sign in to comment.