Merge pull request #1767 from nextcloud/releases/0.6.0v0.6.0

0.6.0

71 files changed, 217 insertions, 220 deletions

diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index 762865ab..bf3aaa5c 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -40,9 +40,6 @@ jobs:
       matrix:
         php-versions: ['8.0', '8.1']
         server-versions: ['master']
-        include:
-          - php-versions: '7.4'
-            server-versions: 'stable25'
 
     services:
       mysql:
diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml
index 1bb33f3b..bd53ca59 100644
--- a/.github/workflows/psalm-matrix.yml
+++ b/.github/workflows/psalm-matrix.yml
@@ -24,7 +24,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        ocp-version: [ 'dev-master', 'dev-stable25' ]
+        ocp-version: [ 'dev-master', 'dev-stable27' ]
 
     name: Nextcloud ${{ matrix.ocp-version }}
     steps:
diff --git a/Makefile b/Makefile
index 142733d8..5cdb2ec0 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ package_name=$(app_name)
 cert_dir=$(HOME)/.nextcloud/certificates
 github_account=nextcloud
 branch=master
-version+=0.6.0-rc3
+version+=0.6.0
 
 
 all: dev-setup lint build-js-production composer
diff --git a/appinfo/info.xml b/appinfo/info.xml
index bcfaaa9e..ea95835c 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -18,7 +18,7 @@
 
 **🕸 Open standards:** We use the established ActivityPub standard!
 	]]></description>
-	<version>0.6.0-rc3</version>
+	<version>0.6.0</version>
 	<licence>agpl</licence>
 	<author mail="maxence@artificial-owl.com" homepage="https://artificial-owl.com/">Maxence Lange</author>
 	<author mail="jus@bitgrid.net">Julius Härtl</author>
@@ -35,7 +35,7 @@
 		<database>pgsql</database>
 		<database>sqlite</database>
 		<database>mysql</database>
-		<nextcloud min-version="25" max-version="27"/>
+		<nextcloud min-version="27" max-version="27"/>
 	</dependencies>
 
 	<background-jobs>
diff --git a/lib/AP.php b/lib/AP.php
index 226a63f7..bba34b9b 100644
--- a/lib/AP.php
+++ b/lib/AP.php
@@ -31,8 +31,6 @@ declare(strict_types=1);
 
 namespace OCA\Social;
 
-use OCA\Social\Model\ActivityPub\OrderedCollection;
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\Exceptions\ItemUnknownException;
 use OCA\Social\Exceptions\RedundancyLimitException;
 use OCA\Social\Exceptions\SocialAppConfigException;
@@ -45,11 +43,11 @@ use OCA\Social\Interfaces\Activity\RejectInterface;
 use OCA\Social\Interfaces\Activity\RemoveInterface;
 use OCA\Social\Interfaces\Activity\UndoInterface;
 use OCA\Social\Interfaces\Activity\UpdateInterface;
-use OCA\Social\Interfaces\Actor\PersonInterface;
-use OCA\Social\Interfaces\Actor\ServiceInterface;
+use OCA\Social\Interfaces\Actor\ApplicationInterface;
 use OCA\Social\Interfaces\Actor\GroupInterface;
 use OCA\Social\Interfaces\Actor\OrganizationInterface;
-use OCA\Social\Interfaces\Actor\ApplicationInterface;
+use OCA\Social\Interfaces\Actor\PersonInterface;
+use OCA\Social\Interfaces\Actor\ServiceInterface;
 use OCA\Social\Interfaces\IActivityPubInterface;
 use OCA\Social\Interfaces\Internal\SocialAppNotificationInterface;
 use OCA\Social\Interfaces\Object\AnnounceInterface;
@@ -68,11 +66,11 @@ use OCA\Social\Model\ActivityPub\Activity\Reject;
 use OCA\Social\Model\ActivityPub\Activity\Remove;
 use OCA\Social\Model\ActivityPub\Activity\Undo;
 use OCA\Social\Model\ActivityPub\Activity\Update;
-use OCA\Social\Model\ActivityPub\Actor\Person;
-use OCA\Social\Model\ActivityPub\Actor\Service;
+use OCA\Social\Model\ActivityPub\Actor\Application;
 use OCA\Social\Model\ActivityPub\Actor\Group;
 use OCA\Social\Model\ActivityPub\Actor\Organization;
-use OCA\Social\Model\ActivityPub\Actor\Application;
+use OCA\Social\Model\ActivityPub\Actor\Person;
+use OCA\Social\Model\ActivityPub\Actor\Service;
 use OCA\Social\Model\ActivityPub\Internal\SocialAppNotification;
 use OCA\Social\Model\ActivityPub\Object\Announce;
 use OCA\Social\Model\ActivityPub\Object\Document;
@@ -81,8 +79,10 @@ use OCA\Social\Model\ActivityPub\Object\Image;
 use OCA\Social\Model\ActivityPub\Object\Like;
 use OCA\Social\Model\ActivityPub\Object\Note;
 use OCA\Social\Model\ActivityPub\Object\Tombstone;
+use OCA\Social\Model\ActivityPub\OrderedCollection;
 use OCA\Social\Model\ActivityPub\Stream;
 use OCA\Social\Service\ConfigService;
+use OCA\Social\Tools\Traits\TArrayTools;
 use OCP\AppFramework\QueryException;
 use OCP\Server;
 use Psr\Log\LoggerInterface;
diff --git a/lib/Command/CacheRefresh.php b/lib/Command/CacheRefresh.php
index 2629a566..d446c549 100644
--- a/lib/Command/CacheRefresh.php
+++ b/lib/Command/CacheRefresh.php
@@ -70,8 +70,8 @@ class CacheRefresh extends Base {
 	 * @throws Exception
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output): int {
-//		$result = $this->accountService->blindKeyRotation();
-//		$output->writeLn($result . ' key pairs refreshed');
+		//		$result = $this->accountService->blindKeyRotation();
+		//		$output->writeLn($result . ' key pairs refreshed');
 
 		$result = $this->accountService->manageDeletedActors();
 		$output->writeLn($result . ' local accounts deleted');
diff --git a/lib/Command/CheckInstall.php b/lib/Command/CheckInstall.php
index d3396455..943a53b5 100644
--- a/lib/Command/CheckInstall.php
+++ b/lib/Command/CheckInstall.php
@@ -102,9 +102,9 @@ class CheckInstall extends Base {
 			return 0;
 		}
 
-//		if ($this->checkPushApp($input, $output)) {
-//			return;
-//		}
+		//		if ($this->checkPushApp($input, $output)) {
+		//			return;
+		//		}
 
 		$result = $this->checkService->checkInstallationStatus();
 
@@ -137,9 +137,9 @@ class CheckInstall extends Base {
 		}
 
 		// push was not implemented on 18
-//		$wrapper = $this->pushService->testOnAccount($userId);
+		//		$wrapper = $this->pushService->testOnAccount($userId);
 
-//		$output->writeln(json_encode($wrapper, JSON_PRETTY_PRINT));
+		//		$output->writeln(json_encode($wrapper, JSON_PRETTY_PRINT));
 
 		return true;
 	}
diff --git a/lib/Controller/ActivityPubController.php b/lib/Controller/ActivityPubController.php
index 498a6261..64ba4112 100644
--- a/lib/Controller/ActivityPubController.php
+++ b/lib/Controller/ActivityPubController.php
@@ -278,9 +278,9 @@ class ActivityPubController extends Controller {
 	 * @return Response
 	 */
 	public function outbox(string $username): Response {
-//		if (!$this->checkSourceActivityStreams()) {
-//			return $this->socialPubController->outbox($username);
-//		}
+		//		if (!$this->checkSourceActivityStreams()) {
+		//			return $this->socialPubController->outbox($username);
+		//		}
 
 		try {
 			$actor = $this->cacheActorService->getFromLocalAccount($username);
diff --git a/lib/Controller/ConfigController.php b/lib/Controller/ConfigController.php
index 82110048..141992bd 100644
--- a/lib/Controller/ConfigController.php
+++ b/lib/Controller/ConfigController.php
@@ -26,13 +26,13 @@ declare(strict_types=1);
 
 namespace OCA\Social\Controller;
 
-use OCA\Social\Tools\Model\SimpleDataStore;
-use OCA\Social\Tools\Traits\TNCDataResponse;
 use Exception;
 use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\MiscService;
 use OCA\Social\Service\TestService;
+use OCA\Social\Tools\Model\SimpleDataStore;
+use OCA\Social\Tools\Traits\TNCDataResponse;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php
index d0581885..863c4684 100644
--- a/lib/Controller/LocalController.php
+++ b/lib/Controller/LocalController.php
@@ -31,8 +31,6 @@ declare(strict_types=1);
 
 namespace OCA\Social\Controller;
 
-use OCA\Social\Tools\Traits\TNCDataResponse;
-use OCA\Social\Tools\Traits\TArrayTools;
 use Exception;
 use OCA\Social\AppInfo\Application;
 use OCA\Social\Exceptions\AccountDoesNotExistException;
@@ -53,6 +51,8 @@ use OCA\Social\Service\MiscService;
 use OCA\Social\Service\PostService;
 use OCA\Social\Service\SearchService;
 use OCA\Social\Service\StreamService;
+use OCA\Social\Tools\Traits\TArrayTools;
+use OCA\Social\Tools\Traits\TNCDataResponse;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
diff --git a/lib/Controller/NavigationController.php b/lib/Controller/NavigationController.php
index 9323da47..0684a61a 100644
--- a/lib/Controller/NavigationController.php
+++ b/lib/Controller/NavigationController.php
@@ -31,10 +31,7 @@ declare(strict_types=1);
 
 namespace OCA\Social\Controller;
 
-use OCA\Social\Tools\Traits\TNCDataResponse;
-use OCA\Social\Tools\Traits\TArrayTools;
 use Exception;
-use OCP\AppFramework\Http;
 use OC\User\NoUserException;
 use OCA\Social\AppInfo\Application;
 use OCA\Social\Exceptions\AccountAlreadyExistsException;
@@ -45,16 +42,19 @@ use OCA\Social\Service\CheckService;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\DocumentService;
 use OCA\Social\Service\MiscService;
+use OCA\Social\Tools\Traits\TArrayTools;
+use OCA\Social\Tools\Traits\TNCDataResponse;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\FileDisplayResponse;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
+use OCP\IGroupManager;
 use OCP\IInitialStateService;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IURLGenerator;
-use OCP\IGroupManager;
 use OCP\Server;
 
 /**
diff --git a/lib/Controller/OStatusController.php b/lib/Controller/OStatusController.php
index c57cc8b3..195c6f72 100644
--- a/lib/Controller/OStatusController.php
+++ b/lib/Controller/OStatusController.php
@@ -31,9 +31,6 @@ declare(strict_types=1);
 
 namespace OCA\Social\Controller;
 
-use OCA\Social\Tools\Exceptions\ArrayNotFoundException;
-use OCA\Social\Tools\Traits\TNCDataResponse;
-use OCA\Social\Tools\Traits\TArrayTools;
 use Exception;
 use OCA\Social\AppInfo\Application;
 use OCA\Social\Exceptions\InvalidResourceException;
@@ -42,6 +39,9 @@ use OCA\Social\Service\AccountService;
 use OCA\Social\Service\CacheActorService;
 use OCA\Social\Service\CurlService;
 use OCA\Social\Service\MiscService;
+use OCA\Social\Tools\Exceptions\ArrayNotFoundException;
+use OCA\Social\Tools\Traits\TArrayTools;
+use OCA\Social\Tools\Traits\TNCDataResponse;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\TemplateResponse;
diff --git a/lib/Controller/QueueController.php b/lib/Controller/QueueController.php
index 3cf05d1b..82731f58 100644
--- a/lib/Controller/QueueController.php
+++ b/lib/Controller/QueueController.php
@@ -30,13 +30,13 @@ declare(strict_types=1);
 
 namespace OCA\Social\Controller;
 
-use OCA\Social\Tools\Traits\TAsync;
 use OCA\Social\AppInfo\Application;
 use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Model\RequestQueue;
 use OCA\Social\Service\ActivityService;
 use OCA\Social\Service\MiscService;
 use OCA\Social\Service\RequestQueueService;
+use OCA\Social\Tools\Traits\TAsync;
 use OCP\AppFramework\Controller;
 use OCP\IRequest;
 
diff --git a/lib/Controller/SocialPubController.php b/lib/Controller/SocialPubController.php
index 24634f8a..07278909 100644
--- a/lib/Controller/SocialPubController.php
+++ b/lib/Controller/SocialPubController.php
@@ -31,7 +31,6 @@ declare(strict_types=1);
 
 namespace OCA\Social\Controller;
 
-use OCA\Social\Tools\Traits\TNCDataResponse;
 use Exception;
 use OCA\Social\AppInfo\Application;
 use OCA\Social\Exceptions\AccountDoesNotExistException;
@@ -43,6 +42,7 @@ use OCA\Social\Service\AccountService;
 use OCA\Social\Service\CacheActorService;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\StreamService;
+use OCA\Social\Tools\Traits\TNCDataResponse;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Response;
diff --git a/lib/Cron/Cache.php b/lib/Cron/Cache.php
index 9a93565c..3f64043f 100644
--- a/lib/Cron/Cache.php
+++ b/lib/Cron/Cache.php
@@ -32,13 +32,13 @@ declare(strict_types=1);
 namespace OCA\Social\Cron;
 
 use Exception;
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\BackgroundJob\TimedJob;
 use OCA\Social\Service\AccountService;
 use OCA\Social\Service\CacheActorService;
 use OCA\Social\Service\DocumentService;
 use OCA\Social\Service\HashtagService;
 use OCP\AppFramework\QueryException;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\TimedJob;
 
 /**
  * Class Cache
@@ -67,7 +67,7 @@ class Cache extends TimedJob {
 	 */