Merge branch 'develop' into fix/1144-webp-support

Author: jeffpaul

.github/screenshots/screenshot-9.jpg

@@ -4,6 +4,34 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [2.2.0] - 2025-09-08
+**Note that this release bumps the WordPress minimum supported version from 6.5 to 6.6.**
+
+### Added
+- The `distributor_register_data` function that enables developers to register stored data references, such as IDs stored in post meta, shortcodes, or block attributes and define custom pre-distribution and post-distribution callbacks to process these references (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc), [@dkotter](https://github.com/dkotter) via [#1302](https://github.com/10up/distributor/pull/1302)).
+- Add some default pre and post callback functions to the `distributor_register_data` function, allowing easy processing of common entities like posts, terms, and media (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc), [@dkotter](https://github.com/dkotter) via [#1309](https://github.com/10up/distributor/pull/1309)).
+- Ability to auto-distribute posts when turned on via a filter, `dt_auto_distribution_enabled` (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter) via [#1321](https://github.com/10up/distributor/pull/1321)).
+
+### Changed
+- Bump WordPress "tested up to" version 6.8 (props [@Sourabh208](https://github.com/Sourabh208), [@dkotter](https://github.com/dkotter) via [#1311](https://github.com/10up/distributor/pull/1311)).
+- Bump WordPress minimum to 6.6 (props [@Sourabh208](https://github.com/Sourabh208), [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1312](https://github.com/10up/distributor/pull/1312)).
+
+### Fixed
+- Ensure post data is slashed when sent via a subscription update (props [@chandrapatel](https://github.com/chandrapatel), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1310](https://github.com/10up/distributor/pull/1310)).
+- Broken images in docs (props [@GaryJones](https://github.com/GaryJones), [@jeffpaul](https://github.com/jeffpaul), [@av3nger](https://github.com/av3nger), [@dkotter](https://github.com/dkotter) via [#1319](https://github.com/10up/distributor/pull/1319)).
+
+### Security
+- Prevent cross-site scripting vulnerabilities on the pull screen (props [@iamdharmesh](https://github.com/iamdharmesh), [@peterwilsoncc](https://github.com/peterwilsoncc), [@jeffpaul](https://github.com/jeffpaul), [@Sidsector9](https://github.com/Sidsector9), [@dkotter](https://github.com/dkotter) via [#1273](https://github.com/10up/distributor/pull/1273), [#1274](https://github.com/10up/distributor/pull/1274), [#1316](https://github.com/10up/distributor/pull/1316)).
+- Bump `ws` from 7.5.10 to 8.18.0 and `@wordpress/scripts` from 26.19.0 to 29.0.0 (props [@dependabot](https://github.com/apps/dependabot), [@Sidsector9](https://github.com/Sidsector9) via [#1270](https://github.com/10up/distributor/pull/1270)).
+- Bump `axios` from 1.7.4 to 1.9.0, `body-parser` from 1.20.2 to 1.20.3, `express` from 4.19.2 to 4.21.2, `@wordpress/e2e-test-utils-playwright` from 1.7.0 to 1.23.0, `http-proxy-middleware` from 2.0.6 to 2.0.9, `tar-fs` from 3.0.4 to 3.0.8, `serialize-javascript` from 6.0.1 to 6.0.2, `mocha` from 10.2.0 to 11.3.0 and `send` from 0.18.0 to 0.19.0; also removes `cookie` (props [@dependabot](https://github.com/apps/dependabot), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#1314](https://github.com/10up/distributor/pull/1314)).
+- Bump `on-headers` from 1.0.2 to 1.1.0 and `compression` from 1.7.4 to 1.8.1 (props [@dependabot](https://github.com/apps/dependabot), [@dkotter](https://github.com/dkotter) via [#1325](https://github.com/10up/distributor/pull/1325)).
+- Bump `tmp` from 0.2.1 to 0.2.5 and `@wordpress/env` from 10.5.0 to 10.29.0 (props [@dependabot](https://github.com/apps/dependabot), [@dkotter](https://github.com/dkotter) via [#1334](https://github.com/10up/distributor/pull/1334)).
+
+### Developer
+- Fix eslint errors (props [@GaryJones](https://github.com/GaryJones), [@iamdharmesh](https://github.com/iamdharmesh) via [#1320](https://github.com/10up/distributor/pull/1320)).
+- Update all third-party actions our workflows rely on to use versions based on specific commit hashes (props [@dkotter](https://github.com/dkotter), [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi) via [#1305](https://github.com/10up/distributor/pull/1305)).
+- Fix featured media E2E tests (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@dkotter](https://github.com/dkotter) via [#1332](https://github.com/10up/distributor/pull/1332)).
+
 ## [2.1.0] - 2025-02-10
 **Note that this release bumps the WordPress minimum supported version from 6.4 to 6.5.**
 
@@ -597,6 +625,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
+[2.2.0]: https://github.com/10up/distributor/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/10up/distributor/compare/2.0.6...2.1.0
 [2.0.6]: https://github.com/10up/distributor/compare/2.0.5...2.0.6
 [2.0.5]: https://github.com/10up/distributor/compare/2.0.4...2.0.5

CHANGELOG.md

@@ -17,15 +17,15 @@ Distributor supports safe, SEO-friendly content reuse and sharing via "pushing"
 
 While logged in and editing or viewing any single post (or custom post type) that can be distributed, a `Distributor` admin bar item will appear, that will facilitate sharing ("pushing") that content to any `connection`.
 
-<a href="http://distributorplugin.com/"><img src="https://distributorplugin.com/wp-content/themes/distributor-theme/assets/img/push-screenshot.jpg" alt="Push the content you’re editing or viewing to any of your other sites from the admin bar" width="600"></a>
+<a href="http://distributorplugin.com/"><img src="/.github/screenshots/screenshot-2.png" alt="Push the content you’re editing or viewing to any of your other sites from the admin bar" width="600"></a>
 
 In the admin dashboard, a top level Distributor menu item links to the "pull" screen. Here, editors can share ("pull") content from any `connection` into the current site.
 
-<a href="http://distributorplugin.com/"><img src="https://distributorplugin.com/wp-content/themes/distributor-theme/assets/img/pull-screenshot.jpg" alt="Pull content from another site from the Distributor admin menu" width="600"></a>
+<a href="http://distributorplugin.com/"><img src="/.github/screenshots/screenshot-6.png" alt="Pull content from another site from the Distributor admin menu" width="600"></a>
 
 Content this is distributed (via Push or Pull) is connected to the original.  Reposted content receives updates from the original, canonical source automatically.
 
-<a href="http://distributorplugin.com/"><img alt="Distributor intuitively presents the origin and status of any reused content" class="browser-frame" src="https://distributorplugin.com/wp-content/themes/distributor-theme/assets/img/syndicated-screenshot.jpg" width="600"></a>
+<a href="http://distributorplugin.com/"><img alt="Distributor intuitively presents the origin and status of any reused content" src="/.github/screenshots/screenshot-9.jpg" width="600"></a>
 
 There are two connection types: `internal` and `external`.
 * Internal connections are other sites inside of the same multisite network. Any user logged into the network can distribute any content in the network to any other sites in the network where that user has permission to publish posts (assuming the site supports the same post type).

CREDITS.md

@@ -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:           2.1.0
+ * Version:           2.2.0
  * Requires at least: 6.6
  * Requires PHP:      7.4
  * Author:            10up Inc.
@@ -28,7 +28,7 @@
 	exit; // Exit if accessed directly.
 }
 
-define( 'DT_VERSION', '2.1.0' );
+define( 'DT_VERSION', '2.2.0' );
 define( 'DT_PLUGIN_FILE', preg_replace( '#^.*plugins/(.*)$#i', '$1', __FILE__ ) );
 define( 'DT_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
 define( 'DT_PLUGIN_FULL_FILE', __FILE__ );

README.md

@@ -0,0 +1,69 @@
+You can enable the automatic distribution of posts upon publication by togging on the "auto-distribute" feature.
+
+To enable auto-distribution, you can include this code in your site's feature plugin.
+
+```php
+	add_filter( 'dt_auto_distribution_enabled', '__return_true' );
+```
+
+This code must run prior to or on the `plugins_loaded` hook. If running on the `plugins_loaded` hook, it must do so at priority 19 or lower.
+
+With auto-distribution enabled, the following will occur:
+
+* upon publication, posts and pages will be pushed to all internal and external connections,
+* the default status for pushing posts is `publish`, and,
+* auto distribution is runs via cron jobs to avoid slowing down the publication process for users.
+
+## Filters
+
+The auto-distribution feature comes with a number of filters in additional to the one above.
+
+### Auto-distributed post types
+
+By default only posts and pages are auto-distributed. To enable auto-distribution of custom post
+types requires the `auto_distribute_supported_post_types` filter be used.
+
+To add a custom post type to supported post types would require the code:
+
+```php
+add_filter( 'auto_distribute_supported_post_types', function( $post_types ) {
+	$post_types[] = 'my_cpt';
+	return $post_types;
+} );
+```
+
+### Default post status.
+
+The `dt_auto_distribution_default_status` filter allows you to filter the default post status for
+distribution. To modify the default post status for one post type but not others, you can use the code:
+
+```php
+function ad_demo_modify_page_default_status( $default_status, $post ) {
+	if ( 'page' !== get_post_type() ) {
+		return $default_status;
+	}
+
+	return 'draft';
+}
+add_filter( 'dt_auto_distribution_default_status', 'ad_demo_modify_page_default_status', 10, 2 );
+```
+
+### Whether to auto-distribute a post
+
+The `dt_auto_distribute_post` filter allows you to filter whether an individual post will be
+auto-distributed. The filter accepts a number of arguments providing the context of the post,
+see the [filter's docs](./dt_auto_distribute_post.html) for further information.'
+
+This filter is only run for post types that are supported, see above.
+
+To prevent auto-distribution to a certain connection type:
+
+```php
+function ad_demo_no_external( $should_distribute, $post, $user_id, $connection_type ) {
+	if ( $connection_type === 'external' ) {
+		return false;
+	}
+	return $should_distribute;
+}
+add_filter( 'dt_auto_distribute_post', 'ad_demo_no_external', 10, 4 );
+```

distributor.php

@@ -10,7 +10,7 @@ The `distributor_register_data` function streamlines the process of updating sto
 - **Extracting the reference:** Defining how to locate the specific attribute or meta key holding the ID.
 - **Processing the data:** Using pre-distribution and post-distribution callbacks to prepare and update the reference IDs, ensuring they point to the correct data on the target site.
 
-#### **Important:** Ensure that this data registration code is added to both the source and target sites. Also, verify that your Distributor plugin version is the same on both sites and equal to or greater than the required version (x.x.x).
+#### **Important:** Ensure that this data registration code is added to both the source and target sites. Also, verify that your Distributor plugin version is the same on both sites and equal to or greater than the required version (2.2.0).
 
 ## Function Definition
 

docs/auto-distribution.md

@@ -14,10 +14,13 @@
 	"snippets": {
 		"title": "Snippets"
 	},
-  "demo-with-playground": {
-    "title": "Demo with Playground"
-  },
-  "stored-id-handling": {
-    "title": "Stored ID Handling"
-  }
+	"demo-with-playground": {
+		"title": "Demo with Playground"
+	},
+	"stored-id-handling": {
+		"title": "Stored ID Handling"
+	},
+	"auto-distribution": {
+		"title": "Enabling Auto Distribution"
+	}
 }