Plugin loading refactor (#485)

* Plugin loading refactor
* changed load order for REST endpoints

---------

Co-authored-by: Matthias Pfefferle <[email protected]>

Author: mattwiebe

activitypub.php

@@ -17,12 +17,13 @@
 
 use function Activitypub\site_supports_blocks;
 
-\defined( 'ACTIVITYPUB_REST_NAMESPACE' ) || \define( 'ACTIVITYPUB_REST_NAMESPACE', 'activitypub/1.0' );
+require_once __DIR__ . '/includes/functions.php';
 
 /**
- * Initialize plugin
+ * Initialize the plugin constants.
  */
-function init() {
+function define_constants() {
+	\defined( 'ACTIVITYPUB_REST_NAMESPACE' ) || \define( 'ACTIVITYPUB_REST_NAMESPACE', 'activitypub/1.0' );
 	\defined( 'ACTIVITYPUB_EXCERPT_LENGTH' ) || \define( 'ACTIVITYPUB_EXCERPT_LENGTH', 400 );
 	\defined( 'ACTIVITYPUB_SHOW_PLUGIN_RECOMMENDATIONS' ) || \define( 'ACTIVITYPUB_SHOW_PLUGIN_RECOMMENDATIONS', true );
 	\defined( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS' ) || \define( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS', 3 );
@@ -35,13 +36,12 @@ function init() {
 	\define( 'ACTIVITYPUB_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
 	\define( 'ACTIVITYPUB_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) );
 	\define( 'ACTIVITYPUB_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+}
 
-	Migration::init();
-	Activitypub::init();
-	Activity_Dispatcher::init();
-	Collection\Followers::init();
-
-	// Configure the REST API route
+/**
+ * Initialize REST routes.
+ */
+function rest_init() {
 	Rest\Users::init();
 	Rest\Outbox::init();
 	Rest\Inbox::init();
@@ -51,23 +51,46 @@ function init() {
 	Rest\Server::init();
 	Rest\Collection::init();
 
-	Admin::init();
-	Hashtag::init();
-	Shortcodes::init();
-	Mention::init();
-	Health_Check::init();
-	Scheduler::init();
+	// load NodeInfo endpoints only if blog is public
+	if ( \get_option( 'blog_public', 1 ) ) {
+		Rest\NodeInfo::init();
+	}
+}
+\add_action( 'rest_api_init', __NAMESPACE__ . '\rest_init' );
+
+/**
+ * Initialize plugin.
+ */
+function plugin_init() {
+	define_constants();
+
+	\add_action( 'init', array( __NAMESPACE__ . '\Migration', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Activitypub', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Activity_Dispatcher', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Collection\Followers', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Admin', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Hashtag', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Shortcodes', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Mention', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Health_Check', 'init' ) );
+	\add_action( 'init', array( __NAMESPACE__ . '\Scheduler', 'init' ) );
 
 	if ( site_supports_blocks() ) {
-		Blocks::init();
+		\add_action( 'init', array( __NAMESPACE__ . '\Blocks', 'init' ) );
+	}
+
+	$debug_file = __DIR__ . '/includes/debug.php';
+	if ( \WP_DEBUG && file_exists( $debug_file ) && is_readable( $debug_file ) ) {
+		require_once $debug_file;
+		Debug::init();
 	}
 }
-\add_action( 'init', __NAMESPACE__ . '\init' );
+\add_action( 'plugins_loaded', __NAMESPACE__ . '\plugin_init' );
 
 /**
  * Class Autoloader
  */
-spl_autoload_register(
+\spl_autoload_register(
 	function ( $full_class ) {
 		$base_dir = __DIR__ . '/includes/';
 		$base     = 'Activitypub\\';
@@ -100,19 +123,6 @@ function ( $full_class ) {
 	}
 );
 
-require_once __DIR__ . '/includes/functions.php';
-
-// load NodeInfo endpoints only if blog is public
-if ( \get_option( 'blog_public', 1 ) ) {
-	Rest\NodeInfo::init();
-}
-
-$debug_file = __DIR__ . '/includes/debug.php';
-if ( \WP_DEBUG && file_exists( $debug_file ) && is_readable( $debug_file ) ) {
-	require_once $debug_file;
-	Debug::init();
-}
-
 /**
  * Add plugin settings link
  */

includes/rest/class-collection.php

@@ -25,7 +25,7 @@ class Collection {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( self::class, 'register_routes' ) );
+		self::register_routes();
 	}
 
 	/**

includes/rest/class-followers.php

@@ -22,7 +22,7 @@ class Followers {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( self::class, 'register_routes' ) );
+		self::register_routes();
 	}
 
 	/**

includes/rest/class-following.php

@@ -18,7 +18,8 @@ class Following {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( self::class, 'register_routes' ) );
+		self::register_routes();
+
 		\add_filter( 'activitypub_rest_following', array( self::class, 'default_following' ), 10, 2 );
 	}
 

includes/rest/class-inbox.php

@@ -24,7 +24,7 @@ class Inbox {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( self::class, 'register_routes' ) );
+		self::register_routes();
 
 		\add_action( 'activitypub_inbox_create', array( self::class, 'handle_create' ), 10, 2 );
 	}

includes/rest/class-nodeinfo.php

@@ -17,7 +17,8 @@ class Nodeinfo {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( self::class, 'register_routes' ) );
+		self::register_routes();
+
 		\add_filter( 'nodeinfo_data', array( self::class, 'add_nodeinfo_discovery' ), 10, 2 );
 		\add_filter( 'nodeinfo2_data', array( self::class, 'add_nodeinfo2_discovery' ), 10 );
 	}

includes/rest/class-ostatus.php

@@ -24,7 +24,7 @@ class Outbox {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( self::class, 'register_routes' ) );
+		self::register_routes();
 	}
 
 	/**

includes/rest/class-outbox.php

@@ -18,7 +18,8 @@ class Server {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( self::class, 'register_routes' ) );
+		self::register_routes();
+
 		\add_filter( 'rest_request_before_callbacks', array( self::class, 'authorize_activitypub_requests' ), 10, 3 );
 	}
 

includes/rest/class-server.php

@@ -23,7 +23,7 @@ class Users {
 	 * Initialize the class, registering WordPress hooks
 	 */
 	public static function init() {
-		\add_action( 'rest_api_init', array( self::class, 'register_routes' ) );
+		self::register_routes();
 	}
 
 	/**