Skip to content

[stable25] ignore exception on unknown entity #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 1 commit into from
Oct 8, 2022
Merged

[stable25] ignore exception on unknown entity #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/RelatedResourceProviders/CalendarRelatedResourceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
5 changes: 4 additions & 1 deletion lib/RelatedResourceProviders/DeckRelatedResourceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
}
}
}

Expand Down
8 changes: 5 additions & 3 deletions lib/RelatedResourceProviders/TalkRelatedResourceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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) {
}
}
}

Expand Down