From 517ed953f27d18ecaa1ffbdb1f53a245f7f2c2d3 Mon Sep 17 00:00:00 2001 From: Diogo Peralta Cordeiro Date: Mon, 4 Oct 2021 17:00:58 +0100 Subject: [PATCH] [FreeNetwork] First step towards de-duplication mechanism for federation Refactored AS2 inside AP; [ENTITY][Activity] went from core to AP Webfinger plugin will be part of FreeNetwork component --- .../FreeNetwork/Entity/FreenetworkActor.php | 214 ++++++++++++++++++ components/FreeNetwork/FreeNetwork.php | 26 +++ plugins/ActivityPub/ActivityPub.php | 81 ++++++- plugins/ActivityPub/Controller/Inbox.php | 20 +- .../Entity/ActivitypubActivity.php | 66 +++++- .../ActivityPub/Entity/ActivitypubActor.php | 170 ++++++++++++++ .../Util/Model/AS2ToEntity/AS2ToEntity.php | 77 +++++++ .../Util/Model/AS2ToEntity/AS2ToGSActor.php | 4 +- .../Util/Model/AS2ToEntity/AS2ToNote.php | 52 +++++ .../Util/Model/EntityToType/EntityToType.php | 4 +- .../Util/Model/EntityToType/GSActorToType.php | 8 +- .../Util/Model/EntityToType/NoteToType.php | 9 +- .../Util/Response/AbstractResponse.php | 4 +- .../Util/Response/ActorResponse.php | 4 +- .../Util/Response/NoteResponse.php | 4 +- .../Util/Response/TypeResponse.php | 2 +- .../Util/Type.php | 8 +- .../Util/Type/AbstractObject.php | 4 +- .../Util/Type/Core/AbstractActivity.php | 6 +- .../Util/Type/Core/Activity.php | 4 +- .../Util/Type/Core/Collection.php | 4 +- .../Util/Type/Core/CollectionPage.php | 2 +- .../Util/Type/Core/IntransitiveActivity.php | 4 +- .../Util/Type/Core/Link.php | 6 +- .../Util/Type/Core/ObjectType.php | 4 +- .../Util/Type/Core/OrderedCollection.php | 4 +- .../Util/Type/Core/OrderedCollectionPage.php | 4 +- .../Util/Type/Extended/AbstractActor.php | 6 +- .../Util/Type/Extended/Activity/Accept.php | 6 +- .../Util/Type/Extended/Activity/Announce.php | 6 +- .../Util/Type/Extended/Activity/Block.php | 4 +- .../Util/Type/Extended/Activity/Create.php | 6 +- .../Util/Type/Extended/Activity/Delete.php | 6 +- .../Util/Type/Extended/Activity/Follow.php | 6 +- .../Util/Type/Extended/Activity/Ignore.php | 4 +- .../Util/Type/Extended/Activity/Join.php | 6 +- .../Util/Type/Extended/Activity/Leave.php | 6 +- .../Util/Type/Extended/Activity/Like.php | 6 +- .../Util/Type/Extended/Activity/Question.php | 14 +- .../Util/Type/Extended/Activity/Reject.php | 6 +- .../Util/Type/Extended/Activity/Remove.php | 6 +- .../Util/Type/Extended/Activity/Undo.php | 6 +- .../Util/Type/Extended/Activity/Update.php | 6 +- .../Util/Type/Extended/Actor/Application.php | 6 +- .../Util/Type/Extended/Actor/Group.php | 6 +- .../Util/Type/Extended/Actor/Organization.php | 6 +- .../Util/Type/Extended/Actor/Person.php | 6 +- .../Util/Type/Extended/Actor/Service.php | 6 +- .../Util/Type/Extended/Object/Article.php | 6 +- .../Util/Type/Extended/Object/Audio.php | 4 +- .../Util/Type/Extended/Object/Document.php | 6 +- .../Util/Type/Extended/Object/Event.php | 6 +- .../Util/Type/Extended/Object/Image.php | 4 +- .../Util/Type/Extended/Object/Mention.php | 6 +- .../Util/Type/Extended/Object/Note.php | 6 +- .../Util/Type/Extended/Object/Page.php | 4 +- .../Util/Type/Extended/Object/Place.php | 6 +- .../Util/Type/Extended/Object/Profile.php | 6 +- .../Util/Type/Extended/Object/Tombstone.php | 6 +- .../Util/Type/Extended/Object/Video.php | 4 +- .../Util/Type/TypeResolver.php | 4 +- .../Util/Type/Util.php | 8 +- .../Util/Type/Validator.php | 8 +- .../Util/Type/Validator/AccuracyValidator.php | 6 +- .../Util/Type/Validator/ActorValidator.php | 14 +- .../Util/Type/Validator/AltitudeValidator.php | 6 +- .../Util/Type/Validator/AnyOfValidator.php | 10 +- .../Type/Validator/AttachmentValidator.php | 6 +- .../Type/Validator/AttributedToValidator.php | 6 +- .../Util/Type/Validator/AudienceValidator.php | 6 +- .../Util/Type/Validator/BccValidator.php | 6 +- .../Util/Type/Validator/BtoValidator.php | 6 +- .../Util/Type/Validator/CcValidator.php | 6 +- .../Util/Type/Validator/ClosedValidator.php | 10 +- .../Type/Validator/ContentMapValidator.php | 6 +- .../Util/Type/Validator/ContentValidator.php | 6 +- .../Util/Type/Validator/ContextValidator.php | 8 +- .../Util/Type/Validator/CurrentValidator.php | 10 +- .../Util/Type/Validator/DeletedValidator.php | 10 +- .../Type/Validator/DescribesValidator.php | 12 +- .../Util/Type/Validator/DurationValidator.php | 10 +- .../Util/Type/Validator/EndTimeValidator.php | 10 +- .../Type/Validator/EndpointsValidator.php | 10 +- .../Util/Type/Validator/FirstValidator.php | 4 +- .../Type/Validator/FollowersValidator.php | 14 +- .../Type/Validator/FollowingValidator.php | 4 +- .../Type/Validator/FormerTypeValidator.php | 10 +- .../Type/Validator/GeneratorValidator.php | 10 +- .../Util/Type/Validator/HeightValidator.php | 12 +- .../Util/Type/Validator/HrefValidator.php | 12 +- .../Util/Type/Validator/HreflangValidator.php | 10 +- .../Util/Type/Validator/IconValidator.php | 10 +- .../Util/Type/Validator/IdValidator.php | 8 +- .../Util/Type/Validator/ImageValidator.php | 4 +- .../Type/Validator/InReplyToValidator.php | 10 +- .../Util/Type/Validator/InboxValidator.php | 14 +- .../Type/Validator/InstrumentValidator.php | 4 +- .../Util/Type/Validator/ItemsValidator.php | 12 +- .../Util/Type/Validator/LastValidator.php | 4 +- .../Util/Type/Validator/LatitudeValidator.php | 10 +- .../Util/Type/Validator/LikedValidator.php | 4 +- .../Util/Type/Validator/LocationValidator.php | 4 +- .../Type/Validator/LongitudeValidator.php | 10 +- .../Type/Validator/MediaTypeValidator.php | 8 +- .../Util/Type/Validator/NameMapValidator.php | 6 +- .../Util/Type/Validator/NameValidator.php | 8 +- .../Util/Type/Validator/NextValidator.php | 12 +- .../Util/Type/Validator/ObjectValidator.php | 12 +- .../Util/Type/Validator/OneOfValidator.php | 4 +- .../Type/Validator/OrderedItemsValidator.php | 4 +- .../Util/Type/Validator/OriginValidator.php | 10 +- .../Util/Type/Validator/OutboxValidator.php | 4 +- .../Util/Type/Validator/PartOfValidator.php | 12 +- .../Validator/PreferredUsernameValidator.php | 10 +- .../Util/Type/Validator/PrevValidator.php | 4 +- .../Util/Type/Validator/PreviewValidator.php | 12 +- .../Type/Validator/PublishedValidator.php | 4 +- .../Util/Type/Validator/RadiusValidator.php | 10 +- .../Util/Type/Validator/RelValidator.php | 10 +- .../Util/Type/Validator/RepliesValidator.php | 10 +- .../Util/Type/Validator/ResultValidator.php | 4 +- .../Util/Type/Validator/SourceValidator.php | 10 +- .../Type/Validator/StartIndexValidator.php | 10 +- .../Type/Validator/StartTimeValidator.php | 4 +- .../Util/Type/Validator/StreamsValidator.php | 10 +- .../Type/Validator/SummaryMapValidator.php | 6 +- .../Util/Type/Validator/SummaryValidator.php | 10 +- .../Util/Type/Validator/TagValidator.php | 6 +- .../Util/Type/Validator/TargetValidator.php | 4 +- .../Util/Type/Validator/ToValidator.php | 4 +- .../Type/Validator/TotalItemsValidator.php | 10 +- .../Util/Type/Validator/TypeValidator.php | 12 +- .../Util/Type/Validator/UnitsValidator.php | 10 +- .../Util/Type/Validator/UpdatedValidator.php | 4 +- .../Util/Type/Validator/UrlValidator.php | 12 +- .../Util/Type/Validator/WidthValidator.php | 4 +- .../Util/Type/ValidatorInterface.php | 4 +- .../Util/Type/ValidatorTools.php | 12 +- .../ActivityStreamsTwo/ActivityStreamsTwo.php | 66 ------ plugins/ActivityStreamsTwo/README.md | 0 .../Util/Model/AS2ToEntity/AS2ToEntity.php | 21 -- .../Util/Model/AS2ToEntity/AS2ToNote.php | 48 ---- src/Entity/Actor.php | 15 +- src/Entity/Group.php | 2 +- src/Entity/Note.php | 17 +- 145 files changed, 1156 insertions(+), 632 deletions(-) create mode 100644 components/FreeNetwork/Entity/FreenetworkActor.php create mode 100644 components/FreeNetwork/FreeNetwork.php rename src/Entity/Activity.php => plugins/ActivityPub/Entity/ActivitypubActivity.php (55%) create mode 100644 plugins/ActivityPub/Entity/ActivitypubActor.php create mode 100644 plugins/ActivityPub/Util/Model/AS2ToEntity/AS2ToEntity.php rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Model/AS2ToEntity/AS2ToGSActor.php (90%) create mode 100644 plugins/ActivityPub/Util/Model/AS2ToEntity/AS2ToNote.php rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Model/EntityToType/EntityToType.php (82%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Model/EntityToType/GSActorToType.php (88%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Model/EntityToType/NoteToType.php (69%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Response/AbstractResponse.php (79%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Response/ActorResponse.php (81%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Response/NoteResponse.php (83%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Response/TypeResponse.php (92%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type.php (94%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/AbstractObject.php (99%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Core/AbstractActivity.php (93%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Core/Activity.php (88%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Core/Collection.php (94%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Core/CollectionPage.php (96%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Core/IntransitiveActivity.php (83%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Core/Link.php (94%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Core/ObjectType.php (99%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Core/OrderedCollection.php (81%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Core/OrderedCollectionPage.php (88%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/AbstractActor.php (95%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Accept.php (75%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Announce.php (72%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Block.php (83%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Create.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Delete.php (74%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Follow.php (78%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Ignore.php (84%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Join.php (73%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Leave.php (73%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Like.php (74%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Question.php (78%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Reject.php (74%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Remove.php (75%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Undo.php (80%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Activity/Update.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Actor/Application.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Actor/Group.php (72%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Actor/Organization.php (72%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Actor/Person.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Actor/Service.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Object/Article.php (72%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Object/Audio.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Object/Document.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Object/Event.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Object/Image.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Object/Mention.php (72%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Object/Note.php (73%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Object/Page.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Object/Place.php (92%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Object/Profile.php (80%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Object/Tombstone.php (84%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Extended/Object/Video.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/TypeResolver.php (96%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Util.php (98%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator.php (89%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/AccuracyValidator.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/ActorValidator.php (85%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/AltitudeValidator.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/AnyOfValidator.php (78%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/AttachmentValidator.php (81%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/AttributedToValidator.php (79%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/AudienceValidator.php (79%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/BccValidator.php (79%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/BtoValidator.php (79%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/CcValidator.php (79%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/ClosedValidator.php (81%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/ContentMapValidator.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/ContentValidator.php (78%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/ContextValidator.php (80%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/CurrentValidator.php (75%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/DeletedValidator.php (75%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/DescribesValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/DurationValidator.php (75%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/EndTimeValidator.php (73%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/EndpointsValidator.php (84%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/FirstValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/FollowersValidator.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/FollowingValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/FormerTypeValidator.php (74%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/GeneratorValidator.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/HeightValidator.php (70%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/HrefValidator.php (72%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/HreflangValidator.php (72%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/IconValidator.php (86%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/IdValidator.php (73%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/ImageValidator.php (70%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/InReplyToValidator.php (80%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/InboxValidator.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/InstrumentValidator.php (70%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/ItemsValidator.php (81%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/LastValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/LatitudeValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/LikedValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/LocationValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/LongitudeValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/MediaTypeValidator.php (72%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/NameMapValidator.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/NameValidator.php (74%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/NextValidator.php (76%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/ObjectValidator.php (83%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/OneOfValidator.php (70%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/OrderedItemsValidator.php (70%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/OriginValidator.php (79%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/OutboxValidator.php (70%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/PartOfValidator.php (76%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/PreferredUsernameValidator.php (72%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/PrevValidator.php (70%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/PreviewValidator.php (76%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/PublishedValidator.php (70%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/RadiusValidator.php (72%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/RelValidator.php (78%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/RepliesValidator.php (79%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/ResultValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/SourceValidator.php (77%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/StartIndexValidator.php (73%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/StartTimeValidator.php (70%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/StreamsValidator.php (73%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/SummaryMapValidator.php (78%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/SummaryValidator.php (73%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/TagValidator.php (79%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/TargetValidator.php (70%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/ToValidator.php (70%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/TotalItemsValidator.php (73%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/TypeValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/UnitsValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/UpdatedValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/UrlValidator.php (80%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/Validator/WidthValidator.php (71%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/ValidatorInterface.php (74%) rename plugins/{ActivityStreamsTwo => ActivityPub}/Util/Type/ValidatorTools.php (95%) delete mode 100644 plugins/ActivityStreamsTwo/ActivityStreamsTwo.php delete mode 100644 plugins/ActivityStreamsTwo/README.md delete mode 100644 plugins/ActivityStreamsTwo/Util/Model/AS2ToEntity/AS2ToEntity.php delete mode 100644 plugins/ActivityStreamsTwo/Util/Model/AS2ToEntity/AS2ToNote.php diff --git a/components/FreeNetwork/Entity/FreenetworkActor.php b/components/FreeNetwork/Entity/FreenetworkActor.php new file mode 100644 index 0000000000..2b7af84043 --- /dev/null +++ b/components/FreeNetwork/Entity/FreenetworkActor.php @@ -0,0 +1,214 @@ +. + +// }}} + +/** + * WebFinger implementation for GNU social + * + * @package GNUsocial + * + * @author Diogo Peralta Cordeiro actor_uri; + } + + /** + * @param string $actor_uri + */ + public function setActorUri(string $actor_uri): void + { + $this->actor_uri = $actor_uri; + } + + /** + * @return string + */ + public function getSource(): string + { + return $this->source; + } + + /** + * @param string $source + */ + public function setSource(string $source): void + { + $this->source = $source; + } + + /** + * @return int + */ + public function getActorId(): int + { + return $this->actor_id; + } + + /** + * @param int $actor_id + */ + public function setActorId(int $actor_id): void + { + $this->actor_id = $actor_id; + } + + /** + * @return bool + */ + public function isIsLocal(): bool + { + return $this->is_local; + } + + /** + * @param bool $is_local + */ + public function setIsLocal(bool $is_local): void + { + $this->is_local = $is_local; + } + + /** + * @return DateTimeInterface + */ + public function getCreated(): DateTimeInterface + { + return $this->created; + } + + /** + * @param DateTimeInterface $created + */ + public function setCreated(DateTimeInterface $created): void + { + $this->created = $created; + } + + /** + * @return DateTimeInterface + */ + public function getModified(): DateTimeInterface + { + return $this->modified; + } + + /** + * @param DateTimeInterface $modified + */ + public function setModified(DateTimeInterface $modified): void + { + $this->modified = $modified; + } + // @codeCoverageIgnoreEnd + // }}} Autocode + + public static function getOrCreateById($actor_id, $source): self + { + $fnactor = self::getWithPK(['actor_id' => $actor_id, 'source' => $source]); + if ($fnactor === null) { + $actor_uri = null; + Event::handle('FreeNetworkGenerateLocalActorUri', [$source, $actor_id, &$actor_uri]); + $fnactor = self::create([ + 'actor_uri' => $actor_uri, + 'source' => $source, + 'actor_id' => $actor_id, + 'is_local' => true, + ]); + DB::persist($fnactor); + return $fnactor; + } else { + return $fnactor; + } + } + + public static function getOrCreateByUri($actor_uri, $source): self + { + $fnactor = DB::findBy('freenetwork_actor', ['actor_uri' => $actor_uri, 'source' => $source]); + if ($fnactor === []) { + // TODO grab with webfinger + // If already has for a different protocol and isn't local, update + // else create actor and then fnactor + $fnactor = self::create([ + 'actor_uri' => $actor_uri, + 'source' => $source, + 'actor_id' => 1, + 'is_local' => false, + ]); + DB::persist($fnactor); + return $fnactor; + } else { + return $fnactor[0]; + } + } + + public static function schemaDef() + { + return [ + 'name' => 'freenetwork_actor', + 'fields' => [ + 'actor_uri' => ['type' => 'text', 'not null' => true], + 'source' => ['type' => 'varchar', 'not null' => true, 'foreign key' => true, 'length' => 32, 'target' => 'NoteSource.code', 'multiplicity' => 'many to one', 'description' => 'fkey to source of note, like "web", "im", or "clientname"'], + 'actor_id' => ['type' => 'int', 'not null' => true], + 'is_local' => ['type' => 'bool', 'not null' => true, 'description' => 'whether this was a locally generated or an imported actor'], + 'created' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'], + 'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'], + ], + 'primary key' => ['actor_id', 'source'], + 'indexes' => [ + 'freenetwork_actor_uri_idx' => ['actor_uri', 'source'], + ], + 'foreign keys' => [ + 'freenetwork_actor_actor_id_fkey' => ['actor', ['actor_id' => 'id']], + ], + ]; + } +} diff --git a/components/FreeNetwork/FreeNetwork.php b/components/FreeNetwork/FreeNetwork.php new file mode 100644 index 0000000000..bb6689f599 --- /dev/null +++ b/components/FreeNetwork/FreeNetwork.php @@ -0,0 +1,26 @@ +. +// }}} + +namespace Component\FreeNetwork; + +use App\Core\Modules\Component; + +class FreeNetwork extends Component +{ +} \ No newline at end of file diff --git a/plugins/ActivityPub/ActivityPub.php b/plugins/ActivityPub/ActivityPub.php index be52aa026f..d5670e596b 100644 --- a/plugins/ActivityPub/ActivityPub.php +++ b/plugins/ActivityPub/ActivityPub.php @@ -5,9 +5,12 @@ namespace Plugin\ActivityPub; use App\Core\Event; use App\Core\Modules\Plugin; use App\Core\Router\RouteLoader; +use App\Core\Router\Router; use Exception; use Plugin\ActivityPub\Controller\Inbox; -use Plugin\ActivityStreamsTwo\ActivityStreamsTwo; +use Plugin\ActivityPub\Util\Response\ActorResponse; +use Plugin\ActivityPub\Util\Response\NoteResponse; +use Plugin\ActivityPub\Util\Response\TypeResponse; class ActivityPub extends Plugin { @@ -18,7 +21,7 @@ class ActivityPub extends Plugin /** * This code executes when GNU social creates the page routing, and we hook - * on this event to add our action handler for Embed. + * on this event to add our Inbox and Outbox handler for ActivityPub. * * @param RouteLoader $r the router that was initialized. * @@ -30,19 +33,19 @@ class ActivityPub extends Plugin 'activitypub_actor_inbox', '/actor/{gsactor_id<\d+>}/inbox.json', [Inbox::class, 'handle'], - options: ['accept' => ActivityStreamsTwo::$accept_headers] + options: ['accept' => self::$accept_headers] ); $r->connect( 'activitypub_actor_outbox', '/actor/{gsactor_id<\d+>}/outbox.json', [Inbox::class, 'handle'], - options: ['accept' => ActivityStreamsTwo::$accept_headers] + options: ['accept' => self::$accept_headers] ); $r->connect( 'activitypub_inbox', '/inbox.json', [Inbox::class, 'handle'], - options: ['accept' => ActivityStreamsTwo::$accept_headers] + options: ['accept' => self::$accept_headers] ); return Event::next; } @@ -53,19 +56,20 @@ class ActivityPub extends Plugin * @param null|array|string $accept * @param bool $strict Strict mode * - * @throws \Exception when strict mode enabled + * @throws Exception when strict mode enabled * * @return bool + * */ public static function validateAcceptHeader(array|string|null $accept, bool $strict): bool { if (is_string($accept) - && in_array($accept, ActivityStreamsTwo::$accept_headers) + && in_array($accept, self::$accept_headers) ) { return true; } elseif (is_array($accept) && count( - array_intersect($accept, ActivityStreamsTwo::$accept_headers) + array_intersect($accept, self::$accept_headers) ) > 0 ) { return true; @@ -82,4 +86,65 @@ class ActivityPub extends Plugin ) ); } + + public static array $accept_headers = [ + 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', + 'application/activity+json', + 'application/json', + 'application/ld+json', + ]; + + /** + * @param string $route + * @param array $accept_header + * @param array $vars + * @param null|TypeResponse $response + * + * @throws Exception + * + * @return bool + * + * + */ + public function onControllerResponseInFormat(string $route, array $accept_header, array $vars, ?TypeResponse &$response = null): bool + { + if (count(array_intersect(self::$accept_headers, $accept_header)) === 0) { + return Event::next; + } + switch ($route) { + case 'actor_view_id': + case 'actor_view_nickname': + $response = ActorResponse::handle($vars['actor']); + return Event::stop; + case 'note_view': + $response = NoteResponse::handle($vars['note']); + return Event::stop; + /*case 'actor_favourites_id': + case 'actor_favourites_nickname': + $response = LikeResponse::handle($vars['actor']); + return Event::stop; + case 'actor_subscriptions_id': + case 'actor_subscriptions_nickname': + $response = FollowingResponse::handle($vars['actor']); + return Event::stop; + case 'actor_subscribers_id': + case 'actor_subscribers_nickname': + $response = FollowersResponse::handle($vars['actor']); + return Event::stop;*/ + default: + if (Event::handle('ActivityStreamsTwoResponse', [$route, &$response])) { + return Event::stop; + } + return Event::next; + } + } + + public function onFreeNetworkGenerateLocalActorUri(string $source, int $actor_id, ?string &$actor_uri): bool + { + if ($source !== 'ActivityPub') { + return Event::next; + } + $actor_uri = Router::url('actor_view_id', ['id' => $actor_id], Router::ABSOLUTE_URL); + return Event::stop; + } } diff --git a/plugins/ActivityPub/Controller/Inbox.php b/plugins/ActivityPub/Controller/Inbox.php index 77f0472a86..2c2c33fbec 100644 --- a/plugins/ActivityPub/Controller/Inbox.php +++ b/plugins/ActivityPub/Controller/Inbox.php @@ -26,10 +26,10 @@ use App\Core\DB\DB; use function App\Core\I18n\_m; use App\Util\Exception\ClientException; use Plugin\ActivityPub\ActivityPub; -use Plugin\ActivityStreamsTwo\Util\Model\AS2ToEntity\AS2ToEntity; -use Plugin\ActivityStreamsTwo\Util\Response\TypeResponse; -use Plugin\ActivityStreamsTwo\Util\Type; -use Plugin\ActivityStreamsTwo\Util\Type\Util; +use Plugin\ActivityPub\Util\Model\AS2ToEntity\AS2ToEntity; +use Plugin\ActivityPub\Util\Response\TypeResponse; +use Plugin\ActivityPub\Util\Type; +use Plugin\ActivityPub\Util\Type\Util; class Inbox extends Controller { @@ -51,7 +51,7 @@ class Inbox extends Controller true ); - // Check current actor can post + // TODO: Check if Actor can post // Get content $payload = Util::decodeJson( @@ -60,12 +60,12 @@ class Inbox extends Controller // Cast as an ActivityStreams type $type = Type::create($payload); - dd(AS2ToEntity::translate(activity: $type->toArray()['object'], source: 'ActivityPub')); - // $http_signature = new HttpSignature($this->server); - // if ($http_signature->verify($request)) { - // return new Response('', 201); - // } + // TODO: Check if Actor has authority over payload + + // Store Activity + dd(AS2ToEntity::store(activity: $type->toArray(), source: 'ActivityPub')); + DB::flush(); return new TypeResponse($type, status: 202); } diff --git a/src/Entity/Activity.php b/plugins/ActivityPub/Entity/ActivitypubActivity.php similarity index 55% rename from src/Entity/Activity.php rename to plugins/ActivityPub/Entity/ActivitypubActivity.php index de92c2a79d..9f8473fb38 100644 --- a/src/Entity/Activity.php +++ b/plugins/ActivityPub/Entity/ActivitypubActivity.php @@ -19,7 +19,7 @@ // }}} -namespace App\Entity; +namespace Plugin\ActivityPub\Entity; use App\Core\DB\DB; use App\Core\Entity; @@ -32,21 +32,25 @@ use DateTimeInterface; * @package GNUsocial * * @author Hugo Sales + * @author Diogo Peralta Cordeiro * @copyright 2020-2021 Free Software Foundation, Inc http://www.fsf.org * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activity extends Entity +class ActivitypubActivity extends Entity { // {{{ Autocode // @codeCoverageIgnoreStart private int $id; + private string $activity_uri; private int $actor_id; private string $verb; private string $object_type; private int $object_id; + private string $object_uri; private bool $is_local; private ?string $source; private \DateTimeInterface $created; + private \DateTimeInterface $modified; public function setId(int $id): self { @@ -59,6 +63,17 @@ class Activity extends Entity return $this->id; } + public function getActivityUri(): string + { + return $this->activity_uri; + } + + public function setActivityUri(string $activity_uri): self + { + $this->activity_uri = $activity_uri; + return $this; + } + public function setActorId(int $actor_id): self { $this->actor_id = $actor_id; @@ -103,6 +118,17 @@ class Activity extends Entity return $this->object_id; } + public function getObjectUri(): string + { + return $this->object_uri; + } + + public function setObjectUri(string $object_uri): self + { + $this->object_uri = $object_uri; + return $this; + } + public function setIsLocal(bool $is_local): self { $this->is_local = $is_local; @@ -136,24 +162,42 @@ class Activity extends Entity return $this->created; } + public function setModified(DateTimeInterface $modified): self + { + $this->modified = $modified; + return $this; + } + + public function getModified(): DateTimeInterface + { + return $this->modified; + } + // @codeCoverageIgnoreEnd // }}} Autocode public static function schemaDef(): array { return [ - 'name' => 'activity', + 'name' => 'activitypub_activity', 'fields' => [ - 'id' => ['type' => 'serial', 'not null' => true], - 'actor_id' => ['type' => 'int', 'not null' => true, 'description' => 'foreign key to actor table'], - 'verb' => ['type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'internal activity verb, influenced by activity pub verbs'], - 'object_type' => ['type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'the name of the table this object refers to'], - 'object_id' => ['type' => 'int', 'not null' => true, 'description' => 'id in the referenced table'], - 'is_local' => ['type' => 'bool', 'not null' => true, 'description' => 'whether this was a locally generated or an imported activity'], - 'source' => ['type' => 'varchar', 'length' => 32, 'description' => 'the source of this activity'], - 'created' => ['type' => 'datetime', 'not null' => true, 'description' => 'date this record was created', 'default' => 'CURRENT_TIMESTAMP'], + 'id' => ['type' => 'serial', 'not null' => true], + 'activity_uri' => ['type' => 'text', 'not null' => true, 'description' => 'Activity\'s URI'], + 'actor_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'who made the note'], + 'verb' => ['type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'internal activity verb, influenced by activity pub verbs'], + 'object_type' => ['type' => 'varchar', 'length' => 32, 'description' => 'the name of the table this object refers to'], + 'object_id' => ['type' => 'int', 'description' => 'id in the referenced table'], + 'object_uri' => ['type' => 'text', 'not null' => true, 'description' => 'Object\'s URI'], + 'is_local' => ['type' => 'bool', 'not null' => true, 'description' => 'whether this was a locally generated or an imported activity'], + 'source' => ['type' => 'varchar', 'length' => 32, 'description' => 'the source of this activity'], + 'created' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'], + 'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'], ], 'primary key' => ['id'], + 'indexes' => [ + 'activity_activity_uri_idx' => ['activity_uri'], + 'activity_object_uri_idx' => ['object_uri'], + ], ]; } } diff --git a/plugins/ActivityPub/Entity/ActivitypubActor.php b/plugins/ActivityPub/Entity/ActivitypubActor.php new file mode 100644 index 0000000000..602f549282 --- /dev/null +++ b/plugins/ActivityPub/Entity/ActivitypubActor.php @@ -0,0 +1,170 @@ +. + +// }}} + +/** + * ActivityPub implementation for GNU social + * + * @package GNUsocial + * + * @author Diogo Peralta Cordeiro uri; + } + + /** + * @param string $uri + */ + public function setUri(string $uri): void + { + $this->uri = $uri; + } + + /** + * @return int + */ + public function getActorId(): int + { + return $this->actor_id; + } + + /** + * @param int $actor_id + */ + public function setActorId(int $actor_id): void + { + $this->actor_id = $actor_id; + } + + /** + * @return string + */ + public function getInboxUri(): string + { + return $this->inbox_uri; + } + + /** + * @param string $inbox_uri + */ + public function setInboxUri(string $inbox_uri): void + { + $this->inbox_uri = $inbox_uri; + } + + /** + * @return string + */ + public function getInboxSharedUri(): string + { + return $this->inbox_shared_uri; + } + + /** + * @param string $inbox_shared_uri + */ + public function setInboxSharedUri(string $inbox_shared_uri): void + { + $this->inbox_shared_uri = $inbox_shared_uri; + } + + /** + * @return DateTimeInterface + */ + public function getCreated(): DateTimeInterface + { + return $this->created; + } + + /** + * @param DateTimeInterface $created + */ + public function setCreated(DateTimeInterface $created): void + { + $this->created = $created; + } + + /** + * @return DateTimeInterface + */ + public function getModified(): DateTimeInterface + { + return $this->modified; + } + + /** + * @param DateTimeInterface $modified + */ + public function setModified(DateTimeInterface $modified): void + { + $this->modified = $modified; + } + // @codeCoverageIgnoreEnd + // }}} Autocode + + public static function schemaDef() + { + return [ + 'name' => 'activitypub_actor', + 'fields' => [ + 'uri' => ['type' => 'text', 'not null' => true], + 'actor_id' => ['type' => 'int', 'not null' => true], + 'inbox_uri' => ['type' => 'text', 'not null' => true], + 'inbox_shared_uri' => ['type' => 'text'], + 'created' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'], + 'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'], + ], + 'primary key' => ['actor_id'], + 'foreign keys' => [ + 'activitypub_actor_actor_id_fkey' => ['actor', ['actor_id' => 'id']], + ], + ]; + } +} diff --git a/plugins/ActivityPub/Util/Model/AS2ToEntity/AS2ToEntity.php b/plugins/ActivityPub/Util/Model/AS2ToEntity/AS2ToEntity.php new file mode 100644 index 0000000000..fd681eee46 --- /dev/null +++ b/plugins/ActivityPub/Util/Model/AS2ToEntity/AS2ToEntity.php @@ -0,0 +1,77 @@ + 'create', + default => throw new ClientException('Invalid verb'), + }; + } + + public static function activity_stream_two_object_type_to_gs_table($verb) + { + return match ($verb) { + 'Note' => 'note', + default => throw new ClientException('Invalid verb'), + }; + } + + /** + * @param array $activity + * @param null|string $source + * + * @throws ClientException + * + * @return array + */ + public static function store(array $activity, ?string $source = null): array + { + $map = [ + 'activity_uri' => $activity['id'], + 'actor_id' => FreenetworkActor::getOrCreateByUri(actor_uri: $activity['actor'], source: 'ActivityPub')->getActorId(), + 'verb' => self::activity_stream_two_verb_to_gs_verb($activity['type']), + 'object_type' => self::activity_stream_two_object_type_to_gs_table($activity['object']['type']), + 'object_uri' => $activity['object']['id'], + 'is_local' => false, + 'created' => new DateTime($activity['published'] ?? 'now'), + 'modified' => new DateTime(), + 'source' => $source, + ]; + + $act = new ActivitypubActivity(); + foreach ($map as $prop => $val) { + $set = Formatting::snakeCaseToCamelCase("set_{$prop}"); + $act->{$set}($val); + } + + $obj = null; + switch ($activity['object']['type']) { + case'Note': + $obj = AS2ToNote::translate($activity['object'], $source); + break; + default: + if (!Event::handle('ActivityPubObject', [$activity['object']['type'], $activity['object'], &$obj])) { + throw new ClientException('Unsupported Object type.'); + } + break; + } + + DB::persist($obj); + $act->setObjectId($obj->getId()); + DB::persist($act); + + return [$act, $obj]; + } +} \ No newline at end of file diff --git a/plugins/ActivityStreamsTwo/Util/Model/AS2ToEntity/AS2ToGSActor.php b/plugins/ActivityPub/Util/Model/AS2ToEntity/AS2ToGSActor.php similarity index 90% rename from plugins/ActivityStreamsTwo/Util/Model/AS2ToEntity/AS2ToGSActor.php rename to plugins/ActivityPub/Util/Model/AS2ToEntity/AS2ToGSActor.php index 89f06687be..97be862372 100644 --- a/plugins/ActivityStreamsTwo/Util/Model/AS2ToEntity/AS2ToGSActor.php +++ b/plugins/ActivityPub/Util/Model/AS2ToEntity/AS2ToGSActor.php @@ -1,6 +1,6 @@ getActorId(); + $map = [ + 'is_local' => false, + 'created' => new DateTime($object['published'] ?? 'now'), + 'content' => $object['content'] ?? null, + 'content_type' => 'text/html', + 'url' => array_key_exists('url', $object) ? $object['url'] : $object['id'], + 'actor_id' => $actor_id, + 'modified' => new DateTime(), + 'source' => $source, + ]; + if ($map['content'] !== null) { + Event::handle('RenderNoteContent', [ + $map['content'], + $map['content_type'], + &$map['rendered'], + Actor::getById($actor_id), + null, // TODO reply to + ]); + } + + $obj = new Note(); + foreach ($map as $prop => $val) { + $set = Formatting::snakeCaseToCamelCase("set_{$prop}"); + $obj->{$set}($val); + } + return $obj; + } +} \ No newline at end of file diff --git a/plugins/ActivityStreamsTwo/Util/Model/EntityToType/EntityToType.php b/plugins/ActivityPub/Util/Model/EntityToType/EntityToType.php similarity index 82% rename from plugins/ActivityStreamsTwo/Util/Model/EntityToType/EntityToType.php rename to plugins/ActivityPub/Util/Model/EntityToType/EntityToType.php index ea157dd2fe..03345f61d9 100644 --- a/plugins/ActivityStreamsTwo/Util/Model/EntityToType/EntityToType.php +++ b/plugins/ActivityPub/Util/Model/EntityToType/EntityToType.php @@ -1,9 +1,9 @@ $gsactor->getId()], Router::ABSOLUTE_URL); + $uri = null; + Event::handle('FreeNetworkGenerateLocalActorUri', ['source' => 'ActivityPub', 'actor_id' => $gsactor->getId(), 'actor_uri' => &$attributedTo]); $attr = [ '@context' => 'https://www.w3.org/ns/activitystreams', 'id' => $uri, diff --git a/plugins/ActivityStreamsTwo/Util/Model/EntityToType/NoteToType.php b/plugins/ActivityPub/Util/Model/EntityToType/NoteToType.php similarity index 69% rename from plugins/ActivityStreamsTwo/Util/Model/EntityToType/NoteToType.php rename to plugins/ActivityPub/Util/Model/EntityToType/NoteToType.php index 61458ea6a3..b6508ce65a 100644 --- a/plugins/ActivityStreamsTwo/Util/Model/EntityToType/NoteToType.php +++ b/plugins/ActivityPub/Util/Model/EntityToType/NoteToType.php @@ -1,11 +1,12 @@ 'ActivityPub', 'actor_id' => $note->getActorId(), 'actor_uri' => &$attributedTo]); $attr = [ '@context' => 'https://www.w3.org/ns/activitystreams', 'id' => Router::url('note_view', ['id' => $note->getId()], Router::ABSOLUTE_URL), 'published' => $note->getCreated()->format(DateTimeInterface::RFC3339), - 'attributedTo' => Router::url('actor_view_id', ['id' => $note->getActorId()], Router::ABSOLUTE_URL), + 'attributedTo' => $attributedTo, //'to' => $to, //'cc' => $cc, 'content' => json_encode($note->getRendered()), diff --git a/plugins/ActivityStreamsTwo/Util/Response/AbstractResponse.php b/plugins/ActivityPub/Util/Response/AbstractResponse.php similarity index 79% rename from plugins/ActivityStreamsTwo/Util/Response/AbstractResponse.php rename to plugins/ActivityPub/Util/Response/AbstractResponse.php index 1978f36aea..6256332f29 100644 --- a/plugins/ActivityStreamsTwo/Util/Response/AbstractResponse.php +++ b/plugins/ActivityPub/Util/Response/AbstractResponse.php @@ -1,8 +1,8 @@ . */ -namespace Plugin\ActivityStreamsTwo\Util; +namespace Plugin\ActivityPub\Util; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\AbstractObject; -use Plugin\ActivityStreamsTwo\Util\Type\TypeResolver; -use Plugin\ActivityStreamsTwo\Util\Type\Validator; +use Plugin\ActivityPub\Util\Type\AbstractObject; +use Plugin\ActivityPub\Util\Type\TypeResolver; +use Plugin\ActivityPub\Util\Type\Validator; /** * \ActivityPhp\Type is a Factory for ActivityStreams 2.0 types. diff --git a/plugins/ActivityStreamsTwo/Util/Type/AbstractObject.php b/plugins/ActivityPub/Util/Type/AbstractObject.php similarity index 99% rename from plugins/ActivityStreamsTwo/Util/Type/AbstractObject.php rename to plugins/ActivityPub/Util/Type/AbstractObject.php index cada7d4492..8dede2262a 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/AbstractObject.php +++ b/plugins/ActivityPub/Util/Type/AbstractObject.php @@ -9,11 +9,11 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type; +namespace Plugin\ActivityPub\Util\Type; use function array_key_exists; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type; +use Plugin\ActivityPub\Util\Type; use ReflectionClass; /** diff --git a/plugins/ActivityStreamsTwo/Util/Type/Core/AbstractActivity.php b/plugins/ActivityPub/Util/Type/Core/AbstractActivity.php similarity index 93% rename from plugins/ActivityStreamsTwo/Util/Type/Core/AbstractActivity.php rename to plugins/ActivityPub/Util/Type/Core/AbstractActivity.php index 1636128dc5..786930b644 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Core/AbstractActivity.php +++ b/plugins/ActivityPub/Util/Type/Core/AbstractActivity.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Core; +namespace Plugin\ActivityPub\Util\Type\Core; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Core\AbstractActivity implements only common + * \Plugin\ActivityPub\Util\Type\Core\AbstractActivity implements only common * attributes between Activity and IntransitiveActivity. * * It SHOULD NOT be used as if. @@ -38,7 +38,7 @@ abstract class AbstractActivity extends ObjectType * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-actor * * @var string - * | \Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor + * | \Plugin\ActivityPub\Util\Type\Extended\AbstractActor * | array * | array * | Link diff --git a/plugins/ActivityStreamsTwo/Util/Type/Core/Activity.php b/plugins/ActivityPub/Util/Type/Core/Activity.php similarity index 88% rename from plugins/ActivityStreamsTwo/Util/Type/Core/Activity.php rename to plugins/ActivityPub/Util/Type/Core/Activity.php index 8d9219ff48..38b944b366 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Core/Activity.php +++ b/plugins/ActivityPub/Util/Type/Core/Activity.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Core; +namespace Plugin\ActivityPub\Util\Type\Core; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Core\Activity is an implementation of one of the + * \Plugin\ActivityPub\Util\Type\Core\Activity is an implementation of one of the * Activity Streams Core Types. * * Activity objects are specializations of the base Object type that diff --git a/plugins/ActivityStreamsTwo/Util/Type/Core/Collection.php b/plugins/ActivityPub/Util/Type/Core/Collection.php similarity index 94% rename from plugins/ActivityStreamsTwo/Util/Type/Core/Collection.php rename to plugins/ActivityPub/Util/Type/Core/Collection.php index f26410a895..dda594488e 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Core/Collection.php +++ b/plugins/ActivityPub/Util/Type/Core/Collection.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Core; +namespace Plugin\ActivityPub\Util\Type\Core; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Core\Collection is an implementation of one of the + * \Plugin\ActivityPub\Util\Type\Core\Collection is an implementation of one of the * Activity Streams Core Types. * * Collection objects are a specialization of the base Object that serve diff --git a/plugins/ActivityStreamsTwo/Util/Type/Core/CollectionPage.php b/plugins/ActivityPub/Util/Type/Core/CollectionPage.php similarity index 96% rename from plugins/ActivityStreamsTwo/Util/Type/Core/CollectionPage.php rename to plugins/ActivityPub/Util/Type/Core/CollectionPage.php index beeb243d54..9a44328d84 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Core/CollectionPage.php +++ b/plugins/ActivityPub/Util/Type/Core/CollectionPage.php @@ -9,7 +9,7 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Core; +namespace Plugin\ActivityPub\Util\Type\Core; /** * CollectionPage is an implementation of one diff --git a/plugins/ActivityStreamsTwo/Util/Type/Core/IntransitiveActivity.php b/plugins/ActivityPub/Util/Type/Core/IntransitiveActivity.php similarity index 83% rename from plugins/ActivityStreamsTwo/Util/Type/Core/IntransitiveActivity.php rename to plugins/ActivityPub/Util/Type/Core/IntransitiveActivity.php index 7dd68ded16..e708683be2 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Core/IntransitiveActivity.php +++ b/plugins/ActivityPub/Util/Type/Core/IntransitiveActivity.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Core; +namespace Plugin\ActivityPub\Util\Type\Core; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Core\IntransitiveActivity is an implementation of + * \Plugin\ActivityPub\Util\Type\Core\IntransitiveActivity is an implementation of * one of the Activity Streams Core Types. * * IntransitiveActivity objects are specializations of the Activity type diff --git a/plugins/ActivityStreamsTwo/Util/Type/Core/Link.php b/plugins/ActivityPub/Util/Type/Core/Link.php similarity index 94% rename from plugins/ActivityStreamsTwo/Util/Type/Core/Link.php rename to plugins/ActivityPub/Util/Type/Core/Link.php index 122e55cd77..c3860c1b5a 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Core/Link.php +++ b/plugins/ActivityPub/Util/Type/Core/Link.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Core; +namespace Plugin\ActivityPub\Util\Type\Core; -use Plugin\ActivityStreamsTwo\Util\Type\AbstractObject; +use Plugin\ActivityPub\Util\Type\AbstractObject; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Core\Link is an implementation of one of the + * \Plugin\ActivityPub\Util\Type\Core\Link is an implementation of one of the * Activity Streams Core Types. * * A Link describes a qualified, indirect reference to another resource. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Core/ObjectType.php b/plugins/ActivityPub/Util/Type/Core/ObjectType.php similarity index 99% rename from plugins/ActivityStreamsTwo/Util/Type/Core/ObjectType.php rename to plugins/ActivityPub/Util/Type/Core/ObjectType.php index 2d3f1538ad..624f4cc9e1 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Core/ObjectType.php +++ b/plugins/ActivityPub/Util/Type/Core/ObjectType.php @@ -9,9 +9,9 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Core; +namespace Plugin\ActivityPub\Util\Type\Core; -use Plugin\ActivityStreamsTwo\Util\Type\AbstractObject; +use Plugin\ActivityPub\Util\Type\AbstractObject; /** * ObjectType is an implementation of one of the diff --git a/plugins/ActivityStreamsTwo/Util/Type/Core/OrderedCollection.php b/plugins/ActivityPub/Util/Type/Core/OrderedCollection.php similarity index 81% rename from plugins/ActivityStreamsTwo/Util/Type/Core/OrderedCollection.php rename to plugins/ActivityPub/Util/Type/Core/OrderedCollection.php index 7d58ae708a..c2c65cedf9 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Core/OrderedCollection.php +++ b/plugins/ActivityPub/Util/Type/Core/OrderedCollection.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Core; +namespace Plugin\ActivityPub\Util\Type\Core; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Core\OrderedCollection is an implementation of one + * \Plugin\ActivityPub\Util\Type\Core\OrderedCollection is an implementation of one * of the Activity Streams Core Types. * * A subtype of Collection in which members of the logical collection diff --git a/plugins/ActivityStreamsTwo/Util/Type/Core/OrderedCollectionPage.php b/plugins/ActivityPub/Util/Type/Core/OrderedCollectionPage.php similarity index 88% rename from plugins/ActivityStreamsTwo/Util/Type/Core/OrderedCollectionPage.php rename to plugins/ActivityPub/Util/Type/Core/OrderedCollectionPage.php index 86b5e76217..e2bdd60e83 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Core/OrderedCollectionPage.php +++ b/plugins/ActivityPub/Util/Type/Core/OrderedCollectionPage.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Core; +namespace Plugin\ActivityPub\Util\Type\Core; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Core\OrderedCollection is an implementation of one + * \Plugin\ActivityPub\Util\Type\Core\OrderedCollection is an implementation of one * of the Activity Streams Core Types. * * The OrderedCollectionPage type extends from both CollectionPage and diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/AbstractActor.php b/plugins/ActivityPub/Util/Type/Extended/AbstractActor.php similarity index 95% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/AbstractActor.php rename to plugins/ActivityPub/Util/Type/Extended/AbstractActor.php index 35fb4f27a6..3d7f6ba8e4 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/AbstractActor.php +++ b/plugins/ActivityPub/Util/Type/Extended/AbstractActor.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended; +namespace Plugin\ActivityPub\Util\Type\Extended; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Core\OrderedCollection; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Core\OrderedCollection; /** * \ActivityPhp\Type\Extended\AbstractActor is an abstract class that diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Accept.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Accept.php similarity index 75% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Accept.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Accept.php index 4121e52222..ca0e89d2ae 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Accept.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Accept.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Accept is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Accept is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor accepts the object. The target property can diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Announce.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Announce.php similarity index 72% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Announce.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Announce.php index 25b2f5984f..02289f1b18 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Announce.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Announce.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Announce is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Announce is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor is calling the target's attention the diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Block.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Block.php similarity index 83% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Block.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Block.php index 947a6ff15b..5092380ee5 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Block.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Block.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Block is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Block is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor is blocking the object. Blocking is a diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Create.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Create.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Create.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Create.php index 15f63dd924..40b36847ba 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Create.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Create.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Create is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Create is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor has created the object. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Delete.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Delete.php similarity index 74% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Delete.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Delete.php index cd6f74eb52..91fca26e08 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Delete.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Delete.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Delete is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Delete is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor has deleted the object. If specified, the diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Follow.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Follow.php similarity index 78% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Follow.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Follow.php index e10a9b7e84..44ef20c3d3 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Follow.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Follow.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Follow is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Follow is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor is "following" the object. Following is diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Ignore.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Ignore.php similarity index 84% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Ignore.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Ignore.php index ab203f2a55..4d97d7605f 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Ignore.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Ignore.php @@ -9,9 +9,9 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** * \ActivityPhp\Type\Extended\Activity\Ignore is an implementation of diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Join.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Join.php similarity index 73% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Join.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Join.php index 11f7b27ace..f16ccf178f 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Join.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Join.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Join is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Join is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor has joined the object. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Leave.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Leave.php similarity index 73% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Leave.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Leave.php index 5ab7e1c344..4d07979d7e 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Leave.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Leave.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Leave is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Leave is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor has left the object. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Like.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Like.php similarity index 74% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Like.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Like.php index 98f3b14fb3..52e08c0956 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Like.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Like.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Like is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Like is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor likes, recommends or endorses the object. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Question.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Question.php similarity index 78% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Question.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Question.php index 87f72453bd..d19c85aa04 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Question.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Question.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\IntransitiveActivity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Core\IntransitiveActivity; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Question is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Question is an implementation of * one of the Activity Streams Extended Types. * * Represents a question being asked. Question objects are an extension @@ -43,7 +43,7 @@ class Question extends IntransitiveActivity * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-oneof * * @var array - * | array<\Plugin\ActivityStreamsTwo\Util\Type\Core\Link> + * | array<\Plugin\ActivityPub\Util\Type\Core\Link> * | null */ protected array $oneOf; @@ -55,7 +55,7 @@ class Question extends IntransitiveActivity * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-anyof * * @var array - * | array<\Plugin\ActivityStreamsTwo\Util\Type\Core\Link> + * | array<\Plugin\ActivityPub\Util\Type\Core\Link> * | null */ protected array $anyOf; @@ -67,7 +67,7 @@ class Question extends IntransitiveActivity * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-closed * * @var ObjectType - * | \Plugin\ActivityStreamsTwo\Util\Type\Core\Link + * | \Plugin\ActivityPub\Util\Type\Core\Link * | \DateTime * | bool * | null diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Reject.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Reject.php similarity index 74% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Reject.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Reject.php index 6d7e2c7ac6..76ad50162c 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Reject.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Reject.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Reject is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Reject is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor is rejecting the object. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Remove.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Remove.php similarity index 75% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Remove.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Remove.php index 2d536ce88f..cc5bac00c4 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Remove.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Remove.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Remove is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Remove is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor is removing the object. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Undo.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Undo.php similarity index 80% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Undo.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Undo.php index 38c95d225d..5b8cac0a39 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Undo.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Undo.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Undo is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Undo is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor is undoing the object. In most cases, the diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Update.php b/plugins/ActivityPub/Util/Type/Extended/Activity/Update.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Update.php rename to plugins/ActivityPub/Util/Type/Extended/Activity/Update.php index 0ec743e904..d932eeb01c 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Activity/Update.php +++ b/plugins/ActivityPub/Util/Type/Extended/Activity/Update.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity; +namespace Plugin\ActivityPub\Util\Type\Extended\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\Activity; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Update is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Activity\Update is an implementation of * one of the Activity Streams Extended Types. * * Indicates that the actor has updated the object. Note, however, that diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Application.php b/plugins/ActivityPub/Util/Type/Extended/Actor/Application.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Application.php rename to plugins/ActivityPub/Util/Type/Extended/Actor/Application.php index c1a969a0b0..a9c0fecde7 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Application.php +++ b/plugins/ActivityPub/Util/Type/Extended/Actor/Application.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Actor; +namespace Plugin\ActivityPub\Util\Type\Extended\Actor; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor; +use Plugin\ActivityPub\Util\Type\Extended\AbstractActor; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Actor\Application is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Actor\Application is an implementation of * one of the Activity Streams Extended Types. * * Describes a software application. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Group.php b/plugins/ActivityPub/Util/Type/Extended/Actor/Group.php similarity index 72% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Group.php rename to plugins/ActivityPub/Util/Type/Extended/Actor/Group.php index d3b275de30..ac1257e88f 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Group.php +++ b/plugins/ActivityPub/Util/Type/Extended/Actor/Group.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Actor; +namespace Plugin\ActivityPub\Util\Type\Extended\Actor; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor; +use Plugin\ActivityPub\Util\Type\Extended\AbstractActor; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Actor\Group is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Actor\Group is an implementation of * one of the Activity Streams Extended Types. * * Represents a formal or informal collective of Actors. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Organization.php b/plugins/ActivityPub/Util/Type/Extended/Actor/Organization.php similarity index 72% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Organization.php rename to plugins/ActivityPub/Util/Type/Extended/Actor/Organization.php index 70dfc2239e..558ed77b31 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Organization.php +++ b/plugins/ActivityPub/Util/Type/Extended/Actor/Organization.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Actor; +namespace Plugin\ActivityPub\Util\Type\Extended\Actor; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor; +use Plugin\ActivityPub\Util\Type\Extended\AbstractActor; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Actor\Organization is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Actor\Organization is an implementation of * one of the Activity Streams Extended Types. * * Represents a formal or informal collective of Actors. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Person.php b/plugins/ActivityPub/Util/Type/Extended/Actor/Person.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Person.php rename to plugins/ActivityPub/Util/Type/Extended/Actor/Person.php index 396167adf6..d14ed1e41f 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Person.php +++ b/plugins/ActivityPub/Util/Type/Extended/Actor/Person.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Actor; +namespace Plugin\ActivityPub\Util\Type\Extended\Actor; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor; +use Plugin\ActivityPub\Util\Type\Extended\AbstractActor; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Actor\Person is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Actor\Person is an implementation of * one of the Activity Streams Extended Types. * * Represents an individual person. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Service.php b/plugins/ActivityPub/Util/Type/Extended/Actor/Service.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Service.php rename to plugins/ActivityPub/Util/Type/Extended/Actor/Service.php index 82d51cde4f..321f067cd5 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Actor/Service.php +++ b/plugins/ActivityPub/Util/Type/Extended/Actor/Service.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Actor; +namespace Plugin\ActivityPub\Util\Type\Extended\Actor; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor; +use Plugin\ActivityPub\Util\Type\Extended\AbstractActor; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Actor\Service is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Actor\Service is an implementation of * one of the Activity Streams Extended Types. * * Represents a service of any kind. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Article.php b/plugins/ActivityPub/Util/Type/Extended/Object/Article.php similarity index 72% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Article.php rename to plugins/ActivityPub/Util/Type/Extended/Object/Article.php index 4723731905..71a62a4488 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Article.php +++ b/plugins/ActivityPub/Util/Type/Extended/Object/Article.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Object; +namespace Plugin\ActivityPub\Util\Type\Extended\Object; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Article is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Object\Article is an implementation of * one of the Activity Streams Extended Types. * * Represents any kind of multi-paragraph written work. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Audio.php b/plugins/ActivityPub/Util/Type/Extended/Object/Audio.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Audio.php rename to plugins/ActivityPub/Util/Type/Extended/Object/Audio.php index 4215f4a9e0..52b1efa9b9 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Audio.php +++ b/plugins/ActivityPub/Util/Type/Extended/Object/Audio.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Object; +namespace Plugin\ActivityPub\Util\Type\Extended\Object; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Audio is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Object\Audio is an implementation of * one of the Activity Streams Extended Types. * * Represents a document of any kind. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Document.php b/plugins/ActivityPub/Util/Type/Extended/Object/Document.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Document.php rename to plugins/ActivityPub/Util/Type/Extended/Object/Document.php index 4b57cacea7..af57a09c94 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Document.php +++ b/plugins/ActivityPub/Util/Type/Extended/Object/Document.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Object; +namespace Plugin\ActivityPub\Util\Type\Extended\Object; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Document is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Object\Document is an implementation of * one of the Activity Streams Extended Types. * * Represents an audio document of any kind. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Event.php b/plugins/ActivityPub/Util/Type/Extended/Object/Event.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Event.php rename to plugins/ActivityPub/Util/Type/Extended/Object/Event.php index 757e2d7096..2398c158d2 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Event.php +++ b/plugins/ActivityPub/Util/Type/Extended/Object/Event.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Object; +namespace Plugin\ActivityPub\Util\Type\Extended\Object; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Event is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Object\Event is an implementation of * one of the Activity Streams Extended Types. * * Represents any kind of event. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Image.php b/plugins/ActivityPub/Util/Type/Extended/Object/Image.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Image.php rename to plugins/ActivityPub/Util/Type/Extended/Object/Image.php index 02328e18a3..76f829c862 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Image.php +++ b/plugins/ActivityPub/Util/Type/Extended/Object/Image.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Object; +namespace Plugin\ActivityPub\Util\Type\Extended\Object; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Image is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Object\Image is an implementation of * one of the Activity Streams Extended Types. * * An image document of any kind. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Mention.php b/plugins/ActivityPub/Util/Type/Extended/Object/Mention.php similarity index 72% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Mention.php rename to plugins/ActivityPub/Util/Type/Extended/Object/Mention.php index 54cbc23d08..b08dfba2ea 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Mention.php +++ b/plugins/ActivityPub/Util/Type/Extended/Object/Mention.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Object; +namespace Plugin\ActivityPub\Util\Type\Extended\Object; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Link; +use Plugin\ActivityPub\Util\Type\Core\Link; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Mention is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Object\Mention is an implementation of * one of the Activity Streams Extended Types. * * A specialized Link that represents an @mention. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Note.php b/plugins/ActivityPub/Util/Type/Extended/Object/Note.php similarity index 73% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Note.php rename to plugins/ActivityPub/Util/Type/Extended/Object/Note.php index 1f1c6203ea..802e7305b3 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Note.php +++ b/plugins/ActivityPub/Util/Type/Extended/Object/Note.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Object; +namespace Plugin\ActivityPub\Util\Type\Extended\Object; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Note is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Object\Note is an implementation of * one of the Activity Streams Extended Types. * * Represents a short written work typically less than a single diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Page.php b/plugins/ActivityPub/Util/Type/Extended/Object/Page.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Page.php rename to plugins/ActivityPub/Util/Type/Extended/Object/Page.php index 9ccf8acee0..2905d2b91b 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Page.php +++ b/plugins/ActivityPub/Util/Type/Extended/Object/Page.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Object; +namespace Plugin\ActivityPub\Util\Type\Extended\Object; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Page is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Object\Page is an implementation of * one of the Activity Streams Extended Types. * * Represents a Web Page. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Place.php b/plugins/ActivityPub/Util/Type/Extended/Object/Place.php similarity index 92% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Place.php rename to plugins/ActivityPub/Util/Type/Extended/Object/Place.php index 79a016f140..0d55c5790d 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Place.php +++ b/plugins/ActivityPub/Util/Type/Extended/Object/Place.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Object; +namespace Plugin\ActivityPub\Util\Type\Extended\Object; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Place is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Object\Place is an implementation of * one of the Activity Streams Extended Types. * * Represents a logical or physical location. diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Profile.php b/plugins/ActivityPub/Util/Type/Extended/Object/Profile.php similarity index 80% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Profile.php rename to plugins/ActivityPub/Util/Type/Extended/Object/Profile.php index 23bfad8f78..3f63d39121 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Profile.php +++ b/plugins/ActivityPub/Util/Type/Extended/Object/Profile.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Object; +namespace Plugin\ActivityPub\Util\Type\Extended\Object; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Profile is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Object\Profile is an implementation of * one of the Activity Streams Extended Types. * * A Profile is a content object that describes another Object, diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Tombstone.php b/plugins/ActivityPub/Util/Type/Extended/Object/Tombstone.php similarity index 84% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Tombstone.php rename to plugins/ActivityPub/Util/Type/Extended/Object/Tombstone.php index b8757f9959..d16acd8901 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Tombstone.php +++ b/plugins/ActivityPub/Util/Type/Extended/Object/Tombstone.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Object; +namespace Plugin\ActivityPub\Util\Type\Extended\Object; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Tombstone is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Object\Tombstone is an implementation of * one of the Activity Streams Extended Types. * * A Tombstone represents a content object that has been deleted. It can diff --git a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Video.php b/plugins/ActivityPub/Util/Type/Extended/Object/Video.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Video.php rename to plugins/ActivityPub/Util/Type/Extended/Object/Video.php index c1c24a347e..39f2c96e3a 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Extended/Object/Video.php +++ b/plugins/ActivityPub/Util/Type/Extended/Object/Video.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Extended\Object; +namespace Plugin\ActivityPub\Util\Type\Extended\Object; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Video is an implementation of + * \Plugin\ActivityPub\Util\Type\Extended\Object\Video is an implementation of * one of the Activity Streams Extended Types. * * Represents a video document of any kind. diff --git a/plugins/ActivityStreamsTwo/Util/Type/TypeResolver.php b/plugins/ActivityPub/Util/Type/TypeResolver.php similarity index 96% rename from plugins/ActivityStreamsTwo/Util/Type/TypeResolver.php rename to plugins/ActivityPub/Util/Type/TypeResolver.php index 7977b8d78d..d1c973b2c0 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/TypeResolver.php +++ b/plugins/ActivityPub/Util/Type/TypeResolver.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type; +namespace Plugin\ActivityPub\Util\Type; use Exception; /** - * \Plugin\ActivityStreamsTwo\Util\Type\TypeResolver is an abstract class for + * \Plugin\ActivityPub\Util\Type\TypeResolver is an abstract class for * resolving class names called by their short names (AS types). */ abstract class TypeResolver diff --git a/plugins/ActivityStreamsTwo/Util/Type/Util.php b/plugins/ActivityPub/Util/Type/Util.php similarity index 98% rename from plugins/ActivityStreamsTwo/Util/Type/Util.php rename to plugins/ActivityPub/Util/Type/Util.php index 25dfb6cc48..bfc9af2ff6 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Util.php +++ b/plugins/ActivityPub/Util/Type/Util.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type; +namespace Plugin\ActivityPub\Util\Type; use DateInterval; use DateTime; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type; +use Plugin\ActivityPub\Util\Type; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Util is an abstract class for + * \Plugin\ActivityPub\Util\Type\Util is an abstract class for * supporting validators checks & transformations. */ abstract class Util @@ -379,7 +379,7 @@ abstract class Util is_null($min) && is_null($max) => false, is_null($min) => $value <= $max, is_null($max) => $value >= $min, - default => $value >= $min + default => $value >= $min && $value <= $max, }; } diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator.php b/plugins/ActivityPub/Util/Type/Validator.php similarity index 89% rename from plugins/ActivityStreamsTwo/Util/Type/Validator.php rename to plugins/ActivityPub/Util/Type/Validator.php index 284d41ab23..ac776d0c85 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator.php +++ b/plugins/ActivityPub/Util/Type/Validator.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type; +namespace Plugin\ActivityPub\Util\Type; use Exception; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator is an abstract class for + * \Plugin\ActivityPub\Util\Type\Validator is an abstract class for * attribute validation. */ abstract class Validator @@ -58,7 +58,7 @@ abstract class Validator // Try to load a default validator $validatorName = sprintf( - '\Plugin\ActivityStreamsTwo\Util\Type\Validator\%sValidator', + '\Plugin\ActivityPub\Util\Type\Validator\%sValidator', ucfirst($name) ); @@ -79,7 +79,7 @@ abstract class Validator * @param object|string $class A validator class name * * @throws Exception if validator class does not implement - * \Plugin\ActivityStreamsTwo\Util\Type\Helper\ValidatorInterface + * \Plugin\ActivityPub\Util\Type\Helper\ValidatorInterface */ public static function add(string $name, object|string $class): void { diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/AccuracyValidator.php b/plugins/ActivityPub/Util/Type/Validator/AccuracyValidator.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/AccuracyValidator.php rename to plugins/ActivityPub/Util/Type/Validator/AccuracyValidator.php index bd2c486b2c..3a592f2460 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/AccuracyValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/AccuracyValidator.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\AccuracyValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\AccuracyValidator is a dedicated * validator for accuracy attribute. */ class AccuracyValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/ActorValidator.php b/plugins/ActivityPub/Util/Type/Validator/ActorValidator.php similarity index 85% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/ActorValidator.php rename to plugins/ActivityPub/Util/Type/Validator/ActorValidator.php index 578a786538..e0a68c5380 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/ActorValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/ActorValidator.php @@ -9,17 +9,17 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Collection; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Link; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\Collection; +use Plugin\ActivityPub\Util\Type\Core\Link; +use Plugin\ActivityPub\Util\Type\Extended\AbstractActor; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\ActorValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\ActorValidator is a dedicated * validator for actor attribute. */ class ActorValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/AltitudeValidator.php b/plugins/ActivityPub/Util/Type/Validator/AltitudeValidator.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/AltitudeValidator.php rename to plugins/ActivityPub/Util/Type/Validator/AltitudeValidator.php index 1aed949246..878a01106b 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/AltitudeValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/AltitudeValidator.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\AltitudeValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\AltitudeValidator is a dedicated * validator for altitude attribute. */ class AltitudeValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/AnyOfValidator.php b/plugins/ActivityPub/Util/Type/Validator/AnyOfValidator.php similarity index 78% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/AnyOfValidator.php rename to plugins/ActivityPub/Util/Type/Validator/AnyOfValidator.php index 40c7d5848e..e225965fd5 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/AnyOfValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/AnyOfValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Question; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\Extended\Activity\Question; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\AnyOfValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\AnyOfValidator is a dedicated * validator for anyOf attribute. */ class AnyOfValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/AttachmentValidator.php b/plugins/ActivityPub/Util/Type/Validator/AttachmentValidator.php similarity index 81% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/AttachmentValidator.php rename to plugins/ActivityPub/Util/Type/Validator/AttachmentValidator.php index fb10c7dc01..1b14ca6a60 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/AttachmentValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/AttachmentValidator.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\AttachmentValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\AttachmentValidator is a dedicated * validator for attachment attribute. */ class AttachmentValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/AttributedToValidator.php b/plugins/ActivityPub/Util/Type/Validator/AttributedToValidator.php similarity index 79% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/AttributedToValidator.php rename to plugins/ActivityPub/Util/Type/Validator/AttributedToValidator.php index 24aba6aff1..a9b16c94ac 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/AttributedToValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/AttributedToValidator.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\AttributedToValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\AttributedToValidator is a dedicated * validator for attributedTo attribute. */ class AttributedToValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/AudienceValidator.php b/plugins/ActivityPub/Util/Type/Validator/AudienceValidator.php similarity index 79% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/AudienceValidator.php rename to plugins/ActivityPub/Util/Type/Validator/AudienceValidator.php index 67a7fe9e85..076d1b220b 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/AudienceValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/AudienceValidator.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\AudienceValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\AudienceValidator is a dedicated * validator for audience attribute. */ class AudienceValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/BccValidator.php b/plugins/ActivityPub/Util/Type/Validator/BccValidator.php similarity index 79% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/BccValidator.php rename to plugins/ActivityPub/Util/Type/Validator/BccValidator.php index 658e9c6f8f..00baa81873 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/BccValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/BccValidator.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\BccValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\BccValidator is a dedicated * validator for bcc attribute. */ class BccValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/BtoValidator.php b/plugins/ActivityPub/Util/Type/Validator/BtoValidator.php similarity index 79% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/BtoValidator.php rename to plugins/ActivityPub/Util/Type/Validator/BtoValidator.php index 9219f61941..8b61bca465 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/BtoValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/BtoValidator.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\BtoValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\BtoValidator is a dedicated * validator for bto attribute. */ class BtoValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/CcValidator.php b/plugins/ActivityPub/Util/Type/Validator/CcValidator.php similarity index 79% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/CcValidator.php rename to plugins/ActivityPub/Util/Type/Validator/CcValidator.php index 7182365ec8..d50e1729d7 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/CcValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/CcValidator.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\CcValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\CcValidator is a dedicated * validator for cc attribute. */ class CcValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/ClosedValidator.php b/plugins/ActivityPub/Util/Type/Validator/ClosedValidator.php similarity index 81% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/ClosedValidator.php rename to plugins/ActivityPub/Util/Type/Validator/ClosedValidator.php index c2448703f2..dcb68c08e9 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/ClosedValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/ClosedValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\Activity\Question; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Extended\Activity\Question; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\ClosedValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\ClosedValidator is a dedicated * validator for closed attribute. */ class ClosedValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/ContentMapValidator.php b/plugins/ActivityPub/Util/Type/Validator/ContentMapValidator.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/ContentMapValidator.php rename to plugins/ActivityPub/Util/Type/Validator/ContentMapValidator.php index e7493aa138..0057c98067 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/ContentMapValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/ContentMapValidator.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\ContentMapValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\ContentMapValidator is a dedicated * validator for contentMap attribute. */ class ContentMapValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/ContentValidator.php b/plugins/ActivityPub/Util/Type/Validator/ContentValidator.php similarity index 78% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/ContentValidator.php rename to plugins/ActivityPub/Util/Type/Validator/ContentValidator.php index b07c6f3e12..e00d893484 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/ContentValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/ContentValidator.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\ContentValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\ContentValidator is a dedicated * validator for content attribute. */ class ContentValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/ContextValidator.php b/plugins/ActivityPub/Util/Type/Validator/ContextValidator.php similarity index 80% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/ContextValidator.php rename to plugins/ActivityPub/Util/Type/Validator/ContextValidator.php index 9cce11588f..0df85f62df 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/ContextValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/ContextValidator.php @@ -9,14 +9,14 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\ContextValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\ContextValidator is a dedicated * validator for context attribute. */ class ContextValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/CurrentValidator.php b/plugins/ActivityPub/Util/Type/Validator/CurrentValidator.php similarity index 75% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/CurrentValidator.php rename to plugins/ActivityPub/Util/Type/Validator/CurrentValidator.php index 7a5facf617..47c435c19d 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/CurrentValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/CurrentValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Collection; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\Collection; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\CurrentValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\CurrentValidator is a dedicated * validator for current attribute. */ class CurrentValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/DeletedValidator.php b/plugins/ActivityPub/Util/Type/Validator/DeletedValidator.php similarity index 75% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/DeletedValidator.php rename to plugins/ActivityPub/Util/Type/Validator/DeletedValidator.php index c50fe5c6d4..544043b523 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/DeletedValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/DeletedValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Tombstone; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Extended\Object\Tombstone; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\DeletedValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\DeletedValidator is a dedicated * validator for deleted attribute. */ class DeletedValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/DescribesValidator.php b/plugins/ActivityPub/Util/Type/Validator/DescribesValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/DescribesValidator.php rename to plugins/ActivityPub/Util/Type/Validator/DescribesValidator.php index 3feb3c64f9..bd66f2d0ce 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/DescribesValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/DescribesValidator.php @@ -9,16 +9,16 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Profile; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Extended\Object\Profile; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\DescribesValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\DescribesValidator is a dedicated * validator for describes attribute. */ class DescribesValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/DurationValidator.php b/plugins/ActivityPub/Util/Type/Validator/DurationValidator.php similarity index 75% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/DurationValidator.php rename to plugins/ActivityPub/Util/Type/Validator/DurationValidator.php index 703b9f00fb..8b2628e840 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/DurationValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/DurationValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\DurationValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\DurationValidator is a dedicated * validator for duration attribute. */ class DurationValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/EndTimeValidator.php b/plugins/ActivityPub/Util/Type/Validator/EndTimeValidator.php similarity index 73% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/EndTimeValidator.php rename to plugins/ActivityPub/Util/Type/Validator/EndTimeValidator.php index 01a7a1d707..3d48aea631 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/EndTimeValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/EndTimeValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\EndTimeValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\EndTimeValidator is a dedicated * validator for endTime attribute. */ class EndTimeValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/EndpointsValidator.php b/plugins/ActivityPub/Util/Type/Validator/EndpointsValidator.php similarity index 84% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/EndpointsValidator.php rename to plugins/ActivityPub/Util/Type/Validator/EndpointsValidator.php index 2350bb0bb2..dd5df5eea8 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/EndpointsValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/EndpointsValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Extended\AbstractActor; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\EndpointsValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\EndpointsValidator is a dedicated * validator for endpoints attribute. */ class EndpointsValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/FirstValidator.php b/plugins/ActivityPub/Util/Type/Validator/FirstValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/FirstValidator.php rename to plugins/ActivityPub/Util/Type/Validator/FirstValidator.php index 3965bdd46b..726f19ca6f 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/FirstValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/FirstValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\FirstValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\FirstValidator is a dedicated * validator for first attribute. */ class FirstValidator extends CurrentValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/FollowersValidator.php b/plugins/ActivityPub/Util/Type/Validator/FollowersValidator.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/FollowersValidator.php rename to plugins/ActivityPub/Util/Type/Validator/FollowersValidator.php index e7ca4b41a4..7b0931b779 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/FollowersValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/FollowersValidator.php @@ -9,17 +9,17 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Collection; -use Plugin\ActivityStreamsTwo\Util\Type\Core\OrderedCollection; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\Collection; +use Plugin\ActivityPub\Util\Type\Core\OrderedCollection; +use Plugin\ActivityPub\Util\Type\Extended\AbstractActor; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\FollowersValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\FollowersValidator is a dedicated * validator for followers attribute. */ class FollowersValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/FollowingValidator.php b/plugins/ActivityPub/Util/Type/Validator/FollowingValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/FollowingValidator.php rename to plugins/ActivityPub/Util/Type/Validator/FollowingValidator.php index 6602874db6..12c339a25c 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/FollowingValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/FollowingValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\FollowingValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\FollowingValidator is a dedicated * validator for followers attribute. */ class FollowingValidator extends FollowersValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/FormerTypeValidator.php b/plugins/ActivityPub/Util/Type/Validator/FormerTypeValidator.php similarity index 74% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/FormerTypeValidator.php rename to plugins/ActivityPub/Util/Type/Validator/FormerTypeValidator.php index 9aedeb871c..b95bd1da78 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/FormerTypeValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/FormerTypeValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Tombstone; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Extended\Object\Tombstone; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\FormerTypeValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\FormerTypeValidator is a dedicated * validator for formerType attribute. */ class FormerTypeValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/GeneratorValidator.php b/plugins/ActivityPub/Util/Type/Validator/GeneratorValidator.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/GeneratorValidator.php rename to plugins/ActivityPub/Util/Type/Validator/GeneratorValidator.php index 04292df45f..823d8d719a 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/GeneratorValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/GeneratorValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\GeneratorValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\GeneratorValidator is a dedicated * validator for generator attribute. */ class GeneratorValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/HeightValidator.php b/plugins/ActivityPub/Util/Type/Validator/HeightValidator.php similarity index 70% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/HeightValidator.php rename to plugins/ActivityPub/Util/Type/Validator/HeightValidator.php index 6a7cb4714c..00ebfb8ce9 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/HeightValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/HeightValidator.php @@ -9,16 +9,16 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Link; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Image; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\Link; +use Plugin\ActivityPub\Util\Type\Extended\Object\Image; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\HeightValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\HeightValidator is a dedicated * validator for height attribute. */ class HeightValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/HrefValidator.php b/plugins/ActivityPub/Util/Type/Validator/HrefValidator.php similarity index 72% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/HrefValidator.php rename to plugins/ActivityPub/Util/Type/Validator/HrefValidator.php index d2d9c0004a..ece7f4f9ed 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/HrefValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/HrefValidator.php @@ -9,16 +9,16 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Link; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\Link; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\HrefValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\HrefValidator is a dedicated * validator for href attribute. */ class HrefValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/HreflangValidator.php b/plugins/ActivityPub/Util/Type/Validator/HreflangValidator.php similarity index 72% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/HreflangValidator.php rename to plugins/ActivityPub/Util/Type/Validator/HreflangValidator.php index a9dade8ed7..68d3adb4b5 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/HreflangValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/HreflangValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Link; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\Link; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\HreflangValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\HreflangValidator is a dedicated * validator for hreflang attribute. */ class HreflangValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/IconValidator.php b/plugins/ActivityPub/Util/Type/Validator/IconValidator.php similarity index 86% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/IconValidator.php rename to plugins/ActivityPub/Util/Type/Validator/IconValidator.php index a128e56ef1..bfa7e047af 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/IconValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/IconValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\IconValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\IconValidator is a dedicated * validator for icon attribute. */ class IconValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/IdValidator.php b/plugins/ActivityPub/Util/Type/Validator/IdValidator.php similarity index 73% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/IdValidator.php rename to plugins/ActivityPub/Util/Type/Validator/IdValidator.php index 6449ca9379..f3209388ce 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/IdValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/IdValidator.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\IdValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\IdValidator is a dedicated * validator for id attribute. */ class IdValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/ImageValidator.php b/plugins/ActivityPub/Util/Type/Validator/ImageValidator.php similarity index 70% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/ImageValidator.php rename to plugins/ActivityPub/Util/Type/Validator/ImageValidator.php index b497b6766a..e2332878ec 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/ImageValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/ImageValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\ImageValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\ImageValidator is a dedicated * validator for image attribute. */ class ImageValidator extends IconValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/InReplyToValidator.php b/plugins/ActivityPub/Util/Type/Validator/InReplyToValidator.php similarity index 80% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/InReplyToValidator.php rename to plugins/ActivityPub/Util/Type/Validator/InReplyToValidator.php index d8999d28dd..5bfd3bffb1 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/InReplyToValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/InReplyToValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\InReplyToValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\InReplyToValidator is a dedicated * validator for inReplyTo attribute. */ class InReplyToValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/InboxValidator.php b/plugins/ActivityPub/Util/Type/Validator/InboxValidator.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/InboxValidator.php rename to plugins/ActivityPub/Util/Type/Validator/InboxValidator.php index 5064880865..950ac3f4bd 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/InboxValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/InboxValidator.php @@ -9,17 +9,17 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\OrderedCollection; -use Plugin\ActivityStreamsTwo\Util\Type\Core\OrderedCollectionPage; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\OrderedCollection; +use Plugin\ActivityPub\Util\Type\Core\OrderedCollectionPage; +use Plugin\ActivityPub\Util\Type\Extended\AbstractActor; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\InboxValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\InboxValidator is a dedicated * validator for inbox attribute. */ class InboxValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/InstrumentValidator.php b/plugins/ActivityPub/Util/Type/Validator/InstrumentValidator.php similarity index 70% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/InstrumentValidator.php rename to plugins/ActivityPub/Util/Type/Validator/InstrumentValidator.php index 1e19a4db0c..4680c06216 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/InstrumentValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/InstrumentValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\InstrumentValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\InstrumentValidator is a dedicated * validator for instrument attribute. */ class InstrumentValidator extends ActorValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/ItemsValidator.php b/plugins/ActivityPub/Util/Type/Validator/ItemsValidator.php similarity index 81% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/ItemsValidator.php rename to plugins/ActivityPub/Util/Type/Validator/ItemsValidator.php index e6a3831457..602832c8fe 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/ItemsValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/ItemsValidator.php @@ -9,16 +9,16 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Collection; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Link; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\Core\Collection; +use Plugin\ActivityPub\Util\Type\Core\Link; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\ItemsValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\ItemsValidator is a dedicated * validator for items attribute. */ class ItemsValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/LastValidator.php b/plugins/ActivityPub/Util/Type/Validator/LastValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/LastValidator.php rename to plugins/ActivityPub/Util/Type/Validator/LastValidator.php index 8916ae1cd7..15ae6e758a 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/LastValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/LastValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\LastValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\LastValidator is a dedicated * validator for last attribute. */ class LastValidator extends CurrentValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/LatitudeValidator.php b/plugins/ActivityPub/Util/Type/Validator/LatitudeValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/LatitudeValidator.php rename to plugins/ActivityPub/Util/Type/Validator/LatitudeValidator.php index efa2aadd63..52daa98fae 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/LatitudeValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/LatitudeValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Place; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Extended\Object\Place; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\LatitudeValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\LatitudeValidator is a dedicated * validator for latitude attribute. */ class LatitudeValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/LikedValidator.php b/plugins/ActivityPub/Util/Type/Validator/LikedValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/LikedValidator.php rename to plugins/ActivityPub/Util/Type/Validator/LikedValidator.php index c59f456f38..0647db3b2c 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/LikedValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/LikedValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\LikedValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\LikedValidator is a dedicated * validator for liked attribute. */ class LikedValidator extends FollowersValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/LocationValidator.php b/plugins/ActivityPub/Util/Type/Validator/LocationValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/LocationValidator.php rename to plugins/ActivityPub/Util/Type/Validator/LocationValidator.php index 1c614ca20e..e4c250f2fd 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/LocationValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/LocationValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\LocationValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\LocationValidator is a dedicated * validator for location attribute. */ class LocationValidator extends InReplyToValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/LongitudeValidator.php b/plugins/ActivityPub/Util/Type/Validator/LongitudeValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/LongitudeValidator.php rename to plugins/ActivityPub/Util/Type/Validator/LongitudeValidator.php index 8373c95dd0..d8002878ee 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/LongitudeValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/LongitudeValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Place; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Extended\Object\Place; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\LongitudeValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\LongitudeValidator is a dedicated * validator for longitude attribute. */ class LongitudeValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/MediaTypeValidator.php b/plugins/ActivityPub/Util/Type/Validator/MediaTypeValidator.php similarity index 72% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/MediaTypeValidator.php rename to plugins/ActivityPub/Util/Type/Validator/MediaTypeValidator.php index 4c2915d22c..e47ffe68e2 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/MediaTypeValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/MediaTypeValidator.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\MediaTypeValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\MediaTypeValidator is a dedicated * validator for mediaType attribute. */ class MediaTypeValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/NameMapValidator.php b/plugins/ActivityPub/Util/Type/Validator/NameMapValidator.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/NameMapValidator.php rename to plugins/ActivityPub/Util/Type/Validator/NameMapValidator.php index 7fc1051573..62720d2b20 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/NameMapValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/NameMapValidator.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\NameMapValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\NameMapValidator is a dedicated * validator for nameMap attribute. */ class NameMapValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/NameValidator.php b/plugins/ActivityPub/Util/Type/Validator/NameValidator.php similarity index 74% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/NameValidator.php rename to plugins/ActivityPub/Util/Type/Validator/NameValidator.php index 73553fcb2d..1a58aa66a5 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/NameValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/NameValidator.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\NameValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\NameValidator is a dedicated * validator for name attribute. */ class NameValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/NextValidator.php b/plugins/ActivityPub/Util/Type/Validator/NextValidator.php similarity index 76% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/NextValidator.php rename to plugins/ActivityPub/Util/Type/Validator/NextValidator.php index feb0384493..227adb350a 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/NextValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/NextValidator.php @@ -9,16 +9,16 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\CollectionPage; -use Plugin\ActivityStreamsTwo\Util\Type\Core\OrderedCollectionPage; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\CollectionPage; +use Plugin\ActivityPub\Util\Type\Core\OrderedCollectionPage; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\NextValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\NextValidator is a dedicated * validator for next attribute. */ class NextValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/ObjectValidator.php b/plugins/ActivityPub/Util/Type/Validator/ObjectValidator.php similarity index 83% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/ObjectValidator.php rename to plugins/ActivityPub/Util/Type/Validator/ObjectValidator.php index 7996ebdc4e..e8923ca3c1 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/ObjectValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/ObjectValidator.php @@ -9,16 +9,16 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\ObjectValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\ObjectValidator is a dedicated * validator for object attribute. */ class ObjectValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/OneOfValidator.php b/plugins/ActivityPub/Util/Type/Validator/OneOfValidator.php similarity index 70% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/OneOfValidator.php rename to plugins/ActivityPub/Util/Type/Validator/OneOfValidator.php index eca9b01528..fa2e0942a0 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/OneOfValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/OneOfValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\OneOfValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\OneOfValidator is a dedicated * validator for oneOf attribute. */ class OneOfValidator extends AnyOfValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/OrderedItemsValidator.php b/plugins/ActivityPub/Util/Type/Validator/OrderedItemsValidator.php similarity index 70% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/OrderedItemsValidator.php rename to plugins/ActivityPub/Util/Type/Validator/OrderedItemsValidator.php index 857bbd5042..c979a0ac47 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/OrderedItemsValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/OrderedItemsValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\OrderedItemsValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\OrderedItemsValidator is a dedicated * validator for orderedItems attribute. */ class OrderedItemsValidator extends ItemsValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/OriginValidator.php b/plugins/ActivityPub/Util/Type/Validator/OriginValidator.php similarity index 79% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/OriginValidator.php rename to plugins/ActivityPub/Util/Type/Validator/OriginValidator.php index a146a6103d..dc0e32a539 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/OriginValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/OriginValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Activity; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\Activity; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\OriginValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\OriginValidator is a dedicated * validator for origin attribute. */ class OriginValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/OutboxValidator.php b/plugins/ActivityPub/Util/Type/Validator/OutboxValidator.php similarity index 70% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/OutboxValidator.php rename to plugins/ActivityPub/Util/Type/Validator/OutboxValidator.php index 8e2663c040..62276a628e 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/OutboxValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/OutboxValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\OutboxValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\OutboxValidator is a dedicated * validator for outbox attribute. */ class OutboxValidator extends InboxValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/PartOfValidator.php b/plugins/ActivityPub/Util/Type/Validator/PartOfValidator.php similarity index 76% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/PartOfValidator.php rename to plugins/ActivityPub/Util/Type/Validator/PartOfValidator.php index b59cc9d766..d08f0bbddc 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/PartOfValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/PartOfValidator.php @@ -9,16 +9,16 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\CollectionPage; -use Plugin\ActivityStreamsTwo\Util\Type\Core\OrderedCollectionPage; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\CollectionPage; +use Plugin\ActivityPub\Util\Type\Core\OrderedCollectionPage; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\PartOfValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\PartOfValidator is a dedicated * validator for partOf attribute. */ class PartOfValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/PreferredUsernameValidator.php b/plugins/ActivityPub/Util/Type/Validator/PreferredUsernameValidator.php similarity index 72% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/PreferredUsernameValidator.php rename to plugins/ActivityPub/Util/Type/Validator/PreferredUsernameValidator.php index a9911e3d7f..7988a9e381 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/PreferredUsernameValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/PreferredUsernameValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\Extended\AbstractActor; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\PreferredUsernameValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\PreferredUsernameValidator is a dedicated * validator for preferredUsername attribute. */ class PreferredUsernameValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/PrevValidator.php b/plugins/ActivityPub/Util/Type/Validator/PrevValidator.php similarity index 70% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/PrevValidator.php rename to plugins/ActivityPub/Util/Type/Validator/PrevValidator.php index 638ab99858..b63a307886 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/PrevValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/PrevValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\PrevValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\PrevValidator is a dedicated * validator for prev attribute. */ class PrevValidator extends NextValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/PreviewValidator.php b/plugins/ActivityPub/Util/Type/Validator/PreviewValidator.php similarity index 76% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/PreviewValidator.php rename to plugins/ActivityPub/Util/Type/Validator/PreviewValidator.php index fa4a5bef8c..a5006e17ea 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/PreviewValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/PreviewValidator.php @@ -9,16 +9,16 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Link; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\Link; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\PreviewValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\PreviewValidator is a dedicated * validator for preview attribute. */ class PreviewValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/PublishedValidator.php b/plugins/ActivityPub/Util/Type/Validator/PublishedValidator.php similarity index 70% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/PublishedValidator.php rename to plugins/ActivityPub/Util/Type/Validator/PublishedValidator.php index 5753126e8c..b8b60fa153 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/PublishedValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/PublishedValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\PublishedValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\PublishedValidator is a dedicated * validator for published attribute. */ class PublishedValidator extends EndTimeValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/RadiusValidator.php b/plugins/ActivityPub/Util/Type/Validator/RadiusValidator.php similarity index 72% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/RadiusValidator.php rename to plugins/ActivityPub/Util/Type/Validator/RadiusValidator.php index 76b1bfbfd5..59bd0d97fa 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/RadiusValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/RadiusValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Place; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Extended\Object\Place; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\RadiusValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\RadiusValidator is a dedicated * validator for radius attribute. */ class RadiusValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/RelValidator.php b/plugins/ActivityPub/Util/Type/Validator/RelValidator.php similarity index 78% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/RelValidator.php rename to plugins/ActivityPub/Util/Type/Validator/RelValidator.php index dac252c984..7002e252cb 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/RelValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/RelValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Link; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\Link; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\RelValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\RelValidator is a dedicated * validator for rel attribute. */ class RelValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/RepliesValidator.php b/plugins/ActivityPub/Util/Type/Validator/RepliesValidator.php similarity index 79% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/RepliesValidator.php rename to plugins/ActivityPub/Util/Type/Validator/RepliesValidator.php index 6997406b89..2994e88c47 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/RepliesValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/RepliesValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\RepliesValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\RepliesValidator is a dedicated * validator for replies attribute. */ class RepliesValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/ResultValidator.php b/plugins/ActivityPub/Util/Type/Validator/ResultValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/ResultValidator.php rename to plugins/ActivityPub/Util/Type/Validator/ResultValidator.php index 3dabac6404..85d35fb7e4 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/ResultValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/ResultValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\ResultValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\ResultValidator is a dedicated * validator for result attribute. */ class ResultValidator extends OriginValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/SourceValidator.php b/plugins/ActivityPub/Util/Type/Validator/SourceValidator.php similarity index 77% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/SourceValidator.php rename to plugins/ActivityPub/Util/Type/Validator/SourceValidator.php index 260ecbcf67..14ab196826 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/SourceValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/SourceValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\SourceValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\SourceValidator is a dedicated * validator for source attribute. */ class SourceValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/StartIndexValidator.php b/plugins/ActivityPub/Util/Type/Validator/StartIndexValidator.php similarity index 73% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/StartIndexValidator.php rename to plugins/ActivityPub/Util/Type/Validator/StartIndexValidator.php index da4647ace1..ad337f6649 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/StartIndexValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/StartIndexValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\OrderedCollectionPage; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\OrderedCollectionPage; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\StartIndexValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\StartIndexValidator is a dedicated * validator for startIndex attribute. */ class StartIndexValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/StartTimeValidator.php b/plugins/ActivityPub/Util/Type/Validator/StartTimeValidator.php similarity index 70% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/StartTimeValidator.php rename to plugins/ActivityPub/Util/Type/Validator/StartTimeValidator.php index 1e539b3f37..9a8167e394 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/StartTimeValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/StartTimeValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\StartTimeValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\StartTimeValidator is a dedicated * validator for startTime attribute. */ class StartTimeValidator extends EndTimeValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/StreamsValidator.php b/plugins/ActivityPub/Util/Type/Validator/StreamsValidator.php similarity index 73% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/StreamsValidator.php rename to plugins/ActivityPub/Util/Type/Validator/StreamsValidator.php index 7c483e5f6a..e535d42fdc 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/StreamsValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/StreamsValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Extended\AbstractActor; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\StreamsValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\StreamsValidator is a dedicated * validator for streams attribute. */ class StreamsValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/SummaryMapValidator.php b/plugins/ActivityPub/Util/Type/Validator/SummaryMapValidator.php similarity index 78% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/SummaryMapValidator.php rename to plugins/ActivityPub/Util/Type/Validator/SummaryMapValidator.php index 9e93909c7a..d5b77f448a 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/SummaryMapValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/SummaryMapValidator.php @@ -9,13 +9,13 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\SummaryMapValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\SummaryMapValidator is a dedicated * validator for summaryMap attribute. */ class SummaryMapValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/SummaryValidator.php b/plugins/ActivityPub/Util/Type/Validator/SummaryValidator.php similarity index 73% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/SummaryValidator.php rename to plugins/ActivityPub/Util/Type/Validator/SummaryValidator.php index e1688e0229..b946fb5a70 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/SummaryValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/SummaryValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\SummaryValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\SummaryValidator is a dedicated * validator for summary attribute. */ class SummaryValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/TagValidator.php b/plugins/ActivityPub/Util/Type/Validator/TagValidator.php similarity index 79% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/TagValidator.php rename to plugins/ActivityPub/Util/Type/Validator/TagValidator.php index d44b6642f5..ba1a57780e 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/TagValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/TagValidator.php @@ -9,12 +9,12 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\TagValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\TagValidator is a dedicated * validator for tag attribute. */ class TagValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/TargetValidator.php b/plugins/ActivityPub/Util/Type/Validator/TargetValidator.php similarity index 70% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/TargetValidator.php rename to plugins/ActivityPub/Util/Type/Validator/TargetValidator.php index 8d5891c0c5..8132c309a8 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/TargetValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/TargetValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\TargetValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\TargetValidator is a dedicated * validator for target attribute. */ class TargetValidator extends ActorValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/ToValidator.php b/plugins/ActivityPub/Util/Type/Validator/ToValidator.php similarity index 70% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/ToValidator.php rename to plugins/ActivityPub/Util/Type/Validator/ToValidator.php index 9f6b13ccd5..239148479f 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/ToValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/ToValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\ToValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\ToValidator is a dedicated * validator for to attribute. */ class ToValidator extends BtoValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/TotalItemsValidator.php b/plugins/ActivityPub/Util/Type/Validator/TotalItemsValidator.php similarity index 73% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/TotalItemsValidator.php rename to plugins/ActivityPub/Util/Type/Validator/TotalItemsValidator.php index 3edc306e5f..346ee7300e 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/TotalItemsValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/TotalItemsValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Collection; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\Collection; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\TotalItemsValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\TotalItemsValidator is a dedicated * validator for totalItems attribute. */ class TotalItemsValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/TypeValidator.php b/plugins/ActivityPub/Util/Type/Validator/TypeValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/TypeValidator.php rename to plugins/ActivityPub/Util/Type/Validator/TypeValidator.php index da375e8701..a3d9b7544f 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/TypeValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/TypeValidator.php @@ -9,16 +9,16 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Link; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools; +use Plugin\ActivityPub\Util\Type\Core\Link; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorTools; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\TypeValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\TypeValidator is a dedicated * validator for type attribute. */ class TypeValidator extends ValidatorTools diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/UnitsValidator.php b/plugins/ActivityPub/Util/Type/Validator/UnitsValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/UnitsValidator.php rename to plugins/ActivityPub/Util/Type/Validator/UnitsValidator.php index 7e051fa800..0aec0ad08e 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/UnitsValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/UnitsValidator.php @@ -9,15 +9,15 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\Object\Place; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Extended\Object\Place; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\UnitsValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\UnitsValidator is a dedicated * validator for units attribute. */ class UnitsValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/UpdatedValidator.php b/plugins/ActivityPub/Util/Type/Validator/UpdatedValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/UpdatedValidator.php rename to plugins/ActivityPub/Util/Type/Validator/UpdatedValidator.php index 564f1deb57..362a2132a5 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/UpdatedValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/UpdatedValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\UpdatedValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\UpdatedValidator is a dedicated * validator for updated attribute. */ class UpdatedValidator extends EndTimeValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/UrlValidator.php b/plugins/ActivityPub/Util/Type/Validator/UrlValidator.php similarity index 80% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/UrlValidator.php rename to plugins/ActivityPub/Util/Type/Validator/UrlValidator.php index 71be415e68..4c7526c0bd 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/UrlValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/UrlValidator.php @@ -9,16 +9,16 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\Link; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Util; -use Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface; +use Plugin\ActivityPub\Util\Type\Core\Link; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Util; +use Plugin\ActivityPub\Util\Type\ValidatorInterface; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\UrlValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\UrlValidator is a dedicated * validator for url attribute. */ class UrlValidator implements ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/Validator/WidthValidator.php b/plugins/ActivityPub/Util/Type/Validator/WidthValidator.php similarity index 71% rename from plugins/ActivityStreamsTwo/Util/Type/Validator/WidthValidator.php rename to plugins/ActivityPub/Util/Type/Validator/WidthValidator.php index 90a8a19b6a..095e0fe3ac 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/Validator/WidthValidator.php +++ b/plugins/ActivityPub/Util/Type/Validator/WidthValidator.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type\Validator; +namespace Plugin\ActivityPub\Util\Type\Validator; /** - * \Plugin\ActivityStreamsTwo\Util\Type\Validator\WidthValidator is a dedicated + * \Plugin\ActivityPub\Util\Type\Validator\WidthValidator is a dedicated * validator for width attribute. */ class WidthValidator extends HeightValidator diff --git a/plugins/ActivityStreamsTwo/Util/Type/ValidatorInterface.php b/plugins/ActivityPub/Util/Type/ValidatorInterface.php similarity index 74% rename from plugins/ActivityStreamsTwo/Util/Type/ValidatorInterface.php rename to plugins/ActivityPub/Util/Type/ValidatorInterface.php index c0c36db63e..3fe25b6ec8 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/ValidatorInterface.php +++ b/plugins/ActivityPub/Util/Type/ValidatorInterface.php @@ -9,10 +9,10 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type; +namespace Plugin\ActivityPub\Util\Type; /** - * \Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface specifies methods that must be + * \Plugin\ActivityPub\Util\Type\ValidatorInterface specifies methods that must be * implemented for attribute (property) validation. */ interface ValidatorInterface diff --git a/plugins/ActivityStreamsTwo/Util/Type/ValidatorTools.php b/plugins/ActivityPub/Util/Type/ValidatorTools.php similarity index 95% rename from plugins/ActivityStreamsTwo/Util/Type/ValidatorTools.php rename to plugins/ActivityPub/Util/Type/ValidatorTools.php index 8cc16a2800..97af9b18ae 100644 --- a/plugins/ActivityStreamsTwo/Util/Type/ValidatorTools.php +++ b/plugins/ActivityPub/Util/Type/ValidatorTools.php @@ -9,19 +9,19 @@ * . */ -namespace Plugin\ActivityStreamsTwo\Util\Type; +namespace Plugin\ActivityPub\Util\Type; use Exception; -use Plugin\ActivityStreamsTwo\Util\Type\Core\ObjectType; -use Plugin\ActivityStreamsTwo\Util\Type\Extended\AbstractActor; +use Plugin\ActivityPub\Util\Type\Core\ObjectType; +use Plugin\ActivityPub\Util\Type\Extended\AbstractActor; /** - * \Plugin\ActivityStreamsTwo\Util\Type\ValidatorTools is an abstract class for + * \Plugin\ActivityPub\Util\Type\ValidatorTools is an abstract class for * attribute validation. - * Its purpose is to be extended by Plugin\ActivityStreamsTwo\Util\Type\Validator\* + * Its purpose is to be extended by Plugin\ActivityPub\Util\Type\Validator\* * classes. * It provides some methods to make some regular validations. - * It implements \Plugin\ActivityStreamsTwo\Util\Type\ValidatorInterface. + * It implements \Plugin\ActivityPub\Util\Type\ValidatorInterface. */ abstract class ValidatorTools implements ValidatorInterface { diff --git a/plugins/ActivityStreamsTwo/ActivityStreamsTwo.php b/plugins/ActivityStreamsTwo/ActivityStreamsTwo.php deleted file mode 100644 index 4a702fd93c..0000000000 --- a/plugins/ActivityStreamsTwo/ActivityStreamsTwo.php +++ /dev/null @@ -1,66 +0,0 @@ - AS2ToNote::translate($activity, $source), - default => Entity::create($activity), - }; - } -} \ No newline at end of file diff --git a/plugins/ActivityStreamsTwo/Util/Model/AS2ToEntity/AS2ToNote.php b/plugins/ActivityStreamsTwo/Util/Model/AS2ToEntity/AS2ToNote.php deleted file mode 100644 index 69732f1bad..0000000000 --- a/plugins/ActivityStreamsTwo/Util/Model/AS2ToEntity/AS2ToNote.php +++ /dev/null @@ -1,48 +0,0 @@ - false, - 'created' => new DateTime($args['published'] ?? 'now'), - 'content' => $args['content'] ?? null, - 'content_type' => 'text/html', - 'rendered' => null, - 'modified' => new DateTime(), - 'source' => $source, - ]; - if ($map['content'] !== null) { - Event::handle('RenderNoteContent', [ - $map['content'], - $map['content_type'], - &$map['rendered'], - Actor::getFromId(1), // just for testing - null, // reply to - ]); - } - - $obj = new Note(); - foreach ($map as $prop => $val) { - $set = Formatting::snakeCaseToCamelCase("set_{$prop}"); - $obj->{$set}($val); - } - return $obj; - } -} \ No newline at end of file diff --git a/src/Entity/Actor.php b/src/Entity/Actor.php index a14da34ed3..f53895ab18 100644 --- a/src/Entity/Actor.php +++ b/src/Entity/Actor.php @@ -220,24 +220,17 @@ class Actor extends Entity return Avatar::getAvatarUrl($this->getId(), $size); } - public static function getFromId(int $id): ?self + public static function getById(int $id): ?self { return Cache::get('actor-id-' . $id, function () use ($id) { return DB::find('actor', ['id' => $id]); }); } - public static function getFromNickname(string $nickname): ?self + public static function getNicknameById(int $id): string { - return Cache::get('actor-nick-' . $nickname, function () use ($nickname) { - return DB::findOneBy('actor', ['nickname' => $nickname]); - }); - } - - public static function getNicknameFromId(int $id): string - { - return Cache::get('actor-nick-id-' . $id, function () use ($id) { - return self::getFromId($id)->getNickname(); + return Cache::get('actor-nickname-id-' . $id, function () use ($id) { + return self::getById($id)->getNickname(); }); } diff --git a/src/Entity/Group.php b/src/Entity/Group.php index 945e27019c..1b736ccfcc 100644 --- a/src/Entity/Group.php +++ b/src/Entity/Group.php @@ -268,7 +268,7 @@ class Group extends Entity public function getActor(): Actor { - return Actor::getFromId($this->getId()); + return Actor::getById($this->getId()); } public static function getFromNickname(string $nickname, ?Actor $actor = null): ?self diff --git a/src/Entity/Note.php b/src/Entity/Note.php index db97884126..1161604d69 100644 --- a/src/Entity/Note.php +++ b/src/Entity/Note.php @@ -53,6 +53,7 @@ class Note extends Entity private ?int $conversation; private ?int $repeat_of; private int $scope = VisibilityScope::PUBLIC; + private string $url; private \DateTimeInterface $created; private \DateTimeInterface $modified; @@ -185,6 +186,17 @@ class Note extends Entity return $this->scope; } + public function getUrl(): string + { + return $this->url; + } + + public function setUrl(string $url): self + { + $this->url = $url; + return $this; + } + public function setCreated(DateTimeInterface $created): self { $this->created = $created; @@ -212,12 +224,12 @@ class Note extends Entity public function getActor(): Actor { - return Actor::getFromId($this->actor_id); + return Actor::getById($this->actor_id); } public function getActorNickname(): string { - return Actor::getNicknameFromId($this->actor_id); + return Actor::getNicknameById($this->actor_id); } public function getActorAvatarUrl(string $size = 'full'): string @@ -322,6 +334,7 @@ class Note extends Entity 'conversation' => ['type' => 'int', 'foreign key' => true, 'target' => 'Conversation.id', 'multiplicity' => 'one to one', 'description' => 'the local conversation id'], 'repeat_of' => ['type' => 'int', 'foreign key' => true, 'target' => 'Note.id', 'multiplicity' => 'one to one', 'description' => 'note this is a repeat of'], 'scope' => ['type' => 'int', 'not null' => true, 'default' => VisibilityScope::PUBLIC, 'description' => 'bit map for distribution scope; 0 = everywhere; 1 = this server only; 2 = addressees; 4 = groups; 8 = followers; 16 = messages; null = default'], + 'url' => ['type' => 'text', 'description' => 'Permalink to Note'], 'created' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'], 'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'], ],