diff --git a/plugins/ActivityPub/ActivityPubPlugin.php b/plugins/ActivityPub/ActivityPubPlugin.php index d870b3ec91..ca16fb8cd9 100644 --- a/plugins/ActivityPub/ActivityPubPlugin.php +++ b/plugins/ActivityPub/ActivityPubPlugin.php @@ -26,13 +26,14 @@ defined('GNUSOCIAL') || die(); -// Import required files by the plugin -require_once __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'httpsignature.php'; -require_once __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'discoveryhints.php'; -require_once __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'explorer.php'; -require_once __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'postman.php'; -require_once __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'inbox_handler.php'; -require_once __DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'activitypubqueuehandler.php'; +// Import plugin libs +foreach (glob(__DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . '*.php') as $filename) { + require_once $filename; +} +// Import plugin models +foreach (glob(__DIR__ . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'models' . DIRECTORY_SEPARATOR . '*.php') as $filename) { + require_once $filename; +} // So that this isn't hardcoded everywhere define('ACTIVITYPUB_BASE_ACTOR_URI', common_root_url().'index.php/user/'); diff --git a/plugins/ActivityPub/classes/Activitypub_accept.php b/plugins/ActivityPub/lib/models/Activitypub_accept.php similarity index 98% rename from plugins/ActivityPub/classes/Activitypub_accept.php rename to plugins/ActivityPub/lib/models/Activitypub_accept.php index 1c76a281b1..29b95cca69 100644 --- a/plugins/ActivityPub/classes/Activitypub_accept.php +++ b/plugins/ActivityPub/lib/models/Activitypub_accept.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_accept extends Managed_DataObject +class Activitypub_accept { /** * Generates an ActivityPub representation of a Accept diff --git a/plugins/ActivityPub/classes/Activitypub_announce.php b/plugins/ActivityPub/lib/models/Activitypub_announce.php similarity index 97% rename from plugins/ActivityPub/classes/Activitypub_announce.php rename to plugins/ActivityPub/lib/models/Activitypub_announce.php index 66ea3f316b..6c57892c65 100644 --- a/plugins/ActivityPub/classes/Activitypub_announce.php +++ b/plugins/ActivityPub/lib/models/Activitypub_announce.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_announce extends Managed_DataObject +class Activitypub_announce { /** * Generates an ActivityPub representation of a Announce diff --git a/plugins/ActivityPub/classes/Activitypub_attachment.php b/plugins/ActivityPub/lib/models/Activitypub_attachment.php similarity index 97% rename from plugins/ActivityPub/classes/Activitypub_attachment.php rename to plugins/ActivityPub/lib/models/Activitypub_attachment.php index 0dec3c3afe..dc3a91d3fa 100644 --- a/plugins/ActivityPub/classes/Activitypub_attachment.php +++ b/plugins/ActivityPub/lib/models/Activitypub_attachment.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_attachment extends Managed_DataObject +class Activitypub_attachment { /** * Generates a pretty array from an Attachment object diff --git a/plugins/ActivityPub/classes/Activitypub_create.php b/plugins/ActivityPub/lib/models/Activitypub_create.php similarity index 98% rename from plugins/ActivityPub/classes/Activitypub_create.php rename to plugins/ActivityPub/lib/models/Activitypub_create.php index 9c5d62b03a..6ad1c8e9a1 100644 --- a/plugins/ActivityPub/classes/Activitypub_create.php +++ b/plugins/ActivityPub/lib/models/Activitypub_create.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_create extends Managed_DataObject +class Activitypub_create { /** * Generates an ActivityPub representation of a Create diff --git a/plugins/ActivityPub/classes/Activitypub_delete.php b/plugins/ActivityPub/lib/models/Activitypub_delete.php similarity index 98% rename from plugins/ActivityPub/classes/Activitypub_delete.php rename to plugins/ActivityPub/lib/models/Activitypub_delete.php index 74bab42f0d..f0e0fd73b7 100644 --- a/plugins/ActivityPub/classes/Activitypub_delete.php +++ b/plugins/ActivityPub/lib/models/Activitypub_delete.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_delete extends Managed_DataObject +class Activitypub_delete { /** * Generates an ActivityPub representation of a Delete diff --git a/plugins/ActivityPub/classes/Activitypub_error.php b/plugins/ActivityPub/lib/models/Activitypub_error.php similarity index 97% rename from plugins/ActivityPub/classes/Activitypub_error.php rename to plugins/ActivityPub/lib/models/Activitypub_error.php index 2515dbdb98..1570ebdf3b 100644 --- a/plugins/ActivityPub/classes/Activitypub_error.php +++ b/plugins/ActivityPub/lib/models/Activitypub_error.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_error extends Managed_DataObject +class Activitypub_error { /** * Generates a pretty error from a string diff --git a/plugins/ActivityPub/classes/Activitypub_follow.php b/plugins/ActivityPub/lib/models/Activitypub_follow.php similarity index 98% rename from plugins/ActivityPub/classes/Activitypub_follow.php rename to plugins/ActivityPub/lib/models/Activitypub_follow.php index 466971afca..a79bbc32b6 100644 --- a/plugins/ActivityPub/classes/Activitypub_follow.php +++ b/plugins/ActivityPub/lib/models/Activitypub_follow.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_follow extends Managed_DataObject +class Activitypub_follow { /** * Generates an ActivityPub representation of a subscription diff --git a/plugins/ActivityPub/classes/Activitypub_like.php b/plugins/ActivityPub/lib/models/Activitypub_like.php similarity index 97% rename from plugins/ActivityPub/classes/Activitypub_like.php rename to plugins/ActivityPub/lib/models/Activitypub_like.php index b0710973f4..9aa72c5b16 100644 --- a/plugins/ActivityPub/classes/Activitypub_like.php +++ b/plugins/ActivityPub/lib/models/Activitypub_like.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_like extends Managed_DataObject +class Activitypub_like { /** * Generates an ActivityPub representation of a Like diff --git a/plugins/ActivityPub/classes/Activitypub_mention_tag.php b/plugins/ActivityPub/lib/models/Activitypub_mention_tag.php similarity index 97% rename from plugins/ActivityPub/classes/Activitypub_mention_tag.php rename to plugins/ActivityPub/lib/models/Activitypub_mention_tag.php index bccb2e44f5..33c7851259 100644 --- a/plugins/ActivityPub/classes/Activitypub_mention_tag.php +++ b/plugins/ActivityPub/lib/models/Activitypub_mention_tag.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_mention_tag extends Managed_DataObject +class Activitypub_mention_tag { /** * Generates an ActivityPub representation of a Mention Tag diff --git a/plugins/ActivityPub/classes/Activitypub_notice.php b/plugins/ActivityPub/lib/models/Activitypub_notice.php similarity index 99% rename from plugins/ActivityPub/classes/Activitypub_notice.php rename to plugins/ActivityPub/lib/models/Activitypub_notice.php index bdc8ab1579..5e33d067f8 100644 --- a/plugins/ActivityPub/classes/Activitypub_notice.php +++ b/plugins/ActivityPub/lib/models/Activitypub_notice.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_notice extends Managed_DataObject +class Activitypub_notice { /** * Generates a pretty notice from a Notice object diff --git a/plugins/ActivityPub/classes/Activitypub_reject.php b/plugins/ActivityPub/lib/models/Activitypub_reject.php similarity index 97% rename from plugins/ActivityPub/classes/Activitypub_reject.php rename to plugins/ActivityPub/lib/models/Activitypub_reject.php index 99ef227075..53c2ec4293 100644 --- a/plugins/ActivityPub/classes/Activitypub_reject.php +++ b/plugins/ActivityPub/lib/models/Activitypub_reject.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_reject extends Managed_DataObject +class Activitypub_reject { /** * Generates an ActivityPub representation of a Reject diff --git a/plugins/ActivityPub/classes/Activitypub_tag.php b/plugins/ActivityPub/lib/models/Activitypub_tag.php similarity index 97% rename from plugins/ActivityPub/classes/Activitypub_tag.php rename to plugins/ActivityPub/lib/models/Activitypub_tag.php index bc42c8409d..549f771f98 100644 --- a/plugins/ActivityPub/classes/Activitypub_tag.php +++ b/plugins/ActivityPub/lib/models/Activitypub_tag.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_tag extends Managed_DataObject +class Activitypub_tag { /** * Generates a pretty tag from a Tag object diff --git a/plugins/ActivityPub/classes/Activitypub_undo.php b/plugins/ActivityPub/lib/models/Activitypub_undo.php similarity index 98% rename from plugins/ActivityPub/classes/Activitypub_undo.php rename to plugins/ActivityPub/lib/models/Activitypub_undo.php index 5a3c058e0b..e0dd5d154a 100644 --- a/plugins/ActivityPub/classes/Activitypub_undo.php +++ b/plugins/ActivityPub/lib/models/Activitypub_undo.php @@ -34,7 +34,7 @@ defined('GNUSOCIAL') || die(); * @author Diogo Cordeiro * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later */ -class Activitypub_undo extends Managed_DataObject +class Activitypub_undo { /** * Generates an ActivityPub representation of a Undo