diff options
20 files changed, 441 insertions, 94 deletions
diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php index 1fad9f4d..95b5434e 100644 --- a/lib/Controller/LocalController.php +++ b/lib/Controller/LocalController.php @@ -207,8 +207,6 @@ class LocalController extends Controller { } - - /** * @NoCSRFRequired * @NoAdminRequired @@ -230,7 +228,6 @@ class LocalController extends Controller { } - /** * @NoAdminRequired * @PublicPage @@ -423,6 +420,7 @@ class LocalController extends Controller { $actor = $this->cacheActorService->getFromLocalAccount($username); $actor->setCompleteDetails(true); + return $this->success(['account' => $actor]); } catch (Exception $e) { return $this->fail($e); @@ -514,6 +512,7 @@ class LocalController extends Controller { } /** + * @NoCSRFRequired * @NoAdminRequired * * @param string $id diff --git a/lib/Db/CacheActorsRequest.php b/lib/Db/CacheActorsRequest.php index 6298c12b..7fb7ec5c 100644 --- a/lib/Db/CacheActorsRequest.php +++ b/lib/Db/CacheActorsRequest.php @@ -64,11 +64,6 @@ class CacheActorsRequest extends CacheActorsRequestBuilder { * @param Person $actor */ public function save(Person $actor) { - $source = $actor->getSource(); - if (strlen($source) >= CoreRequestBuilder::SOURCE_LENGTH) { - $source = 'too_big'; - } - $qb = $this->getCacheActorsInsertSql(); $qb->setValue('id', $qb->createNamedParameter($actor->getId())) ->setValue('account', $qb->createNamedParameter($actor->getAccount())) @@ -87,7 +82,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder { ->setValue('name', $qb->createNamedParameter($actor->getName())) ->setValue('summary', $qb->createNamedParameter($actor->getSummary())) ->setValue('public_key', $qb->createNamedParameter($actor->getPublicKey())) - ->setValue('source', $qb->createNamedParameter($source)) + ->setValue('source', $qb->createNamedParameter($actor->getSource())) ->setValue('details', $qb->createNamedParameter(json_encode($actor->getDetails()))) ->setValue( 'creation', diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php index 15d20119..d9ae63f1 100644 --- a/lib/Db/CoreRequestBuilder.php +++ b/lib/Db/CoreRequestBuilder.php @@ -63,10 +63,7 @@ class CoreRequestBuilder { const TABLE_CACHE_ACTORS = 'social_cache_actors'; const TABLE_CACHE_DOCUMENTS = 'social_cache_documents'; - - const SOURCE_LENGTH = 10000; - - + /** @var IDBConnection */ protected $dbConnection; diff --git a/lib/Db/NotesRequest.php b/lib/Db/NotesRequest.php index ce85785a..306c85ff 100644 --- a/lib/Db/NotesRequest.php +++ b/lib/Db/NotesRequest.php @@ -66,11 +66,6 @@ class NotesRequest extends NotesRequestBuilder { $dTime = new DateTime(); $dTime->setTimestamp($note->getPublishedTime()); - $source = $note->getSource(); - if (strlen($source) >= CoreRequestBuilder::SOURCE_LENGTH) { - $source = 'too_big'; - } - $qb = $this->getNotesInsertSql(); $qb->setValue('id', $qb->createNamedParameter($note->getId())) ->setValue('type', $qb->createNamedParameter($note->getType())) @@ -98,7 +93,7 @@ class NotesRequest extends NotesRequestBuilder { ) ->setValue('attributed_to', $qb->createNamedParameter($note->getAttributedTo())) ->setValue('in_reply_to', $qb->createNamedParameter($note->getInReplyTo())) - ->setValue('source', $qb->createNamedParameter($source)) + ->setValue('source', $qb->createNamedParameter($note->getSource())) ->setValue( 'instances', $qb->createNamedParameter( json_encode($note->getInstancePaths(), JSON_UNESCAPED_SLASHES) diff --git a/lib/Db/NotesRequestBuilder.php b/lib/Db/NotesRequestBuilder.php index 443deb8e..5995560c 100644 --- a/lib/Db/NotesRequestBuilder.php +++ b/lib/Db/NotesRequestBuilder.php @@ -325,21 +325,8 @@ class NotesRequestBuilder extends CoreRequestBuilder { * @return Note */ protected function parseNotesSelectSql($data): Note { - $dTime = new DateTime($this->get('published_time', $data, 'yesterday')); - - // TODO - use $note->importFromDatabase() ? $note = new Note(); - $note->setId($data['id']) - ->setTo($data['to']) - ->setToArray(json_decode($data['to_array'], true)) - ->setCcArray(json_decode($data['cc'], true)) - ->setBccArray(json_decode($data['bcc'])) - ->setLocal(($data['local'] === '1') ? true : false) - ->setPublished($data['published']); - $note->setContent($data['content']) - ->setPublishedTime($dTime->getTimestamp()) - ->setAttributedTo($data['attributed_to']) - ->setInReplyTo($data['in_reply_to']); + $note->importFromDatabase($data); $instances = json_decode($data['instances'], true); if (is_array($instances)) { diff --git a/lib/Interfaces/Activity/FollowInterface.php b/lib/Interfaces/Activity/FollowInterface.php index 21564345..9de551b0 100644 --- a/lib/Interfaces/Activity/FollowInterface.php +++ b/lib/Interfaces/Activity/FollowInterface.php @@ -111,10 +111,11 @@ class FollowInterface implements IActivityPubInterface { $remoteActor = $this->cacheActorService->getFromId($follow->getActorId()); $accept = new Accept(); -// $accept->setUrlCloud($this->configService->getCloudAddress()); + $accept->setUrlCloud($this->configService->getCloudAddress()); $accept->generateUniqueId('#accept/follows'); $accept->setActorId($follow->getObjectId()); $accept->setObject($follow); + $follow->setParent($accept); $accept->addInstancePath( new InstancePath( @@ -122,8 +123,6 @@ class FollowInterface implements IActivityPubInterface { ) ); - $follow->setParent($accept); - $this->activityService->request($accept); $this->followsRequest->accepted($follow); } catch (Exception $e) { @@ -159,6 +158,7 @@ class FollowInterface implements IActivityPubInterface { } } catch (FollowDoesNotExistException $e) { $actor = $this->cacheActorService->getFromId($follow->getObjectId()); + if ($actor->isLocal()) { $follow->setFollowId($actor->getFollowers()); $this->followsRequest->save($follow); @@ -189,13 +189,14 @@ class FollowInterface implements IActivityPubInterface { public function activity(Acore $activity, ACore $item) { /** @var Follow $item */ if ($activity->getType() === Undo::TYPE) { + $activity->checkOrigin($item->getId()); $activity->checkOrigin($item->getActorId()); - $this->followsRequest->deleteByPersons($item); + $this->followsRequest->delete($item); } if ($activity->getType() === Reject::TYPE) { $activity->checkOrigin($item->getObjectId()); - $this->followsRequest->deleteByPersons($item); + $this->followsRequest->delete($item); } if ($activity->getType() === Accept::TYPE) { diff --git a/lib/Interfaces/Activity/UndoInterface.php b/lib/Interfaces/Activity/UndoInterface.php index 83e32afb..174feb4e 100644 --- a/lib/Interfaces/Activity/UndoInterface.php +++ b/lib/Interfaces/Activity/UndoInterface.php @@ -63,11 +63,12 @@ class UndoInterface implements IActivityPubInterface { if (!$item->gotObject()) { return; } + $object = $item->getObject(); try { - $service = AP::$activityPub->getInterfaceForItem($item->getObject()); - $service->activity($item, $object); + $interface = AP::$activityPub->getInterfaceForItem($item->getObject()); + $interface->activity($item, $object); } catch (UnknownItemException $e) { } } diff --git a/lib/Interfaces/Actor/PersonInterface.php b/lib/Interfaces/Actor/PersonInterface.php index 5c84dc9c..5585ebdc 100644 --- a/lib/Interfaces/Actor/PersonInterface.php +++ b/lib/Interfaces/Actor/PersonInterface.php @@ -127,7 +127,7 @@ class PersonInterface implements IActivityPubInterface { public function activity(Acore $activity, ACore $item) { /** @var Person $item */ if ($activity->getType() === Update::TYPE) { -// $this->miscService->log('### UPDATE PERSON !' . json_encode($item)); + // TODO - check time and update. } } diff --git a/lib/Interfaces/Object/NoteInterface.php b/lib/Interfaces/Object/NoteInterface.php index 12174c6c..6abf1f43 100644 --- a/lib/Interfaces/Object/NoteInterface.php +++ b/lib/Interfaces/Object/NoteInterface.php @@ -38,6 +38,7 @@ use OCA\Social\Exceptions\NoteNotFoundException; use OCA\Social\Interfaces\IActivityPubInterface; use OCA\Social\Model\ActivityPub\ACore; use OCA\Social\Model\ActivityPub\Activity\Create; +use OCA\Social\Model\ActivityPub\Activity\Update; use OCA\Social\Model\ActivityPub\Object\Note; use OCA\Social\Service\ConfigService; use OCA\Social\Service\CurlService; @@ -128,9 +129,18 @@ class NoteInterface implements IActivityPubInterface { /** @var Note $item */ if ($activity->getType() === Create::TYPE) { + $activity->checkOrigin($item->getId()); $activity->checkOrigin($item->getAttributedTo()); $this->save($item); } + + if ($activity->getType() === Update::TYPE) { + $activity->checkOrigin($item->getId()); + $activity->checkOrigin($item->getAttributedTo()); + // TODO - check time and update. +// $this->save($item); + } + } diff --git a/lib/Migration/Version0001Date20181204203147.php b/lib/Migration/Version0001Date20181204203147.php index 46bf48eb..c98b319b 100644 --- a/lib/Migration/Version0001Date20181204203147.php +++ b/lib/Migration/Version0001Date20181204203147.php @@ -318,7 +318,7 @@ class Version0001Date20181204203147 extends SimpleMigrationStep { ]); $table->addColumn('author', 'string', [ 'notnull' => true, - 'length' => 1270, + 'length' => 127, ]); $table->addColumn('activity', 'string', [ 'notnull' => true, diff --git a/lib/Migration/Version0001Date20181219000001.php b/lib/Migration/Version0001Date20181219000001.php new file mode 100644 index 00000000..57eda132 --- /dev/null +++ b/lib/Migration/Version0001Date20181219000001.php @@ -0,0 +1,133 @@ +<?php +declare(strict_types=1); + + +/** + * Nextcloud - Social Support + * + * This file is licensed under the Affero General Public License version 3 or + * later. See the COPYING file. + * + * @author Maxence Lange <maxence@artificial-owl.com> + * @copyright 2018, Maxence Lange <maxence@artificial-owl.com> + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +namespace OCA\Social\Migration; + + +use Closure; +use Doctrine\DBAL\DBALException; +use Doctrine\DBAL\Schema\SchemaException; +use Doctrine\DBAL\Types\Type; +use OCA\Social\Db\CoreRequestBuilder; +use OCP\DB\ISchemaWrapper; +use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + + +/** + * Class Version0001Date20181219000001 + * + * @package OCA\Social\Migration + */ +class Version0001Date20181219000001 extends SimpleMigrationStep { + + + /** @var IDBConnection */ + private $connection; + + + /** @var array */ + public static $editToText = [ + [CoreRequestBuilder::TABLE_CACHE_ACTORS, 'source'], + [CoreRequestBuilder::TABLE_CACHE_ACTORS, 'summary'], + [CoreRequestBuilder::TABLE_CACHE_ACTORS, 'details'], + [CoreRequestBuilder::TABLE_REQUEST_QUEUE, 'activity'], + [CoreRequestBuilder::TABLE_SERVER_ACTORS, 'summary'], + [CoreRequestBuilder::TABLE_SERVER_NOTES, 'content'], + [CoreRequestBuilder::TABLE_SERVER_NOTES, 'summary'], + [CoreRequestBuilder::TABLE_SERVER_NOTES, 'instances'], + [CoreRequestBuilder::TABLE_SERVER_NOTES, 'source'] + ]; + + /** @var array */ + public static $editToChar4000 = [ + [CoreRequestBuilder::TABLE_SERVER_NOTES, 'to_array'], + [CoreRequestBuilder::TABLE_SERVER_NOTES, 'cc'], + [CoreRequestBuilder::TABLE_SERVER_NOTES, 'bcc'] + ]; + + + /** + * @param IDBConnection $connection + */ + public function __construct(IDBConnection $connection) { + $this->connection = $connection; + } + + + /** + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * + * @return ISchemaWrapper + * @throws SchemaException + * @throws DBALException + */ + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options + ): ISchemaWrapper { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + foreach (array_merge(self::$editToText, self::$editToChar4000) as $edit) { + list($tableName, $field) = $edit; + + $table = $schema->getTable($tableName); + if ($table->hasColumn($field . '_copy')) { + continue; + } + + $table->addColumn($field . '_copy', Type::TEXT, ['notnull' => false]); + } + + return $schema; + } + + + /** + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + */ + public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) { + + foreach (array_merge(self::$editToText, self::$editToChar4000) as $edit) { + list($tableName, $field) = $edit; + + $qb = $this->connection->getQueryBuilder(); + $qb->update($tableName) + ->set($field . '_copy', $field) + ->execute(); + } + } + +} + diff --git a/lib/Migration/Version0001Date20181208185242.php b/lib/Migration/Version0001Date20181219000002.php index 3194f2ee..182a12cd 100644 --- a/lib/Migration/Version0001Date20181208185242.php +++ b/lib/Migration/Version0001Date20181219000002.php @@ -32,18 +32,22 @@ namespace OCA\Social\Migration; use Closure; +use Doctrine\DBAL\DBALException; +use Doctrine\DBAL\Schema\SchemaException; +use Doctrine\DBAL\Types\Type; use OCA\Social\Db\CoreRequestBuilder; use OCP\DB\ISchemaWrapper; +use OCP\IDBConnection; use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; /** - * Class Version0001Date20181208185242 + * Class Version0001Date20181219000002 * * @package OCA\Social\Migration */ -class Version0001Date20181208185242 extends SimpleMigrationStep { +class Version0001Date20181219000002 extends SimpleMigrationStep { /** @@ -52,37 +56,28 @@ class Version0001Date20181208185242 extends SimpleMigrationStep { * @param array $options * * @return ISchemaWrapper - * @throws \Doctrine\DBAL\Schema\SchemaException + * @throws SchemaException */ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options ): ISchemaWrapper { /** @var ISchemaWrapper $schema */ $schema = $schemaClosure(); - $table = $schema->getTable(CoreRequestBuilder::TABLE_CACHE_ACTORS); - $table->changeColumn( - 'source', [ - 'notnull' => true, - 'length' => CoreRequestBuilder::SOURCE_LENGTH, - ] + $edits = array_merge( + Version0001Date20181219000001::$editToText, + Version0001Date20181219000001::$editToChar4000 ); + foreach ($edits as $edit) { + list($tableName, $field) = $edit; - $table = $schema->getTable(CoreRequestBuilder::TABLE_SERVER_NOTES); - $table->changeColumn( - 'source', [ - 'notnull' => true, - 'length' => CoreRequestBuilder::SOURCE_LENGTH, - ] - ); - - $table = $schema->getTable(CoreRequestBuilder::TABLE_REQUEST_QUEUE); - $table->changeColumn( - 'activity', [ - 'notnull' => true, - 'length' => CoreRequestBuilder::SOURCE_LENGTH, - ] - ); + $table = $schema->getTable($tableName); + if ($table->hasColumn($field) && $table->hasColumn($field . '_copy')) { + $table->dropColumn($field); + } + } return $schema; } + } + diff --git a/lib/Migration/Version0001Date20181219000003.php b/lib/Migration/Version0001Date20181219000003.php new file mode 100644 index 00000000..4526d938 --- /dev/null +++ b/lib/Migration/Version0001Date20181219000003.php @@ -0,0 +1,128 @@ +<?php +declare(strict_types=1); + + +/** + * Nextcloud - Social Support + * + * This file is licensed under the Affero General Public License version 3 or + * later. See the COPYING file. + * + * @author Maxence Lange <maxence@artificial-owl.com> + * @copyright 2018, Maxence Lange <maxence@artificial-owl.com> + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +namespace OCA\Social\Migration; + + +use Closure; +use Doctrine\DBAL\DBALException; +use Doctrine\DBAL\Schema\SchemaException; +use Doctrine\DBAL\Types\Type; +use OCP\DB\ISchemaWrapper; +use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + + +/** + * Class Version0001Date20181219000003 + * + * @package OCA\Social\Migration + */ +class Version0001Date20181219000003 extends SimpleMigrationStep { + + + /** @var IDBConnection */ + private $connection; + + + /** + * @param IDBConnection $connection + */ + public function __construct(IDBConnection $connection) { + $this->connection = $connection; + } + + + /** + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * + * @return ISchemaWrapper + * @throws SchemaException + * @throws DBALException + */ + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options + ): ISchemaWrapper { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + // -> TEXT + foreach (Version0001Date20181219000001::$editToText as $edit) { + list($tableName, $field) = $edit; + + $table = $schema->getTable($tableName); + if ($table->hasColumn($field)) { + continue; + } + + $table->addColumn($field, Type::TEXT, ['notnull' => false]); + } + + // -> VARCHAR(4000) + foreach (Version0001Date20181219000001::$editToChar4000 as $edit) { + list($tableName, $field) = $edit; + + $table = $schema->getTable($tableName); + if ($table->hasColumn($field)) { + continue; + } + + $table->addColumn($field, Type::STRING, ['notnull' => false, 'length' => 4000]); + } + + return $schema; + } + + + /** + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + */ + public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) { + + $edits = array_merge( + Version0001Date20181219000001::$editToText, + Version0001Date20181219000001::$editToChar4000 + ); + foreach ($edits as $edit) { + list($table, $field) = $edit; + + $qb = $this->connection->getQueryBuilder(); + $qb->update($table) + ->set($field, $field . '_copy') + ->execute(); + } + } + +} + diff --git a/lib/Migration/Version0001Date20181219000004.php b/lib/Migration/Version0001Date20181219000004.php new file mode 100644 index 00000000..5af222a6 --- /dev/null +++ b/lib/Migration/Version0001Date20181219000004.php @@ -0,0 +1,83 @@ +<?php +declare(strict_types=1); + + +/** + * Nextcloud - Social Support + * + * This file is licensed under the Affero General Public License version 3 or + * later. See the COPYING file. + * + * @author Maxence Lange <maxence@artificial-owl.com> + * @copyright 2018, Maxence Lange <maxence@artificial-owl.com> + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +namespace OCA\Social\Migration; + + +use Closure; +use Doctrine\DBAL\DBALException; +use Doctrine\DBAL\Schema\SchemaException; +use Doctrine\DBAL\Types\Type; +use OCP\DB\ISchemaWrapper; +use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + + +/** + * Class Version0001Date20181219000004 + * + * @package OCA\Social\Migration + */ +class Version0001Date20181219000004 extends SimpleMigrationStep { + + + /** + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * + * @return ISchemaWrapper + * @throws SchemaException + * @throws DBALException + */ + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options + ): ISchemaWrapper { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + $edits = array_merge( + Version0001Date20181219000001::$editToText, + Version0001Date20181219000001::$editToChar4000 + ); + foreach ($edits as $edit) { + list($tableName, $field) = $edit; + + $table = $schema->getTable($tableName); + if ($table->hasColumn($field) && $table->hasColumn($field . '_copy')) { + $table->dropColumn($field . '_copy'); + } + } + + return $schema; + } + +} + diff --git a/lib/Model/ActivityPub/ACore.php b/lib/Model/ActivityPub/ACore.php index 0a177126..da3c92a8 100644 --- a/lib/Model/ActivityPub/ACore.php +++ b/lib/Model/ActivityPub/ACore.php @@ -468,6 +468,7 @@ class ACore extends Item implements JsonSerializable { case self::AS_STRING: $value = strip_tags($value); + $value = html_entity_decode($value, ENT_QUOTES | ENT_HTML5); return $value; @@ -496,7 +497,7 @@ class ACore extends Item implements JsonSerializable { $this->setId($this->validate(self::AS_ID, 'id', $data, '')); $this->setType($this->validate(self::AS_TYPE, 'type', $data, '')); $this->setUrl($this->validate(self::AS_URL, 'url', $data, '')); - $this->setSummary($this->validate(self::AS_STRING, 'summary', $data, '')); + $this->setSummary($this->get('summary', $data, '')); $this->setToArray($this->validateArray(self::AS_ID, 'to', $data, [])); $this->setCcArray($this->validateArray(self::AS_ID, 'cc', $data, [])); $this->setPublished($this->validate(self::AS_DATE, 'published', $data, '')); @@ -509,15 +510,17 @@ class ACore extends Item implements JsonSerializable { * @param array $data */ public function importFromDatabase(array $data) { - $this->setId($this->get('id', $data, '')); - $this->setType($this->get('type', $data, '')); - $this->setUrl($this->get('url', $data, '')); - $this->setSummary($this->get('summary', $data, '')); - $this->setToArray($this->getArray('to', $data, [])); - $this->setCcArray($this->getArray('cc', $data, [])); - $this->setPublished($this->get('published', $data, '')); - $this->setActorId($this->get('actor_id', $data, '')); - $this->setObjectId($this->get('object_id', $data, '')); + $this->setId($this->validate(self::AS_ID, 'id', $data, '')); + $this->setType($this->validate(self::AS_TYPE, 'type', $data, '')); + $this->setUrl($this->validate(self::AS_URL, 'url', $data, '')); + $this->setSummary($this->validate(self::AS_STRING, 'summary', $data, '')); + $this->setTo($this->validate(self::AS_ID, 'to', $data, '')); + $this->setToArray($this->validateArray(self::AS_ID, 'to_array', $data, [])); + $this->setCcArray($this->validateArray(self::AS_ID, 'cc', $data, [])); + $this->setBccArray($this->validateArray(self::AS_ID, 'bcc', $data, [])); + $this->setPublished($this->validate(self::AS_DATE, 'published', $data, '')); + $this->setActorId($this->validate(self::AS_ID, 'actor_id', $data, '')); + $this->setObjectId($this->validate(self::AS_ID, 'object_id', $data, '')); $this->setSource($this->get('source', $data, '')); $this->setLocal(($this->getInt('local', $data, 0) === 1)); } diff --git a/lib/Model/ActivityPub/Actor/Person.php b/lib/Model/ActivityPub/Actor/Person.php index adb0ce2f..522c1fb7 100644 --- a/ |