Merge pull request #65 from nextcloud/fix/noid/ignore-exception-on-un…

…known-entity ignore exception on unknown entity
nextcloud · Oct 8, 2022 · 600e862 · 600e862
2 parents 7a4ee5c + 809a625
commit 600e862
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/lib/RelatedResourceProviders/CalendarRelatedResourceProvider.php b/lib/RelatedResourceProviders/CalendarRelatedResourceProvider.php
@@ -205,6 +205,12 @@ private function generateSingleId(CalendarShare $share): void {
  }
 
 
+ /**
+ * @param string $principalUri
+ *
+ * @return FederatedUser
+ * @throws Exception
+ */
  private function extractEntity(string $principalUri): FederatedUser {
  [$shareType, $recipient] = explode('/', substr($principalUri, 11), 2);
 

diff --git a/lib/RelatedResourceProviders/DeckRelatedResourceProvider.php b/lib/RelatedResourceProviders/DeckRelatedResourceProvider.php
@@ -173,7 +173,10 @@ private function convertToRelatedResource(DeckShare $share): IRelatedResource {
  */
  private function assignEntities(array $shares): void {
  foreach ($shares as $share) {
- $this->assignEntity($share);
+ try {
+ $this->assignEntity($share);
+ } catch (Exception $e) {
+ }
  }
  }
 

diff --git a/lib/RelatedResourceProviders/TalkRelatedResourceProvider.php b/lib/RelatedResourceProviders/TalkRelatedResourceProvider.php
@@ -104,8 +104,7 @@ public function getRelatedToEntity(FederatedUser $entity): array {
  switch ($entity->getBasedOn()->getSource()) {
  case Member::TYPE_USER:
  $shares = $this->talkRoomRequest->getSharesToUser($entity->getUserId());
-
- return [];
+ break;
 
  case Member::TYPE_GROUP:
  $shares = $this->talkRoomRequest->getSharesToGroup($entity->getUserId());
@@ -168,7 +167,10 @@ private function convertToRelatedResource(TalkRoom $share): IRelatedResource {
  */
  private function assignEntities(array $shares): void {
  foreach ($shares as $share) {
- $this->assignEntity($share);
+ try {
+ $this->assignEntity($share);
+ } catch (Exception $e) {
+ }
  }
  }