Merge branch 'master' into framework-import-process+activity

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

3 files changed, 3 insertions, 1 deletions

diff --git a/lib/Controller/ActivityPubController.php b/lib/Controller/ActivityPubController.php
index 9e0a9a84..8a8dd0ef 100644
--- a/lib/Controller/ActivityPubController.php
+++ b/lib/Controller/ActivityPubController.php
@@ -35,6 +35,7 @@ use Exception;
 use OC\AppFramework\Http;
 use OCA\Social\AppInfo\Application;
 use OCA\Social\Exceptions\SignatureIsGoneException;
+use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Exceptions\UnknownItemException;
 use OCA\Social\Service\CacheActorService;
 use OCA\Social\Service\FollowService;
diff --git a/lib/Service/ActivityService.php b/lib/Service/ActivityService.php
index 30d5e757..b9bd615f 100644
--- a/lib/Service/ActivityService.php
+++ b/lib/Service/ActivityService.php
@@ -39,6 +39,7 @@ use OCA\Social\Db\NotesRequest;
 use OCA\Social\Exceptions\ActorDoesNotExistException;
 use OCA\Social\Exceptions\EmptyQueueException;
 use OCA\Social\Exceptions\InvalidResourceException;
+use OCA\Social\Exceptions\LinkedDataSignatureMissingException;
 use OCA\Social\Exceptions\NoHighPriorityRequestException;
 use OCA\Social\Exceptions\QueueStatusException;
 use OCA\Social\Exceptions\Request410Exception;
@@ -51,6 +52,7 @@ use OCA\Social\Model\ActivityPub\Activity\Delete;
 use OCA\Social\Model\ActivityPub\Actor\Person;
 use OCA\Social\Model\ActivityPub\Object\Tombstone;
 use OCA\Social\Model\InstancePath;
+use OCA\Social\Model\LinkedDataSignature;
 use OCA\Social\Model\RequestQueue;
 
 class ActivityService {
diff --git a/lib/Service/ImportService.php b/lib/Service/ImportService.php
index 7d210cce..aeb854ce 100644
--- a/lib/Service/ImportService.php
+++ b/lib/Service/ImportService.php
@@ -84,7 +84,6 @@ class ImportService {
 		return AP::$activityPub->getItemFromData($data);
 	}
 
-
 	/**
 	 * @param ACore $activity
 	 *