migrate tools to nc22

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

CHANGELOG.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 
 
+
+### 22.0.0 (NC22)
+
+- compat nc22
+- first implementation of federated circles (2.0)
+- first implementation of new ExtendedQueryBuilder
+
+
 ### 0.20.6
 
 - use https and http when in doubt
@@ -27,13 +35,6 @@ All notable changes to this project will be documented in this file.
 - fixing composer lib version
 
 
-### 21.0.0 (NC21)
-
-- compat nc21
-- first implementation of federated circles (2.0)
-- first implementation of new ExtendedQueryBuilder
-
-
 ### 0.20.2
 
 - fixing a migration issue on some database setup

composer.lock

@@ -12,12 +12,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/daita/my-small-php-tools.git",
-                "reference": "7d5b021603d29091d23245c759395c969f678f63"
+                "reference": "5a84af4936ac2e225bdbf92f5b3f824cf517e2a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/7d5b021603d29091d23245c759395c969f678f63",
-                "reference": "7d5b021603d29091d23245c759395c969f678f63",
+                "url": "https://api.github.com/repos/daita/my-small-php-tools/zipball/5a84af4936ac2e225bdbf92f5b3f824cf517e2a7",
+                "reference": "5a84af4936ac2e225bdbf92f5b3f824cf517e2a7",
                 "shasum": ""
             },
             "require": {
@@ -45,7 +45,7 @@
                 "issues": "https://github.com/daita/my-small-php-tools/issues",
                 "source": "https://github.com/daita/my-small-php-tools/tree/master"
             },
-            "time": "2021-03-19T11:33:52+00:00"
+            "time": "2021-03-22T12:46:14+00:00"
         }
     ],
     "packages-dev": [],

lib/Collaboration/v2/CollaboratorSearchPlugin.php

@@ -32,6 +32,7 @@ declare(strict_types=1);
 namespace OCA\Circles\Collaboration\v2;
 
 
+use daita\MySmallPhpTools\Model\SimpleDataStore;
 use OC\Share20\Share;
 use OC\User\NoUserException;
 use OCA\Circles\Exceptions\FederatedUserException;
@@ -40,6 +41,7 @@ use OCA\Circles\Exceptions\InitiatorNotFoundException;
 use OCA\Circles\Exceptions\InvalidIdException;
 use OCA\Circles\Exceptions\SingleCircleNotFoundException;
 use OCA\Circles\Model\Circle;
+use OCA\Circles\Model\Member;
 use OCA\Circles\Service\CircleService;
 use OCA\Circles\Service\FederatedUserService;
 use OCP\Collaboration\Collaborators\ISearchPlugin;
@@ -96,7 +98,20 @@ class CollaboratorSearchPlugin implements ISearchPlugin {
 		$filterCircle->setName($search)
 					 ->setDisplayName($search);
 
-		$circles = $this->circleService->getCircles($filterCircle);
+		$filterMember = new Member();
+		$filterMember->importFromIFederatedUser($this->federatedUserService->getCurrentUser());
+		$filterMember->setLevel(Member::LEVEL_MEMBER);
+
+		$circles = $this->circleService->getCircles(
+			$filterCircle, $filterMember,
+			new SimpleDataStore(
+				[
+					'limit'  => $limit,
+					'offset' => $offset
+				]
+			)
+		);
+
 		foreach ($circles as $circle) {
 			try {
 				$entry = $this->addResultEntry($circle);
@@ -125,14 +140,15 @@ class CollaboratorSearchPlugin implements ISearchPlugin {
 	 */
 	private function addResultEntry(Circle $circle): array {
 		return [
-			'label' => $circle->getDisplayName(),
-			'value' => [
-				'shareType'   => Share::TYPE_CIRCLE,
-				'shareWith'   => $circle->getId(),
-				'circleOwner' => $circle->getOwner()
-										->getDisplayName(),
-				'circle'      => $circle
+			'label'                => $circle->getDisplayName(),
+			'shareWithDescription' => $circle->getOwner()->getDisplayName(),
+			'value'                => [
+				'shareType' => Share::TYPE_CIRCLE,
+				'shareWith' => $circle->getId(),
+				'circle'    => $circle
 			],
 		];
 	}
+
 }
+

lib/Command/CirclesCheck.php

@@ -30,9 +30,9 @@
 namespace OCA\Circles\Command;
 
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Request;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
 use daita\MySmallPhpTools\Model\Request;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Request;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use Exception;
 use OC\Core\Command\Base;
@@ -58,7 +58,7 @@ class CirclesCheck extends Base {
 
 
 	use TArrayTools;
-	use TNC21Request;
+	use TNC22Request;
 
 
 	/** @var Capabilities */
@@ -199,7 +199,7 @@ class CirclesCheck extends Base {
 	 * @throws RequestNetworkException
 	 */
 	private function testRequest(OutputInterface $o, string $type, string $route, array $args = []): bool {
-		$request = new NC21Request('', Request::type($type));
+		$request = new NC22Request('', Request::type($type));
 		$this->configService->configureRequest($request, $route, $args);
 		$request->setFollowLocation(false);
 

lib/Command/CirclesList.php

@@ -34,6 +34,7 @@ namespace OCA\Circles\Command;
 use daita\MySmallPhpTools\Exceptions\InvalidItemException;
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\SignatoryException;
+use daita\MySmallPhpTools\Model\SimpleDataStore;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use OC\Core\Command\Base;
 use OCA\Circles\Exceptions\CircleNotFoundException;
@@ -166,7 +167,8 @@ class CirclesList extends Base {
 			$circles = $this->remoteService->getCirclesFromInstance($instance, $data);
 		} else {
 			$this->federatedUserService->commandLineInitiator($initiator, '', true);
-			$circles = $this->circleService->getCircles(null, $filterMember, !$input->getOption('all'));
+			$params = new SimpleDataStore(['includeSystemCircles' => $input->getOption('all')]);
+			$circles = $this->circleService->getCircles(null, $filterMember, $params);
 		}
 
 		if (strtolower($input->getOption('output')) === 'json') {

lib/Command/CirclesMemberships.php

@@ -36,9 +36,9 @@ use daita\MySmallPhpTools\Exceptions\ItemNotFoundException;
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\SignatoryException;
 use daita\MySmallPhpTools\Exceptions\UnknownTypeException;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21TreeNode;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22TreeNode;
 use daita\MySmallPhpTools\Model\SimpleDataStore;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21ConsoleTree;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22ConsoleTree;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use OC\Core\Command\Base;
 use OCA\Circles\Db\MemberRequest;
@@ -75,7 +75,7 @@ class CirclesMemberships extends Base {
 
 
 	use TArrayTools;
-	use TNC21ConsoleTree;
+	use TNC22ConsoleTree;
 
 
 	/** @var IUserManager */
@@ -200,7 +200,7 @@ class CirclesMemberships extends Base {
 
 		$output->writeln('');
 
-		$tree = new NC21TreeNode(null, new SimpleDataStore(['federatedUser' => $federatedUser]));
+		$tree = new NC22TreeNode(null, new SimpleDataStore(['federatedUser' => $federatedUser]));
 		$this->generateTree($federatedUser->getSingleId(), $tree);
 
 		$this->drawTree(
@@ -218,10 +218,10 @@ class CirclesMemberships extends Base {
 
 	/**
 	 * @param string $id
-	 * @param NC21TreeNode $tree
+	 * @param NC22TreeNode $tree
 	 * @param array $knownIds
 	 */
-	private function generateTree(string $id, NC21TreeNode $tree, array $knownIds = []) {
+	private function generateTree(string $id, NC22TreeNode $tree, array $knownIds = []) {
 		if (in_array($id, $knownIds)) {
 			return;
 		}
@@ -233,7 +233,7 @@ class CirclesMemberships extends Base {
 				continue;
 			}
 
-			$item = new NC21TreeNode(
+			$item = new NC22TreeNode(
 				$tree, new SimpleDataStore(
 						 [
 							 'member'  => $member,

lib/Command/CirclesRemote.php

@@ -34,9 +34,9 @@ namespace OCA\Circles\Command;
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\SignatoryException;
 use daita\MySmallPhpTools\Exceptions\SignatureException;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Request;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21SignedRequest;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21WellKnown;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22SignedRequest;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22WellKnown;
 use daita\MySmallPhpTools\Traits\TStringTools;
 use Exception;
 use OC\Core\Command\Base;
@@ -66,7 +66,7 @@ use Symfony\Component\Console\Question\ConfirmationQuestion;
 class CirclesRemote extends Base {
 
 
-	use TNC21WellKnown;
+	use TNC22WellKnown;
 	use TStringTools;
 
 
@@ -376,12 +376,12 @@ class CirclesRemote extends Base {
 	 * @param string $remote
 	 * @param array $payload
 	 *
-	 * @return NC21SignedRequest
+	 * @return NC22SignedRequest
 	 * @throws RequestNetworkException
 	 * @throws SignatoryException
 	 */
-	private function outgoingTest(string $remote, array $payload): NC21SignedRequest {
-		$request = new NC21Request();
+	private function outgoingTest(string $remote, array $payload): NC22SignedRequest {
+		$request = new NC22Request();
 		$request->basedOnUrl($remote);
 		$request->setFollowLocation(true);
 		$request->setLocalAddressAllowed(true);

lib/Command/CirclesTest.php

@@ -34,7 +34,7 @@ namespace OCA\Circles\Command;
 
 use daita\MySmallPhpTools\Exceptions\InvalidItemException;
 use daita\MySmallPhpTools\Exceptions\ItemNotFoundException;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Deserialize;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use daita\MySmallPhpTools\Traits\TStringTools;
 use Exception;
@@ -63,7 +63,7 @@ class CirclesTest extends Base {
 
 	use TArrayTools;
 	use TStringTools;
-	use TNC21Deserialize;
+	use TNC22Deserialize;
 
 
 	static $INSTANCES = [

lib/Command/MembersAdd.php

@@ -36,7 +36,7 @@ use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\RequestResultNotJsonException;
 use daita\MySmallPhpTools\Exceptions\RequestResultSizeException;
 use daita\MySmallPhpTools\Exceptions\RequestServerException;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Request;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
 use daita\MySmallPhpTools\Model\Request;
 use Exception;
 use OC\Core\Command\Base;
@@ -168,7 +168,7 @@ class MembersAdd extends Base {
 			return '';
 		}
 
-		$request = new NC21Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
+		$request = new NC22Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
 		$this->configService->configureRequest($request);
 		$request->basedOnUrl($lookup);
 		$request->addParam('search', $search);

lib/Command/MembersList.php

@@ -36,9 +36,9 @@ use daita\MySmallPhpTools\Exceptions\ItemNotFoundException;
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\SignatoryException;
 use daita\MySmallPhpTools\Exceptions\UnknownTypeException;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21TreeNode;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22TreeNode;
 use daita\MySmallPhpTools\Model\SimpleDataStore;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21ConsoleTree;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22ConsoleTree;
 use OC\Core\Command\Base;
 use OCA\Circles\Exceptions\CircleNotFoundException;
 use OCA\Circles\Exceptions\FederatedUserException;
@@ -75,7 +75,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 class MembersList extends Base {
 
 
-	use TNC21ConsoleTree;
+	use TNC22ConsoleTree;
 
 
 	/** @var FederatedUserService */
@@ -166,7 +166,7 @@ class MembersList extends Base {
 			$output->writeln('<info>Config</info>: ' . $type);
 			$output->writeln(' ');
 
-			$tree = new NC21TreeNode(null, new SimpleDataStore(['circle' => $circle]));
+			$tree = new NC22TreeNode(null, new SimpleDataStore(['circle' => $circle]));
 		}
 
 		$members = $this->getMembers($circleId, $instance, $initiator, $tree);
@@ -221,7 +221,7 @@ class MembersList extends Base {
 	 * @param string $circleId
 	 * @param string $instance
 	 * @param string $initiator
-	 * @param NC21TreeNode|null $tree
+	 * @param NC22TreeNode|null $tree
 	 * @param array $knownIds
 	 *
 	 * @return array
@@ -245,7 +245,7 @@ class MembersList extends Base {
 		string $circleId,
 		string $instance,
 		string $initiator,
-		?NC21TreeNode $tree,
+		?NC22TreeNode $tree,
 		array $knownIds = []
 	): array {
 		if (in_array($circleId, $knownIds)) {
@@ -291,7 +291,7 @@ class MembersList extends Base {
 						);
 						$circle = $this->circleService->getCircle($member->getSingleId(), 0);
 					}
-					$node = new NC21TreeNode(
+					$node = new NC22TreeNode(
 						$tree, new SimpleDataStore(
 								 [
 									 'circle'  => $circle,
@@ -305,7 +305,7 @@ class MembersList extends Base {
 						$member->getSingleId(), $member->getInstance(), $initiator, $node, $knownIds
 					);
 				} else {
-					new NC21TreeNode(
+					new NC22TreeNode(
 						$tree, new SimpleDataStore(
 								 [
 									 'member'  => $member,

lib/Controller/LocalController.php

@@ -32,8 +32,8 @@ declare(strict_types=1);
 namespace OCA\Circles\Controller;
 
 
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Deserialize;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Logger;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger;
 use Exception;
 use OCA\Circles\Exceptions\FederatedUserException;
 use OCA\Circles\Exceptions\FederatedUserNotFoundException;
@@ -60,8 +60,8 @@ use OCP\IUserSession;
 class LocalController extends OcsController {
 
 
-	use TNC21Deserialize;
-	use TNC21Logger;
+	use TNC22Deserialize;
+	use TNC22Logger;
 
 
 	/** @var IUserSession */

lib/Controller/RemoteController.php

@@ -38,10 +38,10 @@ use daita\MySmallPhpTools\Exceptions\MalformedArrayException;
 use daita\MySmallPhpTools\Exceptions\SignatoryException;
 use daita\MySmallPhpTools\Exceptions\SignatureException;
 use daita\MySmallPhpTools\Exceptions\UnknownTypeException;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21SignedRequest;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22SignedRequest;
 use daita\MySmallPhpTools\Model\SimpleDataStore;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Controller;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21LocalSignatory;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Controller;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22LocalSignatory;
 use Exception;
 use OC\AppFramework\Middleware\Security\Exceptions\NotLoggedInException;
 use OCA\Circles\Db\CircleRequest;
@@ -73,8 +73,8 @@ use OCP\IRequest;
 class RemoteController extends Controller {
 
 
-	use TNC21Controller;
-	use TNC21LocalSignatory;
+	use TNC22Controller;
+	use TNC22LocalSignatory;
 
 
 	/** @var CircleRequest */
@@ -410,12 +410,12 @@ class RemoteController extends Controller {
 
 
 	/**
-	 * @param NC21SignedRequest $signedRequest
+	 * @param NC22SignedRequest $signedRequest
 	 *
 	 * @return RemoteInstance
 	 * @throws SignatoryException
 	 */
-	private function confirmRemoteInstance(NC21SignedRequest $signedRequest): RemoteInstance {
+	private function confirmRemoteInstance(NC22SignedRequest $signedRequest): RemoteInstance {
 		/** @var RemoteInstance $signatory */
 		$signatory = $signedRequest->getSignatory();
 

lib/Controller/RemoteWrapperController.php

@@ -30,7 +30,7 @@
 namespace OCA\Circles\Controller;
 
 
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Controller;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Controller;
 use daita\MySmallPhpTools\Traits\TAsync;
 use daita\MySmallPhpTools\Traits\TStringTools;
 use Exception;
@@ -54,7 +54,7 @@ class RemoteWrapperController extends Controller {
 
 	use TStringTools;
 	use TAsync;
-	use TNC21Controller;
+	use TNC22Controller;
 
 
 	/** @var FederatedEventService */

lib/Db/CircleRequest.php

@@ -32,6 +32,7 @@ declare(strict_types=1);
 namespace OCA\Circles\Db;
 
 
+use daita\MySmallPhpTools\Model\SimpleDataStore;
 use OCA\Circles\Exceptions\CircleNotFoundException;
 use OCA\Circles\Exceptions\FederatedUserNotFoundException;
 use OCA\Circles\Exceptions\InvalidIdException;
@@ -151,21 +152,21 @@ class CircleRequest extends CircleRequestBuilder {
 	 * @param Member|null $memberFilter
 	 * @param IFederatedUser|null $initiator
 	 * @param RemoteInstance|null $remoteInstance
-	 * @param bool $filterSystemCircles
+	 * @param SimpleDataStore $params
 	 *
 	 * @return Circle[]
 	 */
 	public function getCircles(
-		?Circle $circleFilter = null,
-		?Member $memberFilter = null,
-		?IFederatedUser $initiator = null,
-		?RemoteInstance $remoteInstance = null,
-		bool $filterSystemCircles = true
+		?Circle $circleFilter,
+		?Member $memberFilter,
+		?IFederatedUser $initiator,
+		?RemoteInstance $remoteInstance,
+		SimpleDataStore $params
 	): array {
 		$qb = $this->getCircleSelectSql();
 		$qb->leftJoinOwner();
 
-		if ($filterSystemCircles) {
+		if (!$params->gBool('includeSystemCircles')) {
 			$qb->filterCircles(Circle::CFG_SINGLE | Circle::CFG_HIDDEN | Circle::CFG_BACKEND);
 		}
 		if (!is_null($initiator)) {
@@ -181,6 +182,8 @@ class CircleRequest extends CircleRequestBuilder {
 			$qb->limitToRemoteInstance($remoteInstance->getInstance(), false);
 		}
 
+		$qb->chunk($params->gInt('offset'), $params->gInt('limit'));
+
 		return $this->getItemsFromRequest($qb);
 	}
 

lib/Db/CoreRequestBuilder.php

@@ -32,7 +32,7 @@ declare(strict_types=1);
 namespace OCA\Circles\Db;
 
 
-use daita\MySmallPhpTools\Db\Nextcloud\nc21\NC21ExtendedQueryBuilder;
+use daita\MySmallPhpTools\Db\Nextcloud\nc22\NC22ExtendedQueryBuilder;
 use Doctrine\DBAL\Query\QueryBuilder;
 use OC;
 use OCA\Circles\IFederatedModel;
@@ -48,7 +48,7 @@ use OCP\DB\QueryBuilder\ICompositeExpression;
  *
  * @package OCA\Circles\Db
  */
-class CoreRequestBuilder extends NC21ExtendedQueryBuilder {
+class CoreRequestBuilder extends NC22ExtendedQueryBuilder {
 
 
 	const PREFIX_MEMBER = 'member_';

lib/FederatedItems/CircleJoin.php

@@ -32,7 +32,7 @@ declare(strict_types=1);
 namespace OCA\Circles\FederatedItems;
 
 
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Logger;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger;
 use daita\MySmallPhpTools\Traits\TStringTools;
 use Exception;
 use OCA\Circles\Db\MemberRequest;
@@ -72,7 +72,7 @@ class CircleJoin implements
 
 
 	use TStringTools;
-	use TNC21Logger;
+	use TNC22Logger;
 
 
 	/** @var IUserManager */

lib/FederatedItems/MemberAdd.php

@@ -35,7 +35,7 @@ namespace OCA\Circles\FederatedItems;
 use daita\MySmallPhpTools\Exceptions\InvalidItemException;
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\SignatoryException;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Logger;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger;
 use daita\MySmallPhpTools\Traits\TStringTools;
 use Exception;
 use OC\User\NoUserException;
@@ -95,7 +95,7 @@ class MemberAdd implements
 
 
 	use TStringTools;
-	use TNC21Logger;
+	use TNC22Logger;
 
 
 	/** @var IUserManager */

lib/Model/Circle.php

@@ -32,10 +32,10 @@ declare(strict_types=1);
 namespace OCA\Circles\Model;
 
 
-use daita\MySmallPhpTools\Db\Nextcloud\nc21\INC21QueryRow;
+use daita\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow;
 use daita\MySmallPhpTools\Exceptions\InvalidItemException;
 use daita\MySmallPhpTools\IDeserializable;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Deserialize;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use DateTime;
 use JsonSerializable;
@@ -72,11 +72,11 @@ use OCA\Circles\Exceptions\OwnerNotFoundException;
  *
  * @package OCA\Circles\Model
  */
-class Circle extends ManagedModel implements IDeserializable, INC21QueryRow, JsonSerializable {
+class Circle extends ManagedModel implements IDeserializable, INC22QueryRow, JsonSerializable {
 
 
 	use TArrayTools;
-	use TNC21Deserialize;
+	use TNC22Deserialize;
 
 
 	const FLAGS_SHORT = 1;
@@ -642,10 +642,10 @@ class Circle extends ManagedModel implements IDeserializable, INC21QueryRow, Jso
 	 * @param array $data
 	 * @param string $prefix
 	 *
-	 * @return INC21QueryRow
+	 * @return INC22QueryRow
 	 * @throws CircleNotFoundException
 	 */
-	public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow {
+	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
 		if ($this->get($prefix . 'unique_id', $data) === '') {
 			throw new CircleNotFoundException();
 		}

lib/Model/DeprecatedCircle.php

@@ -285,7 +285,7 @@ class DeprecatedCircle extends BaseCircle implements JsonSerializable {
 
 
 	/**
-	 * convert old type to new config (nc21)
+	 * convert old type to new config (nc22)
 	 *
 	 * @param int $type
 	 *

lib/Model/Federated/FederatedShare.php

@@ -32,7 +32,7 @@ declare(strict_types=1);
 namespace OCA\Circles\Model\Federated;
 
 
-use daita\MySmallPhpTools\Db\Nextcloud\nc21\INC21QueryRow;
+use daita\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow;
 use daita\MySmallPhpTools\IDeserializable;
 use daita\MySmallPhpTools\Model\SimpleDataStore;
 use daita\MySmallPhpTools\Traits\TArrayTools;
@@ -45,7 +45,7 @@ use OCA\Circles\IFederatedModel;
  *
  * @package OCA\Circles\Model\Federated
  */
-class FederatedShare implements IFederatedModel, JsonSerializable, INC21QueryRow, IDeserializable {
+class FederatedShare implements IFederatedModel, JsonSerializable, INC22QueryRow, IDeserializable {
 
 
 	use TArrayTools;
@@ -191,9 +191,9 @@ class FederatedShare implements IFederatedModel, JsonSerializable, INC21QueryRow
 	/**
 	 * @param array $data
 	 *
-	 * @return INC21QueryRow
+	 * @return INC22QueryRow
 	 */
-	public function importFromDatabase(array $data): INC21QueryRow {
+	public function importFromDatabase(array $data): INC22QueryRow {
 		$this->setId($this->getInt('id', $data));
 		$this->setItemId($this->get('item_id', $data));
 		$this->setCircleId($this->get('circle_id', $data));

lib/Model/Federated/RemoteInstance.php

@@ -32,8 +32,8 @@ declare(strict_types=1);
 namespace OCA\Circles\Model\Federated;
 
 
-use daita\MySmallPhpTools\Db\Nextcloud\nc21\INC21QueryRow;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Signatory;
+use daita\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Signatory;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use JsonSerializable;
 use OCA\Circles\Exceptions\RemoteUidException;
@@ -44,7 +44,7 @@ use OCA\Circles\Exceptions\RemoteUidException;
  *
  * @package OCA\Circles\Model
  */
-class RemoteInstance extends NC21Signatory implements INC21QueryRow, JsonSerializable {
+class RemoteInstance extends NC22Signatory implements INC22QueryRow, JsonSerializable {
 
 
 	use TArrayTools;
@@ -364,9 +364,9 @@ class RemoteInstance extends NC21Signatory implements INC21QueryRow, JsonSeriali
 	/**
 	 * @param array $data
 	 *
-	 * @return NC21Signatory
+	 * @return NC22Signatory
 	 */
-	public function import(array $data): NC21Signatory {
+	public function import(array $data): NC22Signatory {
 		parent::import($data);
 
 		$this->setTest($this->get('test', $data))
@@ -419,7 +419,7 @@ class RemoteInstance extends NC21Signatory implements INC21QueryRow, JsonSeriali
 	 *
 	 * @return self
 	 */
-	public function importFromDatabase(array $data): INC21QueryRow {
+	public function importFromDatabase(array $data): INC22QueryRow {
 		$this->setDbId($this->getInt('id', $data));
 		$this->import($this->getArray('item', $data));
 		$this->setOrigData($this->getArray('item', $data));

lib/Model/Federated/RemoteWrapper.php

@@ -32,7 +32,7 @@ declare(strict_types=1);
 namespace OCA\Circles\Model\Federated;
 
 
-use daita\MySmallPhpTools\Db\Nextcloud\nc21\INC21QueryRow;
+use daita\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow;
 use daita\MySmallPhpTools\Exceptions\InvalidItemException;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use JsonSerializable;
@@ -43,7 +43,7 @@ use JsonSerializable;
  *
  * @package OCA\Circles\Model\Remote
  */
-class RemoteWrapper implements INC21QueryRow, JsonSerializable {
+class RemoteWrapper implements INC22QueryRow, JsonSerializable {
 
 
 	use TArrayTools;
@@ -239,10 +239,10 @@ class RemoteWrapper implements INC21QueryRow, JsonSerializable {
 	/**
 	 * @param array $data
 	 *
-	 * @return INC21QueryRow
+	 * @return INC22QueryRow
 	 * @throws InvalidItemException
 	 */
-	public function importFromDatabase(array $data): INC21QueryRow {
+	public function importFromDatabase(array $data): INC22QueryRow {
 		$this->setToken($this->get('token', $data));
 		$this->setInstance($this->get('instance', $data));
 		$this->setSeverity($this->getInt('severity', $data, FederatedEvent::SEVERITY_LOW));

lib/Model/FederatedUser.php

@@ -31,10 +31,10 @@ declare(strict_types=1);
 
 namespace OCA\Circles\Model;
 
-use daita\MySmallPhpTools\Db\Nextcloud\nc21\INC21QueryRow;
+use daita\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow;
 use daita\MySmallPhpTools\Exceptions\InvalidItemException;
 use daita\MySmallPhpTools\IDeserializable;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Deserialize;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use JsonSerializable;
 use OCA\Circles\IFederatedUser;
@@ -45,11 +45,11 @@ use OCA\Circles\IFederatedUser;
  *
  * @package OCA\Circles\Model
  */
-class FederatedUser extends ManagedModel implements IFederatedUser, IDeserializable, INC21QueryRow, JsonSerializable {
+class FederatedUser extends ManagedModel implements IFederatedUser, IDeserializable, INC22QueryRow, JsonSerializable {
 
 
 	use TArrayTools;
-	use TNC21Deserialize;
+	use TNC22Deserialize;
 
 
 	/** @var string */
@@ -285,9 +285,9 @@ class FederatedUser extends ManagedModel implements IFederatedUser, IDeserializa
 	 * @param array $data
 	 * @param string $prefix
 	 *
-	 * @return INC21QueryRow
+	 * @return INC22QueryRow
 	 */
-	public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow {
+	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
 		$this->setSingleId($this->get($prefix . 'single_id', $data));
 		$this->setUserId($this->get($prefix . 'user_id', $data));
 		$this->setUserType($this->getInt($prefix . 'user_type', $data));

lib/Model/Member.php

@@ -31,10 +31,10 @@ declare(strict_types=1);
 
 namespace OCA\Circles\Model;
 
-use daita\MySmallPhpTools\Db\Nextcloud\nc21\INC21QueryRow;
+use daita\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow;
 use daita\MySmallPhpTools\Exceptions\InvalidItemException;
 use daita\MySmallPhpTools\IDeserializable;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Deserialize;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use DateTime;
 use JsonSerializable;
@@ -51,11 +51,11 @@ use OCA\Circles\IFederatedUser;
  *
  * @package OCA\Circles\Model
  */
-class Member extends ManagedModel implements IFederatedUser, IDeserializable, INC21QueryRow, JsonSerializable {
+class Member extends ManagedModel implements IFederatedUser, IDeserializable, INC22QueryRow, JsonSerializable {
 
 
 	use TArrayTools;
-	use TNC21Deserialize;
+	use TNC22Deserialize;
 
 
 	const LEVEL_NONE = 0;
@@ -633,10 +633,10 @@ class Member extends ManagedModel implements IFederatedUser, IDeserializable, IN
 	 * @param array $data
 	 * @param string $prefix
 	 *
-	 * @return INC21QueryRow
+	 * @return INC22QueryRow
 	 * @throws MemberNotFoundException
 	 */
-	public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow {
+	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
 		if (!array_key_exists($prefix . 'member_id', $data)) {
 			throw new MemberNotFoundException();
 		}

lib/Model/Membership.php

@@ -31,7 +31,7 @@ declare(strict_types=1);
 
 namespace OCA\Circles\Model;
 
-use daita\MySmallPhpTools\Db\Nextcloud\nc21\INC21QueryRow;
+use daita\MySmallPhpTools\Db\Nextcloud\nc22\INC22QueryRow;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use JsonSerializable;
 
@@ -41,7 +41,7 @@ use JsonSerializable;
  *
  * @package OCA\Circles\Model
  */
-class Membership extends ManagedModel implements INC21QueryRow, JsonSerializable {
+class Membership extends ManagedModel implements INC22QueryRow, JsonSerializable {
 
 
 	use TArrayTools;
@@ -185,9 +185,9 @@ class Membership extends ManagedModel implements INC21QueryRow, JsonSerializable
 	/**
 	 * @param array $data
 	 *
-	 * @return INC21QueryRow
+	 * @return INC22QueryRow
 	 */
-	public function importFromDatabase(array $data): INC21QueryRow {
+	public function importFromDatabase(array $data): INC22QueryRow {
 		$this->setId($this->get('id', $data));
 		$this->setCircleId($this->get('circle_id', $data));
 		$this->setMemberId($this->get('member_id', $data));

lib/Search/GlobalScaleUsers.php

@@ -28,9 +28,9 @@ namespace OCA\Circles\Search;
 
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\RequestResultNotJsonException;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Request;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
 use daita\MySmallPhpTools\Model\Request;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Request;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use OCA\Circles\Exceptions\GSStatusException;
 use OCA\Circles\ISearch;
@@ -48,7 +48,7 @@ use OCA\Circles\Service\MiscService;
 class GlobalScaleUsers implements ISearch {
 
 
-	use TNC21Request;
+	use TNC22Request;
 	use TArrayTools;
 
 
@@ -82,7 +82,7 @@ class GlobalScaleUsers implements ISearch {
 			return [];
 		}
 
-		$request = new NC21Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
+		$request = new NC22Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
 		$this->configService->configureRequest($request);
 		$request->basedOnUrl($lookup);
 		$request->addParam('search', $search);

lib/Service/CircleService.php

@@ -261,7 +261,7 @@ class CircleService {
 	/**
 	 * @param Circle|null $circleFilter
 	 * @param Member|null $memberFilter
-	 * @param bool $filterSystemCircles
+	 * @param SimpleDataStore|null $params
 	 *
 	 * @return Circle[]
 	 * @throws InitiatorNotFoundException
@@ -269,16 +269,27 @@ class CircleService {
 	public function getCircles(
 		?Circle $circleFilter = null,
 		?Member $memberFilter = null,
-		bool $filterSystemCircles = true
+		?SimpleDataStore $params = null
 	): array {
 		$this->federatedUserService->mustHaveCurrentUser();
 
+		if ($params === null) {
+			$params = new SimpleDataStore();
+		}
+		$params->default(
+			[
+				'limit'                => -1,
+				'offset'               => 0,
+				'includeSystemCircles' => false
+			]
+		);
+
 		return $this->circleRequest->getCircles(
 			$circleFilter,
 			$memberFilter,
 			$this->federatedUserService->getCurrentUser(),
 			$this->federatedUserService->getRemoteInstance(),
-			$filterSystemCircles
+			$params
 		);
 	}
 

lib/Service/ConfigService.php

@@ -26,7 +26,7 @@
 
 namespace OCA\Circles\Service;
 
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Request;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use daita\MySmallPhpTools\Traits\TStringTools;
 use OCA\Circles\AppInfo\Application;
@@ -410,11 +410,11 @@ class ConfigService {
 
 
 	/**
-	 * @param NC21Request $request
+	 * @param NC22Request $request
 	 * @param string $routeName
 	 * @param array $args
 	 */
-	public function configureRequest(NC21Request $request, string $routeName = '', array $args = []): void {
+	public function configureRequest(NC22Request $request, string $routeName = '', array $args = []): void {
 		$this->configureRequestAddress($request, $routeName, $args);
 
 		if ($this->getForcedNcBase() === '') {
@@ -434,12 +434,12 @@ class ConfigService {
 	 * - can also be overwritten in config/config.php: 'circles.force_nc_base'
 	 * - perfect for loopback request.
 	 *
-	 * @param NC21Request $request
+	 * @param NC22Request $request
 	 * @param string $routeName
 	 * @param array $args
 	 */
 	private function configureRequestAddress(
-		NC21Request $request,
+		NC22Request $request,
 		string $routeName,
 		array $args = []
 	): void {

lib/Service/FederatedEventService.php

@@ -31,11 +31,11 @@ declare(strict_types=1);
 namespace OCA\Circles\Service;
 
 
-use daita\MySmallPhpTools\ActivityPub\Nextcloud\nc21\NC21Signature;
+use daita\MySmallPhpTools\ActivityPub\Nextcloud\nc22\NC22Signature;
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Request;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
 use daita\MySmallPhpTools\Model\Request;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Request;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request;
 use daita\MySmallPhpTools\Traits\TStringTools;
 use OC;
 use OCA\Circles\Db\MemberRequest;
@@ -83,10 +83,10 @@ use ReflectionException;
  *
  * @package OCA\Circles\Service
  */
-class FederatedEventService extends NC21Signature {
+class FederatedEventService extends NC22Signature {
 
 
-	use TNC21Request;
+	use TNC22Request;
 	use TStringTools;
 
 
@@ -394,7 +394,7 @@ class FederatedEventService extends NC21Signature {
 			$this->remoteWrapperRequest->create($wrapper);
 		}
 
-		$request = new NC21Request('', Request::TYPE_POST);
+		$request = new NC22Request('', Request::TYPE_POST);
 		$this->configService->configureRequest(
 			$request, 'circles.RemoteWrapper.asyncBroadcast', ['token' => $wrapper->getToken()]
 		);

lib/Service/FederatedShareService.php

@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\Circles\Service;
 
 
-use daita\MySmallPhpTools\ActivityPub\Nextcloud\nc21\NC21Signature;
+use daita\MySmallPhpTools\ActivityPub\Nextcloud\nc22\NC22Signature;
 use daita\MySmallPhpTools\Exceptions\InvalidItemException;
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\SignatoryException;
@@ -57,7 +57,7 @@ use OCA\Circles\Model\Federated\FederatedShare;
  *
  * @package OCA\Circles\Service
  */
-class FederatedShareService extends NC21Signature {
+class FederatedShareService extends NC22Signature {
 
 
 	/** @var FederatedEventService */

lib/Service/FederatedUserService.php

@@ -35,7 +35,7 @@ namespace OCA\Circles\Service;
 use daita\MySmallPhpTools\Exceptions\InvalidItemException;
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\SignatoryException;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Logger;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use daita\MySmallPhpTools\Traits\TStringTools;
 use Exception;
@@ -77,7 +77,7 @@ class FederatedUserService {
 
 	use TArrayTools;
 	use TStringTools;
-	use TNC21Logger;
+	use TNC22Logger;
 
 
 	/** @var IUserSession */

lib/Service/GSUpstreamService.php

@@ -35,10 +35,10 @@ use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\RequestResultNotJsonException;
 use daita\MySmallPhpTools\Exceptions\RequestResultSizeException;
 use daita\MySmallPhpTools\Exceptions\RequestServerException;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Request;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
 use daita\MySmallPhpTools\Model\Request;
 use daita\MySmallPhpTools\Model\SimpleDataStore;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Request;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request;
 use Exception;
 use OCA\Circles\Db\DeprecatedCirclesRequest;
 use OCA\Circles\Db\RemoteWrapperRequest;
@@ -62,7 +62,7 @@ use OCP\IURLGenerator;
 class GSUpstreamService {
 
 
-	use TNC21Request;
+	use TNC22Request;
 
 
 	/** @var string */
@@ -191,11 +191,11 @@ class GSUpstreamService {
 		$this->signEvent($event);
 
 		if ($this->configService->isLocalInstance($instance)) {
-			$request = new NC21Request('', Request::TYPE_POST);
+			$request = new NC22Request('', Request::TYPE_POST);
 			$this->configService->configureRequest($request, 'circles.RemoteWrapper.broadcast');
 		} else {
 			$path = $this->urlGenerator->linkToRoute('circles.RemoteWrapper.broadcast');
-			$request = new NC21Request($path, Request::TYPE_POST);
+			$request = new NC22Request($path, Request::TYPE_POST);
 			$this->configService->configureRequest($request);
 			$request->setInstance($instance);
 		}
@@ -224,7 +224,7 @@ class GSUpstreamService {
 		$owner = $circle->getOwner();
 		$path = $this->urlGenerator->linkToRoute('circles.RemoteWrapper.event');
 
-		$request = new NC21Request($path, Request::TYPE_POST);
+		$request = new NC22Request($path, Request::TYPE_POST);
 		$this->configService->configureRequest($request);
 		$request->basedOnUrl($owner->getInstance());
 
@@ -406,7 +406,7 @@ class GSUpstreamService {
 		$this->signEvent($event);
 
 		$path = $this->urlGenerator->linkToRoute('circles.RemoteWrapper.status');
-		$request = new NC21Request($path, Request::TYPE_POST);
+		$request = new NC22Request($path, Request::TYPE_POST);
 		$this->configService->configureRequest($request);
 		$request->setDataSerialize($event);
 

lib/Service/GlobalScaleService.php

@@ -31,9 +31,9 @@ namespace OCA\Circles\Service;
 
 
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Request;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
 use daita\MySmallPhpTools\Model\Request;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Request;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request;
 use daita\MySmallPhpTools\Traits\TStringTools;
 use OC\Security\IdentityProof\Signer;
 use OCA\Circles\Db\RemoteWrapperRequest;
@@ -51,7 +51,7 @@ use OCP\IUserSession;
 class GlobalScaleService {
 
 
-	use TNC21Request;
+	use TNC22Request;
 	use TStringTools;
 
 
@@ -114,7 +114,7 @@ class GlobalScaleService {
 	public function getGlobalScaleInstances(): array {
 		try {
 			$lookup = $this->configService->getGSStatus(ConfigService::GS_LOOKUP);
-			$request = new NC21Request(ConfigService::GS_LOOKUP_INSTANCES, Request::TYPE_POST);
+			$request = new NC22Request(ConfigService::GS_LOOKUP_INSTANCES, Request::TYPE_POST);
 			$this->configService->configureRequest($request);
 			$request->basedOnUrl($lookup);
 			$request->addData('authKey', $this->configService->getGSStatus(ConfigService::GS_KEY));
@@ -149,7 +149,7 @@ class GlobalScaleService {
 //			$wrapper = $this->remoteWrapperRequest->create($wrapper);
 //		}
 //
-//		$request = new NC21Request('', Request::TYPE_POST);
+//		$request = new NC22Request('', Request::TYPE_POST);
 //		$this->configService->configureRequest(
 //			$request, 'circles.RemoteWrapper.asyncBroadcast', ['token' => $wrapper->getToken()]
 //		);

lib/Service/MemberService.php

@@ -33,7 +33,7 @@ namespace OCA\Circles\Service;
 
 
 use daita\MySmallPhpTools\Model\SimpleDataStore;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Logger;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use daita\MySmallPhpTools\Traits\TStringTools;
 use OCA\Circles\Db\CircleRequest;
@@ -68,7 +68,7 @@ class MemberService {
 
 	use TArrayTools;
 	use TStringTools;
-	use TNC21Logger;
+	use TNC22Logger;
 
 
 	/** @var CircleRequest */

lib/Service/MembersService.php

@@ -29,9 +29,9 @@ namespace OCA\Circles\Service;
 
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\RequestResultNotJsonException;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Request;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
 use daita\MySmallPhpTools\Model\Request;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Request;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request;
 use daita\MySmallPhpTools\Traits\TArrayTools;
 use Exception;
 use OC;
@@ -68,7 +68,7 @@ use OCP\IUserManager;
 class MembersService {
 
 
-	use TNC21Request;
+	use TNC22Request;
 	use TArrayTools;
 
 
@@ -729,7 +729,7 @@ class MembersService {
 	private function getGlobalScaleUserDisplayName(string $ident): string {
 		$lookup = $this->configService->getGSStatus(ConfigService::GS_LOOKUP);
 
-		$request = new NC21Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
+		$request = new NC22Request(ConfigService::GS_LOOKUP_USERS, Request::TYPE_GET);
 		$this->configService->configureRequest($request);
 		$request->basedOnUrl($lookup);
 		$request->addParam('search', $ident);

lib/Service/MembershipService.php

@@ -32,7 +32,7 @@ declare(strict_types=1);
 namespace OCA\Circles\Service;
 
 
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Logger;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger;
 use OCA\Circles\Db\MemberRequest;
 use OCA\Circles\Db\MembershipRequest;
 use OCA\Circles\IFederatedUser;
@@ -47,7 +47,7 @@ use OCA\Circles\Model\Membership;
  */
 class MembershipService {
 
-	use TNC21Logger;
+	use TNC22Logger;
 
 
 	/** @var MembershipRequest */

lib/Service/RemoteDownstreamService.php

@@ -32,7 +32,7 @@ declare(strict_types=1);
 namespace OCA\Circles\Service;
 
 
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Logger;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger;
 use daita\MySmallPhpTools\Traits\TAsync;
 use Exception;
 use OCA\Circles\Db\CircleRequest;
@@ -55,7 +55,7 @@ use OCA\Circles\Model\Federated\FederatedEvent;
 class RemoteDownstreamService {
 
 
-	use TNC21Logger;
+	use TNC22Logger;
 	use TAsync;
 
 

lib/Service/RemoteService.php

@@ -31,7 +31,7 @@ declare(strict_types=1);
 namespace OCA\Circles\Service;
 
 
-use daita\MySmallPhpTools\ActivityPub\Nextcloud\nc21\NC21Signature;
+use daita\MySmallPhpTools\ActivityPub\Nextcloud\nc22\NC22Signature;
 use daita\MySmallPhpTools\Exceptions\InvalidItemException;
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\SignatoryException;
@@ -60,7 +60,7 @@ use OCA\Circles\Model\Member;
  *
  * @package OCA\Circles\Service
  */
-class RemoteService extends NC21Signature {
+class RemoteService extends NC22Signature {
 
 
 	/** @var CircleRequest */

lib/Service/RemoteStreamService.php

@@ -31,20 +31,20 @@ declare(strict_types=1);
 namespace OCA\Circles\Service;
 
 
-use daita\MySmallPhpTools\ActivityPub\Nextcloud\nc21\NC21Signature;
+use daita\MySmallPhpTools\ActivityPub\Nextcloud\nc22\NC22Signature;
 use daita\MySmallPhpTools\Exceptions\RequestNetworkException;
 use daita\MySmallPhpTools\Exceptions\SignatoryException;
 use daita\MySmallPhpTools\Exceptions\SignatureException;
 use daita\MySmallPhpTools\Exceptions\WellKnownLinkNotFoundException;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Request;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21RequestResult;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Signatory;
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21SignedRequest;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22RequestResult;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Signatory;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22SignedRequest;
 use daita\MySmallPhpTools\Model\Request;
 use daita\MySmallPhpTools\Model\SimpleDataStore;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Deserialize;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21LocalSignatory;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21WellKnown;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22LocalSignatory;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22WellKnown;
 use daita\MySmallPhpTools\Traits\TStringTools;
 use JsonSerializable;
 use OCA\Circles\AppInfo\Application;
@@ -69,13 +69,13 @@ use ReflectionException;
  *
  * @package OCA\Circles\Service
  */
-class RemoteStreamService extends NC21Signature {
+class RemoteStreamService extends NC22Signature {
 
 
-	use TNC21Deserialize;
-	use TNC21LocalSignatory;
+	use TNC22Deserialize;
+	use TNC22LocalSignatory;
 	use TStringTools;
-	use TNC21WellKnown;
+	use TNC22WellKnown;
 
 
 	const UPDATE_DATA = 'data';
@@ -236,7 +236,7 @@ class RemoteStreamService extends NC21Signature {
 	 * @param JsonSerializable|null $object
 	 * @param array $params
 	 *
-	 * @return NC21SignedRequest
+	 * @return NC22SignedRequest
 	 * @throws RemoteNotFoundException
 	 * @throws RemoteResourceNotFoundException
 	 * @throws UnknownRemoteException
@@ -248,9 +248,9 @@ class RemoteStreamService extends NC21Signature {
 		int $type = Request::TYPE_GET,
 		?JsonSerializable $object = null,
 		array $params = []
-	): NC21SignedRequest {
+	): NC22SignedRequest {
 
-		$request = new NC21Request('', $type);
+		$request = new NC22Request('', $type);
 		if ($this->configService->isLocalInstance($instance)) {
 			$this->configService->configureRequest($request, 'circles.Remote.' . $item, $params);
 		} else {
@@ -270,7 +270,7 @@ class RemoteStreamService extends NC21Signature {
 
 		try {
 			$app = $this->getAppSignatory();
-//		$app->setAlgorithm(NC21Signatory::SHA512);
+//		$app->setAlgorithm(NC22Signatory::SHA512);
 			$signedRequest = $this->signOutgoingRequest($request, $app);
 			$this->doRequest($signedRequest->getOutgoingRequest(), false);
 		} catch (RequestNetworkException | SignatoryException $e) {
@@ -358,7 +358,7 @@ class RemoteStreamService extends NC21Signature {
 	public function retrieveSignatory(string $keyId, bool $refresh = true): RemoteInstance {
 		if (!$refresh) {
 			try {
-				return $this->remoteRequest->getFromHref(NC21Signatory::removeFragment($keyId));
+				return $this->remoteRequest->getFromHref(NC22Signatory::removeFragment($keyId));
 			} catch (RemoteNotFoundException $e) {
 				throw new SignatoryException();
 			}
@@ -367,7 +367,7 @@ class RemoteStreamService extends NC21Signature {
 		$remoteInstance = new RemoteInstance($keyId);
 		$confirm = $this->uuid();
 
-		$request = new NC21Request();
+		$request = new NC22Request();
 		$this->configService->configureRequest($request);
 
 		$this->downloadSignatory($remoteInstance, $keyId, ['auth' => $confirm], $request);
@@ -444,11 +444,11 @@ class RemoteStreamService extends NC21Signature {
 
 
 	/**
-	 * @param NC21RequestResult $result
+	 * @param NC22RequestResult $result
 	 *
 	 * @return FederatedItemException
 	 */
-	private function getFederatedItemExceptionFromResult(NC21RequestResult $result): FederatedItemException {
+	private function getFederatedItemExceptionFromResult(NC22RequestResult $result): FederatedItemException {
 		$data = $result->getAsArray();
 
 		$message = $this->get('message', $data);

lib/Service/RemoteUpstreamService.php

@@ -34,7 +34,7 @@ namespace OCA\Circles\Service;
 
 use daita\MySmallPhpTools\Model\Request;
 use daita\MySmallPhpTools\Model\SimpleDataStore;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Request;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request;
 use Exception;
 use OCA\Circles\Db\RemoteWrapperRequest;
 use OCA\Circles\Exceptions\FederatedItemException;
@@ -59,7 +59,7 @@ use OCP\IL10N;
 class RemoteUpstreamService {
 
 
-	use TNC21Request;
+	use TNC22Request;
 
 
 	/** @var IL10N */
@@ -256,7 +256,7 @@ class RemoteUpstreamService {
 //		$this->signEvent($event);
 //
 //		$path = $this->urlGenerator->linkToRoute('circles.RemoteWrapper.status');
-//		$request = new NC21Request($path, Request::TYPE_POST);
+//		$request = new NC22Request($path, Request::TYPE_POST);
 //		$this->configService->configureRequest($request);
 //		$request->setDataSerialize($event);
 //

lib/Service/SharingFrameService.php

@@ -27,9 +27,9 @@
 namespace OCA\Circles\Service;
 
 
-use daita\MySmallPhpTools\Model\Nextcloud\nc21\NC21Request;
+use daita\MySmallPhpTools\Model\Nextcloud\nc22\NC22Request;
 use daita\MySmallPhpTools\Model\Request;
-use daita\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Request;
+use daita\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Request;
 use Exception;
 use OCA\Circles\Api\v1\Circles;
 use OCA\Circles\Db\DeprecatedCirclesRequest;
@@ -53,7 +53,7 @@ use OCP\IUserSession;
 class SharingFrameService {
 
 
-	use TNC21Request;
+	use TNC22Request;
 
 
 	/** @var string */
@@ -299,7 +299,7 @@ class SharingFrameService {
 	 * @throws Exception
 	 */
 	public function initiateShare(string $circleUniqueId, string $frameUniqueId) {
-		$request = new NC21Request('', Request::TYPE_POST);
+		$request = new NC22Request('', Request::TYPE_POST);
 		$this->configService->configureRequest($request, 'circles.Shares.initShareDelivery');
 		$request->addParam('circleId', $circleUniqueId);
 		$request->addParam('frameId', $frameUniqueId);