Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/circles.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxence Lange <maxence@artificial-owl.com>2022-08-05 14:42:55 +0300
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>2022-08-05 18:43:46 +0300
commitbf17657bb0f53005e09312a6868ae2d109836f15 (patch)
tree2d0ec46d4753879ef5f76977213cf70478bbba7d
parent6bd98027eb5ec13a5fd3c8c046cd1ca518338913 (diff)
ignore remnantsbackport/1127/stable24
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-rw-r--r--lib/ShareByCircleProvider.php20
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,