diff options
author | Maxence Lange <maxence@artificial-owl.com> | 2018-12-19 19:57:17 -0100 |
---|---|---|
committer | Maxence Lange <maxence@artificial-owl.com> | 2018-12-19 19:57:17 -0100 |
commit | 80deaa821074d623badf684dc20556a8e3a8c785 (patch) | |
tree | 995ccd900b1e3cd0b29a14d6ce43c0f5968e7674 /lib | |
parent | 35be62836f1867c6a22a85d6f680092754a00ab4 (diff) | |
parent | 1a478d5dc6282e6e8dc4e64b023f991d3083f702 (diff) |
Merge branch 'master' into framework-import-process+activity
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Controller/ActivityPubController.php | 1 | ||||
-rw-r--r-- | lib/Service/ActivityService.php | 2 | ||||
-rw-r--r-- | lib/Service/ImportService.php | 1 |
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 * |