diff options
| author | Simon L <szaimen@e.mail.de> | 2022-11-09 21:16:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-09 21:16:10 +0300 |
| commit | 75d99e2c9c3ed22e79c3ffc84d09d2966da76f3c (patch) | |
| tree | 8c6dbfada179a21b11184bdc01744b4375c41e00 | |
| parent | aa802b8b14dda99f1177b3db7d073b9577ea11ca (diff) | |
| parent | e7bf90fcbce2d4881d249b7d6777443b95ebdb6e (diff) | |
Merge pull request #1201 from nextcloud/fix/noid/reactivate-deprecated-api
re-activate getMember()
| -rw-r--r-- | lib/Api/v1/Circles.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/Api/v1/Circles.php b/lib/Api/v1/Circles.php index a2b94bb4..f96e3d77 100644 --- a/lib/Api/v1/Circles.php +++ b/lib/Api/v1/Circles.php @@ -29,6 +29,7 @@ namespace OCA\Circles\Api\v1; +use OCA\Circles\CirclesManager; use OCA\Circles\Exceptions\CircleNotFoundException; use OCA\Circles\Exceptions\FederatedUserException; use OCA\Circles\Exceptions\FederatedUserNotFoundException; @@ -38,6 +39,7 @@ use OCA\Circles\Exceptions\RequestBuilderException; use OCA\Circles\Exceptions\SingleCircleNotFoundException; use OCA\Circles\Model\Circle; use OCA\Circles\Model\Member; +use OCA\Circles\Model\Membership; use OCA\Circles\Model\Probes\CircleProbe; use OCA\Circles\Service\CircleService; use OCA\Circles\Service\FederatedUserService; @@ -201,7 +203,7 @@ class Circles { * @param int $type * @param bool $forceAll * - * @return Member + * @return Membership * * @deprecated - used by apps/files_sharing/lib/Controller/ShareAPIController.php * @@ -212,7 +214,11 @@ class Circles { * */ public static function getMember($circleUniqueId, $ident, $type, $forceAll = false) { - throw new \BadMethodCallException('Method is deprecated and not longer works'); + /** @var CirclesManager $circlesManager */ + $circlesManager = \OC::$server->get(CirclesManager::class); + $federatedUser = $circlesManager->getFederatedUser($ident, $type); + + return $circlesManager->getLink($circleUniqueId, $federatedUser->getSingleId()); } |