[stable34] fix: Use global members limit as default for circle

lib/Command/CirclesList.php

@@ -225,6 +225,7 @@ private function displayCircles(array $circles): void {
 		);
 
 		$displayName = $this->input->getOption('display-name');
+		$defaultMembersLimit = $this->configService->getAppValueInt(ConfigService::MEMBERS_LIMIT);
 		$display = ($this->input->getOption('def') ? Circle::FLAGS_LONG : Circle::FLAGS_SHORT);
 		$rows = [];
 		foreach ($circles as $circle) {
@@ -237,7 +238,7 @@ private function displayCircles(array $circles): void {
 				$this->cut($displayName ? $owner->getDisplayName() : $owner->getUserId(), 40),
 				$this->configService->displayInstance($owner->getInstance()),
 				((string)$circle->getPopulation()) . '/'
-				. ((string)$this->getInt('members_limit', $circle->getSettings(), -1))
+				. ((string)$this->getInt('members_limit', $circle->getSettings(), $defaultMembersLimit))
 				. ' (' . ((string)$circle->getPopulationInherited()) . ')'
 			];
 		}

lib/Service/CircleService.php

@@ -682,15 +682,23 @@ public function isCircleFull(Circle $circle): bool {
 
 		$members = $this->memberRequest->getMembers($circle->getSingleId(), null, $probe);
 
-		$limit = $this->getInt('members_limit', $circle->getSettings());
-		if ($limit === 0) {
-			$limit = $this->configService->getAppValueInt(ConfigService::MEMBERS_LIMIT);
-		}
-		if ($limit === -1) {
-			return false;
+		$instanceLimit = $this->configService->getAppValueInt(ConfigService::MEMBERS_LIMIT);
+		$circleLimit = $this->getInt('members_limit', $circle->getSettings(), $instanceLimit);
+		$memberCount = sizeof($members);
+
+		if ($instanceLimit === -1) {
+			if ($circleLimit === -1) {
+				return false;
+			} else {
+				return $memberCount >= $circleLimit;
+			}
+		} else {
+			if ($circleLimit === -1) {
+				return $memberCount >= $instanceLimit;
+			} else {
+				return $memberCount >= $instanceLimit || $memberCount >= $circleLimit;
+			}
 		}
-
-		return (sizeof($members) >= $limit);
 	}
 
 

tests/unit/lib/Service/CircleServiceTest.php

@@ -0,0 +1,87 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Circles\Tests\Service;
+
+use OCA\Circles\Db\CircleRequest;
+use OCA\Circles\Db\MemberRequest;
+use OCA\Circles\Model\Circle;
+use OCA\Circles\Model\Member;
+use OCA\Circles\Service\CircleService;
+use OCA\Circles\Service\ConfigService;
+use OCA\Circles\Service\FederatedEventService;
+use OCA\Circles\Service\FederatedUserService;
+use OCA\Circles\Service\MemberService;
+use OCA\Circles\Service\PermissionService;
+use OCA\Circles\Service\RemoteStreamService;
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\ICacheFactory;
+use OCP\IL10N;
+use OCP\Security\IHasher;
+use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
+
+class CircleServiceTest extends TestCase {
+	protected CircleService $circleService;
+	protected ConfigService&MockObject $configService;
+	protected MemberRequest&MockObject $memberRequest;
+
+	protected function setUp(): void {
+		parent::setUp();
+
+		$this->configService = $this->createMock(ConfigService::class);
+		$this->memberRequest = $this->createMock(MemberRequest::class);
+
+		$this->circleService = new CircleService(
+			$this->createMock(IL10N::class),
+			$this->createMock(IHasher::class),
+			$this->createMock(ICacheFactory::class),
+			$this->createMock(CircleRequest::class),
+			$this->memberRequest,
+			$this->createMock(RemoteStreamService::class),
+			$this->createMock(FederatedUserService::class),
+			$this->createMock(FederatedEventService::class),
+			$this->createMock(MemberService::class),
+			$this->createMock(PermissionService::class),
+			$this->configService,
+			$this->createMock(IEventDispatcher::class),
+		);
+	}
+
+	private function circleFullDataProvider(): array {
+		return [
+			[-1, -1, [$this->createMock(Member::class)], false],
+			[0, -1, [$this->createMock(Member::class)], true],
+			[1, -1, [$this->createMock(Member::class)], true],
+			[2, -1, [$this->createMock(Member::class)], false],
+			[-1, 0, [$this->createMock(Member::class)], true],
+			[-1, 1, [$this->createMock(Member::class)], true],
+			[-1, 2, [$this->createMock(Member::class)], false],
+			[0, 2, [$this->createMock(Member::class)], true],
+			[1, 2, [$this->createMock(Member::class)], true],
+			[2, 0, [$this->createMock(Member::class)], true],
+			[2, 1, [$this->createMock(Member::class)], true],
+			[2, 2, [$this->createMock(Member::class)], false],
+		];
+	}
+
+	/**
+	 * @dataProvider circleFullDataProvider
+	 */
+	public function testIsCircleFull(int $instanceLimit, int $circleLimit, array $members, bool $expectResult) {
+		$circle = $this->createMock(Circle::class);
+		$circle->method('getSettings')->willReturn(['members_limit' => $circleLimit]);
+
+		$this->memberRequest->method('getMembers')->willReturn($members);
+
+		$this->configService->method('getAppValueInt')->willReturn($instanceLimit);
+
+		$this->assertSame($this->circleService->isCircleFull($circle), $expectResult);
+	}
+}