diff options
author | blizzz <blizzz@arthur-schiwon.de> | 2022-08-30 18:50:21 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-30 18:50:21 +0300 |
commit | fd641a0d2f658374b3d09c3556f8e696950b0d3c (patch) | |
tree | f9be117758dc932dec452a937c5af9b1c21bc1bb | |
parent | 2817d4138a74b516e0bb715e0821b389bf598f99 (diff) | |
parent | bf17657bb0f53005e09312a6868ae2d109836f15 (diff) |
Merge pull request #1128 from nextcloud/backport/1127/stable24v24.0.5rc1
[stable24] ignore remnants
-rw-r--r-- | lib/ShareByCircleProvider.php | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/lib/ShareByCircleProvider.php b/lib/ShareByCircleProvider.php index be595037..ff80f7b1 100644 --- a/lib/ShareByCircleProvider.php +++ b/lib/ShareByCircleProvider.php @@ -34,9 +34,7 @@ declare(strict_types=1); namespace OCA\Circles; -use OCA\Circles\Tools\Traits\TNCLogger; -use OCA\Circles\Tools\Traits\TArrayTools; -use OCA\Circles\Tools\Traits\TStringTools; +use Exception; use OC; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\Exceptions\ContactAddressBookNotFoundException; @@ -68,6 +66,9 @@ use OCA\Circles\Service\EventService; use OCA\Circles\Service\FederatedEventService; use OCA\Circles\Service\FederatedUserService; use OCA\Circles\Service\ShareWrapperService; +use OCA\Circles\Tools\Traits\TArrayTools; +use OCA\Circles\Tools\Traits\TNCLogger; +use OCA\Circles\Tools\Traits\TStringTools; use OCP\Files\Folder; use OCP\Files\InvalidPathException; use OCP\Files\IRootFolder; @@ -453,10 +454,19 @@ class ShareByCircleProvider implements IShareProvider { return []; } - $federatedUser = $this->federatedUserService->getLocalFederatedUser($userId); + $nodeId = (!is_null($node)) ? $node->getId() : 0; + + try { + $federatedUser = $this->federatedUserService->getLocalFederatedUser($userId, false); + } catch (Exception $e) { + $this->e($e, ['userId' => $userId, 'shareType' => $shareType, 'nodeId' => $nodeId]); + + return []; + } + $wrappedShares = $this->shareWrapperService->getSharesBy( $federatedUser, - (!is_null($node)) ? $node->getId() : 0, + $nodeId, $reshares, $limit, $offset, |