Merge pull request #76 from nextcloud/backport/65/stable25

[stable25] ignore exception on unknown entity

Author: ArtificialOwl

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);
 

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) {
+			}
 		}
 	}
 

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) {
+			}
 		}
 	}