Skip to content
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

Jump to bottom

recover deleted circles shares #35526

Closed
wants to merge 1 commit into from
Closed

recover deleted circles shares #35526

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
25 changes: 24 additions & 1 deletion apps/files_sharing/lib/Controller/DeletedShareAPIController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@
$result = array_merge($result, $this->getDeckShareHelper()->formatShare($share));
} catch (QueryException $e) {
}
} elseif ($share->getShareType() === IShare::TYPE_CIRCLE) {
try {
$result = array_merge($result, $this->getCirclesShareHelper()->formatShare($share));

Check failure

Code scanning / Psalm

UndefinedDocblockClass

Docblock-defined class, interface or enum named OCA\Circles\ShareAPIHelper does not exist
} catch (QueryException $e) {
}
} elseif ($share->getShareType() === IShare::TYPE_SCIENCEMESH) {
$result['share_with'] = $share->getSharedWith();
$result['share_with_displayname'] = '';
Expand All @@ -195,9 +200,10 @@
$groupShares = $this->shareManager->getDeletedSharedWith($this->userId, IShare::TYPE_GROUP, null, -1, 0);
$roomShares = $this->shareManager->getDeletedSharedWith($this->userId, IShare::TYPE_ROOM, null, -1, 0);
$deckShares = $this->shareManager->getDeletedSharedWith($this->userId, IShare::TYPE_DECK, null, -1, 0);
$circlesShares = $this->shareManager->getDeletedSharedWith($this->userId, IShare::TYPE_CIRCLE, null, -1, 0);
$sciencemeshShares = $this->shareManager->getDeletedSharedWith($this->userId, IShare::TYPE_SCIENCEMESH, null, -1, 0);

$shares = array_merge($groupShares, $roomShares, $deckShares, $sciencemeshShares);
$shares = array_merge($groupShares, $roomShares, $deckShares, $circlesShares, $sciencemeshShares);

$shares = array_map(function (IShare $share) {
return $this->formatShare($share);
Expand Down Expand Up @@ -272,6 +278,23 @@
return $this->serverContainer->get('\OCA\Deck\Sharing\ShareAPIHelper');
}

/**
* Returns the helper of ShareAPIHelper for circles shares.
*
* If the Circles application is not enabled or the helper is not available
* a QueryException is thrown instead.
*
* @return \OCA\Circles\ShareAPIHelper

Check failure

Code scanning / Psalm

UndefinedDocblockClass

Docblock-defined class, interface or enum named OCA\Circles\ShareAPIHelper does not exist
* @throws QueryException
*/
private function getCirclesShareHelper() {
if (!$this->appManager->isEnabledForUser('circles')) {
throw new QueryException();

Check notice

Code scanning / Psalm

DeprecatedClass Note

OCP\AppFramework\QueryException is marked deprecated
}

return $this->serverContainer->get('\OCA\Circles\ShareByCircleProvider');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not \OCA\Circles\ShareAPIHelper ?

}

/**
* Returns the helper of DeletedShareAPIHelper for sciencemesh shares.
*
Expand Down
1 change: 1 addition & 0 deletions psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
<UndefinedDocblockClass>
<errorLevel type="suppress">
<!-- Helper classes for sharing API integration from other apps -->
<referencedClass name="OCA\Circles\ShareAPIHelper" />
<referencedClass name="OCA\Deck\Sharing\ShareAPIHelper" />
<referencedClass name="OCA\Talk\Share\Helper\DeletedShareAPIController" />
<referencedClass name="OCA\GlobalSiteSelector\Service\SlaveService"/>
Expand Down
Loading