From 3e032b133dcd9ecc44a75b063c507221b174c7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 4 Jun 2021 12:38:28 +0200 Subject: [PATCH] Add compatibility for circles on 22 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Db/Circle.php | 4 ++-- lib/Service/PermissionService.php | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/Db/Circle.php b/lib/Db/Circle.php index a8808c102..9887f306e 100644 --- a/lib/Db/Circle.php +++ b/lib/Db/Circle.php @@ -36,8 +36,8 @@ class Circle extends RelationalObject { public function getObjectSerialization() { return [ 'uid' => $this->object->getUniqueId(), - 'displayname' => $this->object->getName(), - 'typeString' => $this->object->getTypeString(), + 'displayname' => $this->object->getDisplayName(), + 'typeString' => '', 'circleOwner' => $this->object->getOwner(), 'type' => 7 ]; diff --git a/lib/Service/PermissionService.php b/lib/Service/PermissionService.php index bef86f599..787987bf4 100644 --- a/lib/Service/PermissionService.php +++ b/lib/Service/PermissionService.php @@ -268,7 +268,11 @@ class PermissionService { continue; } - foreach ($circle->getMembers() as $member) { + foreach ($circle->getInheritedMembers() as $member) { + if ($member->getUserType() !== 1) { + // deck currently only supports user members in circles + continue; + } $user = $this->userManager->get($member->getUserId()); if ($user === null) { $this->logger->info('No user found for circle member ' . $member->getUserId());