Committing built version of ac33532

10upbot on GitHub · 10upbot on GitHub · commit 8c0e3e3b28d0 · 2022-02-02T20:23:56.000Z
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2.4.0
     - name: Use Node.js 10
       uses: actions/setup-node@v1
       with:
diff --git a/.github/workflows/build-stable.yml b/.github/workflows/build-stable.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v2.4.0
     - name: Install and build
       run: |
         composer install --no-dev
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v2.4.0
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -23,7 +23,7 @@ jobs:
     # the head of the pull request instead of the merge commit.
     - run: git checkout HEAD^2
       if: ${{ github.event_name == 'pull_request' }}
-      
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
     name: eslint
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.4.0
     - name: install node v12
       uses: actions/setup-node@v1
       with:
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v2.4.0
     - name: Set PHP version
       uses: shivammathur/setup-php@v2
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v2.4.0
     - name: Create ZIP
       run: |
         git archive --prefix=distributor/ HEAD -o distributor.zip
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
 
   #   steps:
   #   - name: Checkout
-  #     uses: actions/checkout@v2
+  #     uses: actions/checkout@v2.4.0
 
   #   - name: Set PHP version
   #     uses: shivammathur/setup-php@v2
@@ -47,7 +47,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v2.4.0
 
     - name: Set PHP version
       uses: shivammathur/setup-php@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [1.6.8] - 2022-02-02
+### Added
+- New hook `dt_get_pull_content_rest_query_args` to filter `WP_Query` args for the `list-pull-content` REST endpoint (props [@theskinnyghost](https://github.com/theskinnyghost), [@dkotter](https://github.com/dkotter) via [#839](https://github.com/10up/distributor/pull/839)).
+
+### Changed
+- Clear out a user's authorized site list instead of rebuilding it on site changes (props [@dkotter](https://github.com/dkotter) , [@cadic](https://github.com/cadic) via [#829](https://github.com/10up/distributor/pull/829)).
+
+### Fixed
+- Ensure the connection information we have is valid prior to using that for deletion (props [@dkotter](https://github.com/dkotter), [@LucyTurtle](https://github.com/LucyTurtle) via [#830](https://github.com/10up/distributor/pull/830)).
+- Ensure users can enter a per page limit of greater than 100 and have that properly used on the Pull Content screen for External Connections (props [@dkotter](https://github.com/dkotter), [@iamdharmesh](https://github.com/iamdharmesh), [@jmstew3](https://github.com/jmstew3) via [#831](https://github.com/10up/distributor/pull/831)).
+- Ensure the [Snippets tutorials](https://10up.github.io/distributor/tutorial-snippets.html) have a proper height (props [@dkotter](https://github.com/dkotter), [@pcrumm](https://github.com/pcrumm) via [#836](https://github.com/10up/distributor/pull/836)).
+
+### Security
+- Bump `actions/checkout` in GitHub Action workflow files from v1/v2 to v2.4.0 (props [@faisal-alvi](https://github.com/faisal-alvi) via [#828](https://github.com/10up/distributor/pull/828)).
+
 ## [1.6.7] - 2021-11-09
 ### Added
 - Added `Snippets` page to [Distributor's documentation site](https://10up.github.io/distributor/) with helpful filters and callbacks (props [@claytoncollie](https://github.com/claytoncollie) via [#817](https://github.com/10up/distributor/pull/817)).
@@ -310,6 +325,7 @@ This adds a post type selector when viewing the Pull Content list for both exter
 - Initial closed release.
 
 [Unreleased]: https://github.com/10up/distributor/compare/trunk...develop
+[1.6.8]: https://github.com/10up/distributor/compare/1.6.7...1.6.8
 [1.6.7]: https://github.com/10up/distributor/compare/1.6.6...1.6.7
 [1.6.6]: https://github.com/10up/distributor/compare/1.6.5...1.6.6
 [1.6.5]: https://github.com/10up/distributor/compare/1.6.4...1.6.5
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 *You can learn more about Distributor's features at [DistributorPlugin.com](https://distributorplugin.com) and documentation at the [Distributor documentation site](https://10up.github.io/distributor/).*
 
-_Note:_ The latest stable version of the plugin is the _stable_ branch. [Download the stable branch]((https://github.com/10up/distributor/archive/stable.zip)) if you are intending to use the plugin in production.
+_Note:_ The latest stable version of the plugin is the _stable_ branch. [Download the stable branch]((https://github.com/10up/distributor/archive/stable.zip)) if you are intending to use the plugin in a Production environment.
 
 ## Table of Contents
 * [Features](#features)
diff --git a/distributor.php b/distributor.php
@@ -4,7 +4,7 @@
  * Plugin URI:        https://github.com/10up/distributor
  * Update URI:        https://distributorplugin.com
  * Description:       Makes it easy to distribute and reuse content across your websites, whether inside of a multisite or across the web.
- * Version:           1.6.7
+ * Version:           1.6.8
  * Author:            10up Inc.
  * Author URI:        https://distributorplugin.com
  * License:           GPLv2 or later
@@ -18,7 +18,7 @@
 	exit; // Exit if accessed directly.
 }
 
-define( 'DT_VERSION', '1.6.7' );
+define( 'DT_VERSION', '1.6.8' );
 define( 'DT_PLUGIN_FILE', preg_replace( '#^.*plugins/(.*)$#i', '$1', __FILE__ ) );
 define( 'DT_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
 
diff --git a/includes/classes/ExternalConnections/WordPressExternalConnection.php b/includes/classes/ExternalConnections/WordPressExternalConnection.php
@@ -167,8 +167,8 @@ public function remote_get( $args = array() ) {
 
 		// When running a query for the Pull screen with excluded items, make a POST request instead
 		if ( empty( $id ) && isset( $args['post__not_in'] ) && isset( $args['dt_pull_list'] ) ) {
-			$query_args['post_type'] = isset( $post_type ) ? $post_type : 'post';
-			$query_args['per_page']  = isset( $posts_per_page ) ? $posts_per_page : 20;
+			$query_args['post_type']      = isset( $post_type ) ? $post_type : 'post';
+			$query_args['posts_per_page'] = isset( $posts_per_page ) ? $posts_per_page : 20;
 
 			$posts_response = $this->remote_post(
 				untrailingslashit( $this->base_url ) . '/' . self::$namespace . '/distributor/list-pull-content',
diff --git a/includes/classes/InternalConnections/NetworkSiteConnection.php b/includes/classes/InternalConnections/NetworkSiteConnection.php
@@ -581,8 +581,8 @@ public static function bootstrap() {
 		add_action( 'untrash_post', array( '\Distributor\InternalConnections\NetworkSiteConnection', 'connect_syndicated_on_untrash' ) );
 		add_action( 'clean_site_cache', array( '\Distributor\InternalConnections\NetworkSiteConnection', 'set_sites_last_changed_time' ) );
 		add_action( 'wp_insert_site', array( '\Distributor\InternalConnections\NetworkSiteConnection', 'set_sites_last_changed_time' ) );
-		add_action( 'add_user_to_blog', array( '\Distributor\InternalConnections\NetworkSiteConnection', 'rebuild_user_authorized_sites_cache' ) );
-		add_action( 'remove_user_from_blog', array( '\Distributor\InternalConnections\NetworkSiteConnection', 'rebuild_user_authorized_sites_cache' ) );
+		add_action( 'add_user_to_blog', array( '\Distributor\InternalConnections\NetworkSiteConnection', 'clear_authorized_sites_cache' ) );
+		add_action( 'remove_user_from_blog', array( '\Distributor\InternalConnections\NetworkSiteConnection', 'clear_authorized_sites_cache' ) );
 	}
 
 	/**
@@ -637,7 +637,12 @@ public static function separate_syndicated_on_delete( $post_id ) {
 		}
 
 		foreach ( $connection_map['internal'] as $blog_id => $post_array ) {
-			$connection = new self( get_site( $blog_id ) );
+			$site = get_site( $blog_id );
+			if ( ! $site || ! is_a( $site, '\WP_Site' ) ) {
+				continue;
+			}
+
+			$connection = new self( $site );
 
 			switch_to_blog( $blog_id );
 
@@ -822,8 +827,7 @@ public static function build_available_authorized_sites( $user_id = false, $cont
 		$last_changed = get_site_option( 'last_changed_sites' );
 
 		if ( ! $last_changed ) {
-			$last_changed = microtime();
-			self::set_sites_last_changed_time();
+			$last_changed = self::set_sites_last_changed_time();
 		}
 
 		$cache_key        = "authorized_sites:$user_id:$context:$last_changed";
@@ -890,22 +894,29 @@ public static function build_available_authorized_sites( $user_id = false, $cont
 	 * will have caching enabled, so we also store it
 	 * in a site option.
 	 *
-	 * @return void
+	 * @return string
 	 */
 	public static function set_sites_last_changed_time() {
-		update_site_option( 'last_changed_sites', microtime() );
+		$time = microtime();
+		update_site_option( 'last_changed_sites', $time );
+
+		return $time;
 	}
 
 	/**
-	 * Rebuild the authorized sites cache for a specific user.
+	 * Clear the authorized sites cache for a specific user.
 	 *
 	 * @param int $user_id Current user ID.
-	 *
-	 * @return void
 	 */
-	public static function rebuild_user_authorized_sites_cache( $user_id ) {
-		self::build_available_authorized_sites( $user_id, 'push', true );
-		self::build_available_authorized_sites( $user_id, 'pull', true );
+	public static function clear_authorized_sites_cache( $user_id = false ) {
+		$last_changed = get_site_option( 'last_changed_sites' );
+
+		if ( ! $last_changed ) {
+			self::set_sites_last_changed_time();
+		} else {
+			delete_transient( "authorized_sites:$user_id:push:$last_changed" );
+			delete_transient( "authorized_sites:$user_id:pull:$last_changed" );
+		}
 	}
 
 	/**
diff --git a/includes/classes/PullListTable.php b/includes/classes/PullListTable.php
@@ -514,7 +514,7 @@ public function prepare_items() {
 		$remote_get = $connection_now->remote_get( $remote_get_args );
 
 		if ( is_wp_error( $remote_get ) ) {
-			$this->pull_error = true;
+			$this->pull_error = $remote_get->get_error_messages();
 
 			return;
 		}
diff --git a/includes/pull-ui.php b/includes/pull-ui.php
@@ -528,6 +528,15 @@ function dashboard() {
 
 		<?php if ( ! empty( $connection_list_table->pull_error ) ) : ?>
 			<p><?php esc_html_e( 'Could not pull content from connection due to error.', 'distributor' ); ?></p>
+			<ul>
+				<?php foreach ( $connection_list_table->pull_error as $error ) : ?>
+				<li>
+					<ul>
+						<li><?php echo esc_html( $error ); ?></li>
+					</ul>
+				</li>
+				<?php endforeach; ?>
+			</ul>
 		<?php else : ?>
 			<?php $connection_list_table->views(); ?>
 
diff --git a/includes/rest-api.php b/includes/rest-api.php
@@ -163,44 +163,43 @@ function register_rest_routes() {
  */
 function get_pull_content_list_args() {
 	return array(
-		'exclude'     => array(
+		'exclude'        => array(
 			'description' => esc_html__( 'Ensure result set excludes specific IDs.', 'distributor' ),
 			'type'        => 'array',
 			'items'       => array(
 				'type' => 'integer',
 			),
 			'default'     => array(),
 		),
-		'page'        => array(
+		'page'           => array(
 			'description'       => esc_html__( 'Current page of the collection.', 'distributor' ),
 			'type'              => 'integer',
 			'default'           => 1,
 			'sanitize_callback' => 'absint',
 			'validate_callback' => 'rest_validate_request_arg',
 			'minimum'           => 1,
 		),
-		'per_page'    => array(
+		'posts_per_page' => array(
 			'description'       => esc_html__( 'Maximum number of items to be returned in result set.', 'distributor' ),
 			'type'              => 'integer',
-			'default'           => 10,
+			'default'           => 20,
 			'minimum'           => 1,
-			'maximum'           => 100,
 			'sanitize_callback' => 'absint',
 			'validate_callback' => 'rest_validate_request_arg',
 		),
-		'post_type'   => array(
+		'post_type'      => array(
 			'description'       => esc_html__( 'Limit results to content matching a certain type.', 'distributor' ),
 			'type'              => 'string',
 			'default'           => 'post',
 			'sanitize_callback' => 'sanitize_text_field',
 			'validate_callback' => 'rest_validate_request_arg',
 		),
-		'search'      => array(
+		'search'         => array(
 			'description'       => esc_html__( 'Limit results to those matching a string.', 'distributor' ),
 			'type'              => 'string',
 			'validate_callback' => 'rest_validate_request_arg',
 		),
-		'post_status' => array(
+		'post_status'    => array(
 			'default'     => 'publish',
 			'description' => esc_html__( 'Limit result set to content assigned one or more statuses.', 'distributor' ),
 			'type'        => 'array',
@@ -413,7 +412,7 @@ function check_post_types_permissions() {
  */
 function get_pull_content( $request ) {
 	$args = [
-		'posts_per_page' => isset( $request['per_page'] ) ? $request['per_page'] : 10,
+		'posts_per_page' => isset( $request['posts_per_page'] ) ? $request['posts_per_page'] : 20,
 		'paged'          => isset( $request['page'] ) ? $request['page'] : 1,
 		'post_type'      => isset( $request['post_type'] ) ? $request['post_type'] : 'post',
 		'post_status'    => isset( $request['post_status'] ) ? $request['post_status'] : array( 'any' ),
@@ -427,6 +426,20 @@ function get_pull_content( $request ) {
 		$args['post__not_in'] = $request['exclude'];
 	}
 
+	/**
+	 * Filters WP_Query arguments when querying posts via the REST API.
+	 *
+	 * Enables adding extra arguments or setting defaults for a post collection request.
+	 *
+	 * @hook dt_get_pull_content_rest_query_args
+	 *
+	 * @param {array}           $args    Array of arguments for WP_Query.
+	 * @param {WP_REST_Request} $request The REST API request.
+	 *
+	 * @return {array} The array of arguments for WP_Query.
+	 */
+	$args = apply_filters( 'dt_get_pull_content_rest_query_args', $args, $request );
+
 	$query = new \WP_Query( $args, $request );
 
 	if ( empty( $query->posts ) ) {
diff --git a/readme.txt b/readme.txt
@@ -4,14 +4,18 @@ Tags:              content, distribution, syndication, management
 Requires at least: 4.7
 Tested up to:      5.8
 Requires PHP:      5.6
-Stable tag:        1.6.7
+Stable tag:        1.6.8
 License:           GPLv2 or later
 License URI:       http://www.gnu.org/licenses/gpl-2.0.html
 
 Distributor makes it easy to distribute and reuse content across your websites — whether in a single multisite or across the web.
 
 == Description ==
 
+*You can learn more about Distributor's features at [DistributorPlugin.com](https://distributorplugin.com) and documentation at the [Distributor documentation site](https://10up.github.io/distributor/).*
+
+_Note:_ The latest stable version of the plugin is the _stable_ branch. [Download the stable branch]((https://github.com/10up/distributor/archive/stable.zip)) if you are intending to use the plugin in a Production environment.
+
 **Features**
 
 * Distributor supports safe, SEO-friendly content reuse and sharing via "pushing" and "pulling".
