diff options
author | Maxence Lange <maxence@artificial-owl.com> | 2022-08-05 14:42:55 +0300 |
---|---|---|
committer | Maxence Lange <maxence@artificial-owl.com> | 2022-08-05 18:43:40 +0300 |
commit | a9369957983462be2ae333cabcf7936bea7fda10 (patch) | |
tree | 87149f6f37a148faa5fcd7d2a8b6cb47e7255135 /lib | |
parent | 41e0f90c6e158846e305d4926714c50916f6ffcf (diff) |
ignore remnants
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/ShareByCircleProvider.php | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/lib/ShareByCircleProvider.php b/lib/ShareByCircleProvider.php index 00b4f7f2..844fdc7b 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; @@ -391,6 +392,7 @@ class ShareByCircleProvider implements IShareProvider { * @param Folder $node * @param bool $reshares * @param bool $shallow Whether the method should stop at the first level, or look into sub-folders. + * * @return array * @throws ContactAddressBookNotFoundException * @throws ContactFormatException @@ -454,10 +456,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, |