Switch to class instantiation

activitypub.php

@@ -39,21 +39,21 @@
  * Initialize REST routes.
  */
 function rest_init() {
-	Rest\Actors::init();
-	Rest\Outbox::init();
-	Rest\Inbox::init();
-	Rest\Followers::init();
-	Rest\Following::init();
-	Rest\Webfinger::init();
-	Rest\Comment::init();
-	Rest\Server::init();
-	Rest\Collection::init();
-	Rest\Interaction::init();
-	Rest\Post::init();
+	( new Rest\Actors() )->register_routes();
+	( new Rest\Outbox() )->register_routes();
+	( new Rest\Inbox() )->register_routes();
+	( new Rest\Followers() )->register_routes();
+	( new Rest\Following() )->register_routes();
+	( new Rest\Webfinger() )->register_routes();
+	( new Rest\Comment() )->register_routes();
+	( new Rest\Server() )->register_routes();
+	( new Rest\Collection() )->register_routes();
+	( new Rest\Interaction() )->register_routes();
+	( new Rest\Post() )->register_routes();
 
 	// Load NodeInfo endpoints only if blog is public.
 	if ( is_blog_public() ) {
-		Rest\NodeInfo::init();
+		( new Rest\NodeInfo() )->register_routes();
 	}
 }
 \add_action( 'rest_api_init', __NAMESPACE__ . '\rest_init' );

includes/rest/class-actors.php

@@ -34,14 +34,6 @@ class Actors extends \WP_REST_Controller {
 	 */
 	protected $rest_base = '(?:users|actors)/(?P<user_id>[\w\-\.]+)';
 
-	/**
-	 * Initialize the class, registering WordPress hooks.
-	 */
-	public static function init() {
-		$controller = new self();
-		$controller->register_routes();
-	}
-
 	/**
 	 * Register routes.
 	 */

includes/rest/class-collection.php

@@ -34,14 +34,6 @@ class Collection extends \WP_REST_Controller {
 	 */
 	protected $namespace = ACTIVITYPUB_REST_NAMESPACE;
 
-	/**
-	 * Initialize the class, registering WordPress hooks.
-	 */
-	public static function init() {
-		$controller = new self();
-		$controller->register_routes();
-	}
-
 	/**
 	 * Register routes.
 	 */

includes/rest/class-comment.php

@@ -25,14 +25,6 @@ class Comment extends \WP_REST_Controller {
 	 */
 	protected $namespace = ACTIVITYPUB_REST_NAMESPACE;
 
-	/**
-	 * Initialize the class, registering WordPress hooks.
-	 */
-	public static function init() {
-		$controller = new self();
-		$controller->register_routes();
-	}
-
 	/**
 	 * Register routes.
 	 */

includes/rest/class-followers.php

@@ -35,14 +35,6 @@ class Followers extends \WP_REST_Controller {
 	 */
 	protected $rest_base = '(?:users|actors)/(?P<user_id>[\w\-\.]+)/followers';
 
-	/**
-	 * Initialize the class, registering WordPress hooks.
-	 */
-	public static function init() {
-		$controller = new self();
-		$controller->register_routes();
-	}
-
 	/**
 	 * Register routes.
 	 */

includes/rest/class-following.php

@@ -38,10 +38,7 @@ class Following extends \WP_REST_Controller {
 	/**
 	 * Initialize the class, registering WordPress hooks.
 	 */
-	public static function init() {
-		$controller = new self();
-		$controller->register_routes();
-
+	public function __construct() {
 		\add_filter( 'activitypub_rest_following', array( self::class, 'default_following' ), 10, 2 );
 	}
 

includes/rest/class-inbox.php

@@ -38,17 +38,6 @@ class Inbox extends \WP_REST_Controller {
 	 */
 	protected $rest_base = '(?:users|actors)/(?P<user_id>[\w\-\.]+)/inbox';
 
-	/**
-	 * Initialize the class, registering WordPress hooks.
-	 */
-	public static function init() {
-		$controller = new self();
-		$controller->register_routes();
-
-		$server = new Server();
-		$server->add_hooks();
-	}
-
 	/**
 	 * Register routes.
 	 */

includes/rest/class-interaction.php

@@ -21,20 +21,19 @@ class Interaction extends \WP_REST_Controller {
 	protected $namespace = ACTIVITYPUB_REST_NAMESPACE;
 
 	/**
-	 * Initialize the class, registering WordPress hooks.
+	 * The base of this controller's route.
+	 *
+	 * @var string
 	 */
-	public static function init() {
-		$controller = new self();
-		$controller->register_routes();
-	}
+	protected $rest_base = 'interactions';
 
 	/**
 	 * Register routes.
 	 */
 	public function register_routes() {
 		\register_rest_route(
 			$this->namespace,
-			'/interactions',
+			'/' . $this->rest_base,
 			array(
 				array(
 					'methods'             => \WP_REST_Server::READABLE,

includes/rest/class-nodeinfo.php

@@ -27,14 +27,6 @@ class Nodeinfo extends \WP_REST_Controller {
 	 */
 	protected $namespace = ACTIVITYPUB_REST_NAMESPACE;
 
-	/**
-	 * Initialize the class, registering WordPress hooks.
-	 */
-	public static function init() {
-		$controller = new self();
-		$controller->register_routes();
-	}
-
 	/**
 	 * Register routes.
 	 */

includes/rest/class-outbox.php

@@ -33,14 +33,6 @@ class Outbox extends \WP_REST_Controller {
 	 */
 	protected $rest_base = '(?:users|actors)/(?P<user_id>[\w\-\.]+)/outbox';
 
-	/**
-	 * Initialize the class, registering WordPress hooks.
-	 */
-	public static function init() {
-		$controller = new self();
-		$controller->register_routes();
-	}
-
 	/**
 	 * Register routes.
 	 */

includes/rest/class-server.php

@@ -30,10 +30,8 @@ class Server extends \WP_REST_Controller {
 	/**
 	 * Initialize the class, registering WordPress hooks.
 	 */
-	public static function init() {
-		$controller = new self();
-		$controller->register_routes();
-		$controller->add_hooks();
+	public function __construct() {
+		$this->add_hooks();
 	}
 
 	/**

includes/rest/class-webfinger.php

@@ -22,13 +22,6 @@ class Webfinger extends \WP_REST_Controller {
 	 */
 	protected $namespace = ACTIVITYPUB_REST_NAMESPACE;
 
-	/**
-	 * Initialize the class, registering WordPress hooks.
-	 */
-	public static function init() {
-		( new self() )->register_routes();
-	}
-
 	/**
 	 * Register routes.
 	 */