Automattic · lschuyler · Apr 19, 2022 · Apr 20, 2021 · Apr 20, 2021 · Apr 20, 2021
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 wpcom-helper.php
 /composer.lock
 /vendor
+node_modules
diff --git a/build/index.asset.php b/build/index.asset.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array('wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-edit-post', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-primitives'), 'version' => 'afa86f1dcc6c53850df1932fcd09e58c');
diff --git a/build/index.js b/build/index.js
diff --git a/build/style-index.css b/build/style-index.css
diff --git a/co-authors-plus.php b/co-authors-plus.php
@@ -32,12 +32,13 @@
 Author - user with the role of author
 */
 
-define( 'COAUTHORS_PLUS_VERSION', '3.4.92' );
+define( 'COAUTHORS_PLUS_VERSION', '3.5.0' );
 
 require_once dirname( __FILE__ ) . '/template-tags.php';
 require_once dirname( __FILE__ ) . '/deprecated.php';
 
 require_once dirname( __FILE__ ) . '/php/class-coauthors-template-filters.php';
+require_once dirname( __FILE__ ) . '/php/class-coauthors-endpoint.php';
 require_once dirname( __FILE__ ) . '/php/integrations/amp.php';
 
 if ( defined( 'WP_CLI' ) && WP_CLI ) {
@@ -66,6 +67,12 @@ class CoAuthors_Plus {
 
 	var $to_be_filtered_caps = array();
 
+	/**
+	 * Block editor functionality in the sidebar is
+	 * disabled by default.
+	 */
+	const SIDEBAR_PLUGIN_ENABLED = false;
+
 	/**
 	 * __construct()
 	 */
@@ -136,6 +143,9 @@ function __construct() {
 
 		// Filter to display author image if exists instead of avatar
 		add_filter( 'pre_get_avatar_data', array( $this, 'filter_pre_get_avatar_data_url' ), 10, 2 );
+
+		// Block editor assets for the sidebar plugin.
+		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_sidebar_plugin_assets' ) );
 	}
 
 	/**
@@ -164,6 +174,50 @@ public function action_init() {
 
 	}
 
+	/**
+	 * Determine if block editor sidebar integration should be loaded.
+	 *
+	 * @param WP_Post|int|null $post Post ID or object, null to use global.
+	 * @return bool
+	 */
+	public function is_block_editor( $post = null ) {
+		$screen = get_current_screen();
+
+		// Pre-5.0 compatibility
+		if ( method_exists( $screen, 'is_block_editor' ) ) {
+			return $screen->is_block_editor();
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * When filter is set to enable block editor integration, enqueue assets
+	 * for posts and users where Co Authors is enabled
+	 */
+	public function enqueue_sidebar_plugin_assets() {
+		if ( $this->is_post_type_enabled() && $this->current_user_can_set_authors() ) {
+			$asset = require dirname( __FILE__ ) . '/build/index.asset.php';
+
+			wp_register_script(
+				'coauthors-sidebar-js',
+				plugins_url( 'build/index.js', __FILE__ ),
+				$asset['dependencies'],
+				$asset['version']
+			);
+
+			wp_register_style(
+				'coauthors-sidebar-css',
+				plugins_url( 'build/style-index.css', __FILE__ ),
+				'',
+				$asset['version']
+			);
+
+			wp_enqueue_script( 'coauthors-sidebar-js' );
+			wp_enqueue_style( 'coauthors-sidebar-css' );
+		}
+	}
+
 	/**
 	 * Register the 'author' taxonomy and add post type support
 	 */
@@ -178,7 +232,9 @@ public function action_init_late() {
 			'public'       => false,
 			'sort'         => true,
 			'args'         => array( 'orderby' => 'term_order' ),
+			'show_in_rest' => true,
 			'show_ui'      => false,
+			'rest_base'    => 'coauthors',
 		);
 
 		// If we use the nasty SQL query, we need our custom callback. Otherwise, we still need to flush cache.
@@ -276,7 +332,7 @@ public function get_coauthor_by( $key, $value, $force = false ) {
 				if ( ! $user && ( 'login' == $key || 'slug' == $key ) ) {
 					// Re-try lookup without prefixed value if no results found.
 					$value = preg_replace( '#^cap\-#', '', $value );
-					$user = get_user_by( $key, $value );
+					$user  = get_user_by( $key, $value );
 				}
 				if ( ! $user ) {
 					return false;
@@ -333,9 +389,10 @@ public function remove_authors_box() {
 	 * Adds a custom 'Authors' box
 	 */
 	public function add_coauthors_box() {
-
 		if ( $this->is_post_type_enabled() && $this->current_user_can_set_authors() ) {
-			add_meta_box( $this->coauthors_meta_box_name, apply_filters( 'coauthors_meta_box_title', __( 'Authors', 'co-authors-plus' ) ), array( $this, 'coauthors_meta_box' ), get_post_type(), apply_filters( 'coauthors_meta_box_context', 'side' ), apply_filters( 'coauthors_meta_box_priority', 'high' ) );
+			if ( false === $this->is_block_editor() ) {
+				add_meta_box( $this->coauthors_meta_box_name, apply_filters( 'coauthors_meta_box_title', __( 'Authors', 'co-authors-plus' ) ), array( $this, 'coauthors_meta_box' ), get_post_type(), apply_filters( 'coauthors_meta_box_context', 'side' ), apply_filters( 'coauthors_meta_box_priority', 'high' ) );
+			}
 		}
 	}
 
@@ -548,7 +605,6 @@ function _update_users_posts_count( $tt_ids, $taxonomy ) {
 		$tt_ids   = implode( ', ', array_map( 'intval', $tt_ids ) );
 		$term_ids = $wpdb->get_results( "SELECT term_id FROM $wpdb->term_taxonomy WHERE term_taxonomy_id IN ($tt_ids)" ); // phpcs:ignore
 
-
 		foreach ( (array) $term_ids as $term_id_result ) {
 			$term = get_term_by( 'id', $term_id_result->term_id, $this->coauthor_taxonomy );
 			$this->update_author_term_post_count( $term );
@@ -919,7 +975,8 @@ public function add_coauthors( $post_id, $coauthors, $append = false, $query_typ
 		$coauthors        = array_unique( array_merge( $existing_coauthors, $coauthors ) );
 		$coauthor_objects = array();
 		foreach ( $coauthors as &$author_name ) {
-			$field              = apply_filters( 'coauthors_post_get_coauthor_by_field', $query_type, $author_name );
+			$field = apply_filters( 'coauthors_post_get_coauthor_by_field', $query_type, $author_name );
+
 			$author             = $this->get_coauthor_by( $field, $author_name );
 			$coauthor_objects[] = $author;
 			$term               = $this->update_author_term( $author );
@@ -1006,6 +1063,7 @@ function delete_user_action( $delete_id ) {
 	 *
 	 * @since 2.6
 	 * @props kingkool68, http://wordpress.org/support/topic/plugin-co-authors-plus-making-authors-sortable
+	 * @props kingkool68, http://wordpress.org/support/topic/plugin-co-authors-plus-making-authors-sortable
 	 */
 	function filter_wp_get_object_terms( $terms, $object_ids, $taxonomies, $args ) {
 		if ( ! isset( $_REQUEST['bulk_edit'] ) || $this->coauthor_taxonomy !== $taxonomies ) {
@@ -1796,7 +1854,8 @@ public function filter_pre_get_avatar_data_url( $args, $id ) {
 }
 
 global $coauthors_plus;
-$coauthors_plus = new CoAuthors_Plus();
+$coauthors_plus     = new CoAuthors_Plus();
+$coauthors_endpoint = new CoAuthors\API\Endpoints( $coauthors_plus );
 
 if ( ! function_exists( 'wp_notify_postauthor' ) ) :
 	/**
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<?php return array('dependencies' => array('wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-edit-post', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-primitives'), 'version' => 'afa86f1dcc6c53850df1932fcd09e58c');