Merge branch 'trunk' into improve/preview-row-action

Automattic · Nov 15, 2024 · e989496 · e989496
2 parents bed7643 + 9be0677
commit e989496
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,11 +15,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Reuse constants once they're defined
 * "FEP-b2b8: Long-form Text" support
+* Admin notice for plain permalink settings is more user-friendly and actionable
+* Post-Formats support
 
 ### Fixed
 
 * Do not display ActivityPub's user sub-menus to users who do not have the capabilities of writing posts.
 * Proper margins for notices and font size for page title in settings screen
+* Ensure that `?author=0` resolves to blog user
 
 ### Removed
 

diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 **Contributors:** [automattic](https://profiles.wordpress.org/automattic/), [pfefferle](https://profiles.wordpress.org/pfefferle/), [mediaformat](https://profiles.wordpress.org/mediaformat/), [mattwiebe](https://profiles.wordpress.org/mattwiebe/), [akirk](https://profiles.wordpress.org/akirk/), [jeherve](https://profiles.wordpress.org/jeherve/), [nuriapena](https://profiles.wordpress.org/nuriapena/), [cavalierlife](https://profiles.wordpress.org/cavalierlife/)  
 **Tags:** OStatus, fediverse, activitypub, activitystream  
 **Requires at least:** 5.5  
-**Tested up to:** 6.6  
-**Stable tag:** 4.1.1  
+**Tested up to:** 6.7  
+**Stable tag:** 4.2.0  
 **Requires PHP:** 7.0  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
@@ -152,11 +152,16 @@ For reasons of data protection, it is not possible to see the followers of other
 
 ## Changelog ##
 
-### Dev ###
+### 4.2.0 ###
 
+* Added: Unit tests for the `ActivityPub\Transformer\Post` class
 * Improved: Reuse constants once they're defined
 * Improved: "FEP-b2b8: Long-form Text" support
-* Fixed: do not display ActivityPub's user sub-menus to users who do not have the capabilities of writing posts.
+* Improved: Admin notice for plain permalink settings is more user-friendly and actionable
+* Improved: Post-Formats support
+* Fixed: Do not display ActivityPub's user sub-menus to users who do not have the capabilities of writing posts.
+* Fixed: Proper margins for notices and font size for page title in settings screen.
+* Fixed: Ensure that `?author=0` resolves to blog user
 
 ### 4.1.1 ###
 

diff --git a/activitypub.php b/activitypub.php
@@ -3,7 +3,7 @@
  * Plugin Name: ActivityPub
  * Plugin URI: https://github.com/pfefferle/wordpress-activitypub/
  * Description: The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.
- * Version: 4.1.1
+ * Version: 4.2.0
  * Author: Matthias Pfefferle & Automattic
  * Author URI: https://automattic.com/
  * License: MIT
@@ -22,7 +22,7 @@
 require_once __DIR__ . '/includes/compat.php';
 require_once __DIR__ . '/includes/functions.php';
 
-\define( 'ACTIVITYPUB_PLUGIN_VERSION', '4.1.1' );
+\define( 'ACTIVITYPUB_PLUGIN_VERSION', '4.2.0' );
 
 /**
  * Initialize the plugin constants.

diff --git a/includes/class-admin.php b/includes/class-admin.php
@@ -102,7 +102,11 @@ public static function admin_menu() {
 	public static function admin_notices() {
 		$permalink_structure = \get_option( 'permalink_structure' );
 		if ( empty( $permalink_structure ) ) {
-			$admin_notice = \__( 'You are using the ActivityPub plugin with a permalink structure of "plain". This will prevent ActivityPub from working.  Please go to "Settings" / "Permalinks" and choose a permalink structure other than "plain".', 'activitypub' );
+			$admin_notice = sprintf(
+				/* translators: %s: Permalink settings URL. */
+				\__( 'ActivityPub needs SEO-friendly URLs to work properly. Please <a href="%s">update your permalink structure</a> to an option other than Plain.', 'activitypub' ),
+				esc_url( admin_url( 'options-permalink.php' ) )
+			);
 			self::show_admin_notice( $admin_notice, 'error' );
 		}
 

diff --git a/includes/functions.php b/includes/functions.php
@@ -199,10 +199,7 @@ function url_to_authorid( $url ) {
 
 	// First, check to see if there is a 'author=N' to match against.
 	if ( \preg_match( '/[?&]author=(\d+)/i', $url, $values ) ) {
-		$id = \absint( $values[1] );
-		if ( $id ) {
-			return $id;
-		}
+		return \absint( $values[1] );
 	}
 
 	// Check to see if we are using rewrite rules.

diff --git a/readme.txt b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: automattic, pfefferle, mediaformat, mattwiebe, akirk, jeherve, nuriapena, cavalierlife
 Tags: OStatus, fediverse, activitypub, activitystream
 Requires at least: 5.5
-Tested up to: 6.6
-Stable tag: 4.1.1
+Tested up to: 6.7
+Stable tag: 4.2.0
 Requires PHP: 7.0
 License: MIT
 License URI: http://opensource.org/licenses/MIT
@@ -150,13 +150,16 @@ For reasons of data protection, it is not possible to see the followers of other
 
 == Changelog ==
 
-= Dev =
+= 4.2.0 =
 
 * Added: Unit tests for the `ActivityPub\Transformer\Post` class
 * Improved: Reuse constants once they're defined
 * Improved: "FEP-b2b8: Long-form Text" support
+* Improved: Admin notice for plain permalink settings is more user-friendly and actionable
+* Improved: Post-Formats support
 * Fixed: Do not display ActivityPub's user sub-menus to users who do not have the capabilities of writing posts.
 * Fixed: Proper margins for notices and font size for page title in settings screen.
+* Fixed: Ensure that `?author=0` resolves to blog user
 
 = 4.1.1 =