Merge pull request #1767 from nextcloud/releases/0.6.0

0.6.0

.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:

.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:

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

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>

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;

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;

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;

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;
 
 /**

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;

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;
 

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;

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

lib/Cron/Queue.php

@@ -31,13 +31,13 @@ declare(strict_types=1);
 
 namespace OCA\Social\Cron;
 
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\BackgroundJob\TimedJob;
 use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Service\ActivityService;
 use OCA\Social\Service\RequestQueueService;
 use OCA\Social\Service\StreamQueueService;
 use OCP\AppFramework\QueryException;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\TimedJob;
 
 /**
  * Class Queue

lib/Dashboard/SocialWidget.php

@@ -23,10 +23,10 @@
 
 namespace OCA\Social\Dashboard;
 
-use OCP\IURLGenerator;
+use OCA\Social\AppInfo\Application;
 use OCP\Dashboard\IWidget;
 use OCP\IL10N;
-use OCA\Social\AppInfo\Application;
+use OCP\IURLGenerator;
 
 class SocialWidget implements IWidget {
 	private IL10N $l10n;

lib/Db/ActorsRequestBuilder.php

@@ -30,9 +30,9 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Model\ActivityPub\Actor\Person;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 class ActorsRequestBuilder extends CoreRequestBuilder {
 	use TArrayTools;

lib/Db/CacheDocumentsRequestBuilder.php

@@ -30,8 +30,8 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\Model\ActivityPub\Object\Document;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 class CacheDocumentsRequestBuilder extends CoreRequestBuilder {
 	use TArrayTools;

lib/Db/ClientRequest.php

@@ -31,12 +31,12 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use DateTime;
 use Exception;
 use OCA\Social\Exceptions\ClientNotFoundException;
 use OCA\Social\Model\Client\SocialClient;
 use OCA\Social\Service\ClientService;
+use OCA\Social\Tools\Traits\TArrayTools;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 
 /**

lib/Db/ClientRequestBuilder.php

@@ -31,11 +31,11 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Exceptions\RowNotFoundException;
-use OCA\Social\Tools\Traits\TArrayTools;
 use Exception;
 use OCA\Social\Exceptions\ClientNotFoundException;
 use OCA\Social\Model\Client\SocialClient;
+use OCA\Social\Tools\Exceptions\RowNotFoundException;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class ClientRequestBuilder

lib/Db/FollowsRequestBuilder.php

@@ -31,11 +31,11 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Exceptions\RowNotFoundException;
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\Exceptions\FollowNotFoundException;
 use OCA\Social\Exceptions\InvalidResourceException;
 use OCA\Social\Model\ActivityPub\Object\Follow;
+use OCA\Social\Tools\Exceptions\RowNotFoundException;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class FollowsRequestBuilder

lib/Db/HashtagsRequest.php

@@ -31,8 +31,8 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\Exceptions\HashtagDoesNotExistException;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class HashtagsRequest

lib/Db/InstancesRequest.php

@@ -31,10 +31,10 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\Exceptions\InstanceDoesNotExistException;
 use OCA\Social\Model\ActivityPub\ACore;
 use OCA\Social\Model\Instance;
+use OCA\Social\Tools\Traits\TArrayTools;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 
 /**

lib/Db/RequestQueueRequestBuilder.php

@@ -30,8 +30,8 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\Model\RequestQueue;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 class RequestQueueRequestBuilder extends CoreRequestBuilder {
 	use TArrayTools;

lib/Db/SocialCoreQueryBuilder.php

@@ -31,9 +31,9 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Db\ExtendedQueryBuilder;
 use OC\SystemConfig;
 use OCA\Social\Model\ActivityPub\Actor\Person;
+use OCA\Social\Tools\Db\ExtendedQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IURLGenerator;
 use Psr\Log\LoggerInterface;

lib/Db/SocialLimitsQueryBuilder.php

@@ -31,12 +31,12 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Exceptions\DateTimeException;
 use DateInterval;
 use DateTime;
 use Exception;
 use OCA\Social\Model\ActivityPub\ACore;
 use OCA\Social\Model\Client\Options\ProbeOptions;
+use OCA\Social\Tools\Exceptions\DateTimeException;
 use OCP\DB\QueryBuilder\ICompositeExpression;
 
 /**

lib/Db/StreamActionsRequestBuilder.php

@@ -30,8 +30,8 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\Model\StreamAction;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class StreamActionsRequestBuilder

lib/Db/StreamQueueRequestBuilder.php

@@ -30,8 +30,8 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\Model\StreamQueue;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 class StreamQueueRequestBuilder extends CoreRequestBuilder {
 	use TArrayTools;

lib/Db/StreamTagsRequest.php

@@ -31,11 +31,11 @@ declare(strict_types=1);
 
 namespace OCA\Social\Db;
 
-use OCA\Social\Tools\Traits\TStringTools;
 use OCA\Social\Model\ActivityPub\Object\Note;
 use OCA\Social\Model\ActivityPub\Stream;
-use OCP\Server;
+use OCA\Social\Tools\Traits\TStringTools;
 use OCP\DB\Exception as DBException;
+use OCP\Server;
 use Psr\Log\LoggerInterface;
 
 /**

lib/Model/ActivityPub/Object/Follow.php

@@ -31,9 +31,9 @@ declare(strict_types=1);
 
 namespace OCA\Social\Model\ActivityPub\Object;
 
-use OCA\Social\Tools\IQueryRow;
 use JsonSerializable;
 use OCA\Social\Model\ActivityPub\ACore;
+use OCA\Social\Tools\IQueryRow;
 
 /**
  * Class Follow

lib/Model/Client/SocialClient.php

@@ -31,11 +31,11 @@ declare(strict_types=1);
 
 namespace OCA\Social\Model\Client;
 
-use OCA\Social\Tools\IQueryRow;
-use OCA\Social\Tools\Traits\TArrayTools;
 use DateTime;
 use Exception;
 use JsonSerializable;
+use OCA\Social\Tools\IQueryRow;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class ClientApp

lib/Model/Instance.php

@@ -30,10 +30,10 @@ declare(strict_types=1);
 
 namespace OCA\Social\Model;
 
-use OCA\Social\Tools\IQueryRow;
-use OCA\Social\Tools\Traits\TArrayTools;
 use JsonSerializable;
 use OCA\Social\Model\ActivityPub\Actor\Person;
+use OCA\Social\Tools\IQueryRow;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class Instance

lib/Model/InstancePath.php

@@ -30,8 +30,8 @@ declare(strict_types=1);
 
 namespace OCA\Social\Model;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use JsonSerializable;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class InstancePath

lib/Model/RequestQueue.php

@@ -31,11 +31,11 @@ declare(strict_types=1);
 
 namespace OCA\Social\Model;
 
-use OCA\Social\Tools\Traits\TArrayTools;
-use OCA\Social\Tools\Traits\TStringTools;
 use DateTime;
 use Exception;
 use JsonSerializable;
+use OCA\Social\Tools\Traits\TArrayTools;
+use OCA\Social\Tools\Traits\TStringTools;
 
 /**
  * Class RequestQueue

lib/Model/StreamAction.php

@@ -31,9 +31,9 @@ declare(strict_types=1);
 
 namespace OCA\Social\Model;
 
+use JsonSerializable;
 use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\Tools\Traits\TStringTools;
-use JsonSerializable;
 
 /**
  * Class StreamAction

lib/Model/StreamDetails.php

@@ -31,10 +31,10 @@ declare(strict_types=1);
 
 namespace OCA\Social\Model;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use JsonSerializable;
 use OCA\Social\Model\ActivityPub\Actor\Person;
 use OCA\Social\Model\ActivityPub\Stream;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class StreamDetails

lib/Model/StreamQueue.php

@@ -31,10 +31,10 @@ declare(strict_types=1);
 
 namespace OCA\Social\Model;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use DateTime;
 use Exception;
 use JsonSerializable;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class StreamQueue

lib/Model/Test.php

@@ -30,9 +30,9 @@ declare(strict_types=1);
 
 namespace OCA\Social\Model;
 
+use JsonSerializable;
 use OCA\Social\Tools\Model\SimpleDataStore;
 use OCA\Social\Tools\Traits\TArrayTools;
-use JsonSerializable;
 
 /**
  * Class Test

lib/Service/ActorService.php

@@ -30,7 +30,6 @@ declare(strict_types=1);
 
 namespace OCA\Social\Service;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\AP;
 use OCA\Social\Db\CacheActorsRequest;
 use OCA\Social\Db\CacheDocumentsRequest;
@@ -39,6 +38,7 @@ use OCA\Social\Exceptions\CacheDocumentDoesNotExistException;
 use OCA\Social\Exceptions\ItemAlreadyExistsException;
 use OCA\Social\Exceptions\ItemUnknownException;
 use OCA\Social\Model\ActivityPub\Actor\Person;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class ActorService

lib/Service/CheckService.php

@@ -23,8 +23,6 @@
 
 namespace OCA\Social\Service;
 
-use OCA\Social\Tools\Traits\TArrayTools;
-use OCA\Social\Tools\Traits\TStringTools;
 use Exception;
 use GuzzleHttp\Exception\ClientException;
 use OC\User\NoUserException;
@@ -40,6 +38,8 @@ use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Exceptions\UrlCloudException;
 use OCA\Social\Model\ActivityPub\Object\Follow;
 use OCA\Social\Model\ActivityPub\Object\Note;
+use OCA\Social\Tools\Traits\TArrayTools;
+use OCA\Social\Tools\Traits\TStringTools;
 use OCP\AppFramework\Http;
 use OCP\Http\Client\IClientService;
 use OCP\ICache;

lib/Service/ClientService.php

@@ -30,12 +30,12 @@ declare(strict_types=1);
 
 namespace OCA\Social\Service;
 
-use OCA\Social\Tools\Traits\TStringTools;
 use Exception;
 use OCA\Social\Db\ClientRequest;
 use OCA\Social\Exceptions\ClientException;
 use OCA\Social\Exceptions\ClientNotFoundException;
 use OCA\Social\Model\Client\SocialClient;
+use OCA\Social\Tools\Traits\TStringTools;
 
 /**
  * Class ClientService

lib/Service/HashtagService.php

@@ -31,14 +31,14 @@ declare(strict_types=1);
 
 namespace OCA\Social\Service;
 
-use OCA\Social\Tools\Exceptions\DateTimeException;
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\Db\HashtagsRequest;
 use OCA\Social\Db\StreamRequest;
 use OCA\Social\Exceptions\HashtagDoesNotExistException;
 use OCA\Social\Exceptions\ItemUnknownException;
 use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Model\ActivityPub\Object\Note;
+use OCA\Social\Tools\Exceptions\DateTimeException;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 class HashtagService {
 	public const TREND_1H = 3600;

lib/Service/ImportService.php

@@ -31,16 +31,16 @@ declare(strict_types=1);
 
 namespace OCA\Social\Service;
 
-use OCA\Social\Tools\Traits\TArrayTools;
-use OCA\Social\Tools\Traits\TStringTools;
 use Exception;
 use OCA\Social\AP;
 use OCA\Social\Exceptions\ActivityPubFormatException;
 use OCA\Social\Exceptions\InvalidOriginException;
+use OCA\Social\Exceptions\ItemUnknownException;
 use OCA\Social\Exceptions\RedundancyLimitException;
 use OCA\Social\Exceptions\SocialAppConfigException;
-use OCA\Social\Exceptions\ItemUnknownException;
 use OCA\Social\Model\ActivityPub\ACore;
+use OCA\Social\Tools\Traits\TArrayTools;
+use OCA\Social\Tools\Traits\TStringTools;
 
 class ImportService {
 	use TArrayTools;

lib/Service/InstanceService.php

@@ -31,12 +31,12 @@ declare(strict_types=1);
 
 namespace OCA\Social\Service;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\AppInfo\Application;
 use OCA\Social\Db\InstancesRequest;
 use OCA\Social\Exceptions\InstanceDoesNotExistException;
 use OCA\Social\Model\ActivityPub\ACore;
 use OCA\Social\Model\Instance;
+use OCA\Social\Tools\Traits\TArrayTools;
 use OCP\IConfig;
 
 class InstanceService {

lib/Service/LikeService.php

@@ -31,7 +31,6 @@ declare(strict_types=1);
 
 namespace OCA\Social\Service;
 
-use OCA\Social\Tools\Traits\TStringTools;
 use Exception;
 use OCA\Social\AP;
 use OCA\Social\Db\StreamRequest;
@@ -47,6 +46,7 @@ use OCA\Social\Model\ActivityPub\Object\Note;
 use OCA\Social\Model\ActivityPub\Stream;
 use OCA\Social\Model\InstancePath;
 use OCA\Social\Model\StreamAction;
+use OCA\Social\Tools\Traits\TStringTools;
 
 /**
  * Class LikeService

lib/Service/PostService.php

@@ -30,12 +30,6 @@ declare(strict_types=1);
 
 namespace OCA\Social\Service;
 
-use OCA\Social\Tools\Exceptions\MalformedArrayException;
-use OCA\Social\Tools\Exceptions\RequestContentException;
-use OCA\Social\Tools\Exceptions\RequestNetworkException;
-use OCA\Social\Tools\Exceptions\RequestResultNotJsonException;
-use OCA\Social\Tools\Exceptions\RequestResultSizeException;
-use OCA\Social\Tools\Exceptions\RequestServerException;
 use Exception;
 use OCA\Social\AP;
 use OCA\Social\Exceptions\CacheContentMimeTypeException;
@@ -51,6 +45,12 @@ use OCA\Social\Model\ActivityPub\ACore;
 use OCA\Social\Model\ActivityPub\Object\Document;
 use OCA\Social\Model\ActivityPub\Object\Note;
 use OCA\Social\Model\Post;
+use OCA\Social\Tools\Exceptions\MalformedArrayException;
+use OCA\Social\Tools\Exceptions\RequestContentException;
+use OCA\Social\Tools\Exceptions\RequestNetworkException;
+use OCA\Social\Tools\Exceptions\RequestResultNotJsonException;
+use OCA\Social\Tools\Exceptions\RequestResultSizeException;
+use OCA\Social\Tools\Exceptions\RequestServerException;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use Psr\Log\LoggerInterface;

lib/Service/PushService.php

@@ -31,12 +31,12 @@ declare(strict_types=1);
 
 namespace OCA\Social\Service;
 
-use OCA\Social\Tools\Traits\TAsync;
 use OC;
-//use OC\Push\Model\Helper\PushCallback;
 use OCA\Social\Exceptions\SocialAppConfigException;
+//use OC\Push\Model\Helper\PushCallback;
 use OCA\Social\Exceptions\StreamNotFoundException;
 use OCA\Social\Model\ActivityPub\Actor\Person;
+use OCA\Social\Tools\Traits\TAsync;
 use OCP\AppFramework\QueryException;
 
 //use OCP\Push\Exceptions\PushInstallException;

lib/Service/RequestQueueService.php

@@ -31,7 +31,6 @@ declare(strict_types=1);
 
 namespace OCA\Social\Service;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use OCA\Social\Db\RequestQueueRequest;
 use OCA\Social\Exceptions\EmptyQueueException;
 use OCA\Social\Exceptions\NoHighPriorityRequestException;
@@ -39,6 +38,7 @@ use OCA\Social\Exceptions\QueueStatusException;
 use OCA\Social\Model\ActivityPub\ACore;
 use OCA\Social\Model\InstancePath;
 use OCA\Social\Model\RequestQueue;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 class RequestQueueService {
 	use TArrayTools;

lib/Service/StreamQueueService.php

@@ -30,28 +30,28 @@ declare(strict_types=1);
 
 namespace OCA\Social\Service;
 
-use OCA\Social\Tools\Exceptions\MalformedArrayException;
-use OCA\Social\Tools\Model\Cache;
-use OCA\Social\Tools\Model\CacheItem;
 use OCA\Social\AP;
-use OCA\Social\Db\StreamRequest;
 use OCA\Social\Db\StreamQueueRequest;
+use OCA\Social\Db\StreamRequest;
 use OCA\Social\Exceptions\InvalidOriginException;
 use OCA\Social\Exceptions\InvalidResourceException;
 use OCA\Social\Exceptions\ItemUnknownException;
-use OCA\Social\Exceptions\StreamNotFoundException;
 use OCA\Social\Exceptions\QueueStatusException;
 use OCA\Social\Exceptions\RedundancyLimitException;
+use OCA\Social\Exceptions\SocialAppConfigException;
+use OCA\Social\Exceptions\StreamNotFoundException;
+use OCA\Social\Exceptions\UnauthorizedFediverseException;
+use OCA\Social\Model\ActivityPub\Object\Note;
+use OCA\Social\Model\ActivityPub\Stream;
+use OCA\Social\Model\StreamQueue;
+use OCA\Social\Tools\Exceptions\MalformedArrayException;
 use OCA\Social\Tools\Exceptions\RequestContentException;
 use OCA\Social\Tools\Exceptions\RequestNetworkException;
 use OCA\Social\Tools\Exceptions\RequestResultNotJsonException;
 use OCA\Social\Tools\Exceptions\RequestResultSizeException;
 use OCA\Social\Tools\Exceptions\RequestServerException;
-use OCA\Social\Exceptions\SocialAppConfigException;
-use OCA\Social\Exceptions\UnauthorizedFediverseException;
-use OCA\Social\Model\ActivityPub\Object\Note;
-use OCA\Social\Model\ActivityPub\Stream;
-use OCA\Social\Model\StreamQueue;
+use OCA\Social\Tools\Model\Cache;
+use OCA\Social\Tools\Model\CacheItem;
 
 /**
  * Class StreamQueueService

lib/Service/TestService.php

@@ -30,10 +30,6 @@ declare(strict_types=1);
 
 namespace OCA\Social\Service;
 
-use OCA\Social\Tools\Exceptions\ArrayNotFoundException;
-use OCA\Social\Tools\Model\NCRequest;
-use OCA\Social\Tools\Model\SimpleDataStore;
-use OCA\Social\Tools\Traits\TArrayTools;
 use Exception;
 use OCA\Social\AP;
 use OCA\Social\Exceptions\HostMetaException;
@@ -42,6 +38,10 @@ use OCA\Social\Exceptions\InvalidResourceException;
 use OCA\Social\Exceptions\ItemUnknownException;
 use OCA\Social\Model\ActivityPub\Actor\Person;
 use OCA\Social\Model\Test;
+use OCA\Social\Tools\Exceptions\ArrayNotFoundException;
+use OCA\Social\Tools\Model\NCRequest;
+use OCA\Social\Tools\Model\SimpleDataStore;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class TestService

lib/Tools/Db/ExtendedQueryBuilder.php

@@ -31,15 +31,15 @@ declare(strict_types=1);
 
 namespace OCA\Social\Tools\Db;
 
-use OCA\Social\Tools\Exceptions\DateTimeException;
-use OCA\Social\Tools\Exceptions\RowNotFoundException;
-use OCA\Social\Tools\IExtendedQueryBuilder;
-use OCA\Social\Tools\IQueryRow;
 use DateInterval;
 use DateTime;
 use Doctrine\DBAL\Query\QueryBuilder as DBALQueryBuilder;
 use Exception;
 use OC\DB\QueryBuilder\QueryBuilder;
+use OCA\Social\Tools\Exceptions\DateTimeException;
+use OCA\Social\Tools\Exceptions\RowNotFoundException;
+use OCA\Social\Tools\IExtendedQueryBuilder;
+use OCA\Social\Tools\IQueryRow;
 use OCP\DB\QueryBuilder\ICompositeExpression;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 

lib/Tools/Model/Cache.php

@@ -30,9 +30,9 @@ declare(strict_types=1);
 
 namespace OCA\Social\Tools\Model;
 
+use JsonSerializable;
 use OCA\Social\Tools\Exceptions\CacheItemNotFoundException;
 use OCA\Social\Tools\Traits\TArrayTools;
-use JsonSerializable;
 
 /**
  * Class Cache

lib/Tools/Model/CacheItem.php

@@ -30,8 +30,8 @@ declare(strict_types=1);
 
 namespace OCA\Social\Tools\Model;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use JsonSerializable;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class CacheItem

lib/Tools/Model/Request.php

@@ -31,8 +31,8 @@ declare(strict_types=1);
 
 namespace OCA\Social\Tools\Model;
 
-use OCA\Social\Tools\Traits\TArrayTools;
 use JsonSerializable;
+use OCA\Social\Tools\Traits\TArrayTools;
 
 /**
  * Class Request

lib/Tools/Model/SimpleDataStore.php

@@ -31,10 +31,10 @@ declare(strict_types=1);
 
 namespace OCA\Social\Tools\Model;
 
+use JsonSerializable;
 use OCA\Social\Tools\Exceptions\ItemNotFoundException;
 use OCA\Social\Tools\Exceptions\MalformedArrayException;
 use OCA\Social\Tools\Traits\TArrayTools;
-use JsonSerializable;
 
 /**
  * Class SimpleDataStore

lib/Tools/Traits/TArrayTools.php

@@ -31,12 +31,12 @@ declare(strict_types=1);
 
 namespace OCA\Social\Tools\Traits;
 
+use Exception;
+use JsonSerializable;
 use OCA\Social\Tools\Exceptions\ArrayNotFoundException;
 use OCA\Social\Tools\Exceptions\ItemNotFoundException;
 use OCA\Social\Tools\Exceptions\MalformedArrayException;
 use OCA\Social\Tools\Exceptions\UnknownTypeException;
-use Exception;
-use JsonSerializable;
 
 /**
  * Trait TArrayTools