Merge branch 'master' into add/ServerActivities

Author: pfefferle

.github/workflows/phpunit.yml

@@ -15,11 +15,9 @@ jobs:
        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=10s --health-retries=10
     strategy:
       matrix:
-        php-versions: ['5.6', '7.0', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
         include:
           - wp-version: latest
-          - wp-version: '6.2'
-            php-versions: '5.6'
     steps:
       - name: Checkout
         uses: actions/checkout@v2

CHANGELOG.md

@@ -5,6 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.0] - 2024-07-01
+
+### Added
+
+* WebFinger cors header
+* WebFinger Content-Type
+* The Fediverse creator of a post to OpenGraph
+
+### Changed
+
+* Try to lookup local users first for Enable Mastodon Apps
+* Send also Announces for deletes
+* Load time by adding `count_total=false` to `WP_User_Query`
+
+### Fixed
+
+* Several WebFinger issues
+* Redirect issue for Application user
+* Accessibilty issues with missing screen-reader-text on User overview page
+
+
 ## [2.4.0] - 2024-06-05
 
 ### Added
@@ -778,6 +799,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * initial
 
+[2.5.0]: https://github.com/Automattic/wordpress-activitypub/compare/2.4.0...2.5.0
 [2.4.0]: https://github.com/Automattic/wordpress-activitypub/compare/2.3.1...2.4.0
 [2.3.1]: https://github.com/Automattic/wordpress-activitypub/compare/2.3.0...2.3.1
 [2.3.0]: https://github.com/Automattic/wordpress-activitypub/compare/2.2.0...2.3.0

README.md

@@ -3,8 +3,8 @@
 **Tags:** OStatus, fediverse, activitypub, activitystream  
 **Requires at least:** 5.5  
 **Tested up to:** 6.5  
-**Stable tag:** 2.4.0  
-**Requires PHP:** 5.6  
+**Stable tag:** 2.5.0  
+**Requires PHP:** 7.0  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
 
@@ -101,9 +101,9 @@ Add the following to the site.conf in sites-available:
 
 Where 'blog' is the path to the subdirectory at which your blog resides.
 
-### What if you are running your blog in a subdirectory, but have a different [wp_siteurl](https://wordpress.org/documentation/article/giving-wordpress-its-own-directory/)? ###
+### What if you are running your blog in a subdirectory? ###
 
-In that case you don't need the redirect, because the index.php will take care of that.
+If you are running your blog in a subdirectory, but have a different [wp_siteurl](https://wordpress.org/documentation/article/giving-wordpress-its-own-directory/), you don't need the redirect, because the index.php will take care of that.
 
 ### Constants ###
 
@@ -133,6 +133,18 @@ For reasons of data protection, it is not possible to see the followers of other
 
 ## Changelog ##
 
+### 2.5.0 ###
+
+* Added: WebFinger cors header
+* Added: WebFinger Content-Type
+* Added: The Fediverse creator of a post to OpenGraph
+* Improved: Try to lookup local users first for Enable Mastodon Apps
+* Improved: Send also Announces for deletes
+* Improved: Load time by adding `count_total=false` to `WP_User_Query`
+* Fixed: Several WebFinger issues
+* Fixed: Redirect issue for Application user
+* Fixed: Accessibilty issues with missing screen-reader-text on User overview page
+
 ### 2.4.0 ###
 
 * Added: A core/embed block filter to transform iframes to links

activitypub.php

@@ -3,12 +3,12 @@
  * 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: 2.4.0
+ * Version: 2.5.0
  * Author: Matthias Pfefferle & Automattic
  * Author URI: https://automattic.com/
  * License: MIT
  * License URI: http://opensource.org/licenses/MIT
- * Requires PHP: 5.6
+ * Requires PHP: 7.0
  * Text Domain: activitypub
  * Domain Path: /languages
  */
@@ -23,7 +23,7 @@
 require_once __DIR__ . '/includes/compat.php';
 require_once __DIR__ . '/includes/functions.php';
 
-\define( 'ACTIVITYPUB_PLUGIN_VERSION', '2.4.0' );
+\define( 'ACTIVITYPUB_PLUGIN_VERSION', '2.5.0' );
 
 /**
  * Initialize the plugin constants.
@@ -104,6 +104,9 @@ function plugin_init() {
 	require_once __DIR__ . '/integration/class-enable-mastodon-apps.php';
 	Integration\Enable_Mastodon_Apps::init();
 
+	require_once __DIR__ . '/integration/class-opengraph.php';
+	Integration\Opengraph::init();
+
 	if ( \defined( 'JETPACK__VERSION' ) && ! \defined( 'IS_WPCOM' ) ) {
 		require_once __DIR__ . '/integration/class-jetpack.php';
 		Integration\Jetpack::init();

composer.json

@@ -3,7 +3,7 @@
     "description": "The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.",
     "type": "wordpress-plugin",
     "require": {
-        "php": ">=5.6.0",
+        "php": ">=7.0",
         "composer/installers": "^1.0 || ^2.0"
     },
     "require-dev": {

includes/activity/extended-object/README.md

@@ -1,3 +1,5 @@
+# Extended Objects
+
 This folder contains more complex ActivityPub objects.
 
-Although they could be created using the Base_Object, they provide an easier structure for creating objects with maximum compatibility.
+Although they could be created using the `Base_Object`, they provide an easier structure for creating objects with maximum compatibility.

includes/class-admin.php

@@ -423,9 +423,9 @@ public static function manage_users_custom_column( $output, $column_name, $user_
 		}
 
 		if ( \user_can( $user_id, 'activitypub' ) ) {
-			return '✓';
+			return '<span aria-hidden="true">&#x2713;</span><span class="screen-reader-text">' . esc_html__( 'ActivityPub enabled for this author', 'activitypub' ) . '</span>';
 		} else {
-			return '&#x2717;';
+			return '<span aria-hidden="true">&#x2717;</span><span class="screen-reader-text">' . esc_html__( 'ActivityPub disabled for this author', 'activitypub' ) . '</span>';
 		}
 	}
 

includes/class-comment.php

@@ -241,7 +241,7 @@ public static function should_be_federated( $comment ) {
 	 *
 	 * @param string $id ActivityPub object ID (usually a URL) to check.
 	 *
-	 * @return int|boolean Comment ID, or false on failure.
+	 * @return \WP_Comment|false Comment object, or false on failure.
 	 */
 	public static function object_id_to_comment( $id ) {
 		$comment_query = new WP_Comment_Query(

includes/class-scheduler.php

@@ -133,9 +133,16 @@ public static function schedule_post_activity( $new_status, $old_status, $post )
 
 		$type = false;
 
-		if ( 'publish' === $new_status && 'publish' !== $old_status ) {
+		if (
+			'publish' === $new_status &&
+			'publish' !== $old_status
+		) {
 			$type = 'Create';
-		} elseif ( 'publish' === $new_status ) {
+		} elseif (
+			'publish' === $new_status ||
+			( 'draft' === $new_status &&
+			'draft' !== $old_status )
+		) {
 			$type = 'Update';
 		} elseif ( 'trash' === $new_status ) {
 			$type = 'Delete';

includes/class-webfinger.php

@@ -46,7 +46,10 @@ public static function resolve( $uri ) {
 			return new WP_Error(
 				'webfinger_missing_links',
 				__( 'No valid Link elements found.', 'activitypub' ),
-				$data
+				array(
+					'status' => 400,
+					'data'   => $data,
+				)
 			);
 		}
 
@@ -65,7 +68,10 @@ public static function resolve( $uri ) {
 		return new WP_Error(
 			'webfinger_url_no_activitypub',
 			__( 'The Site supports WebFinger but not ActivityPub', 'activitypub' ),
-			$data
+			array(
+				'status' => 400,
+				'data'   => $data,
+			)
 		);
 	}
 
@@ -103,7 +109,10 @@ public static function uri_to_acct( $uri ) {
 		return new WP_Error(
 			'webfinger_url_no_acct',
 			__( 'No acct URI found.', 'activitypub' ),
-			$data
+			array(
+				'status' => 400,
+				'data'   => $data,
+			)
 		);
 	}
 
@@ -144,7 +153,14 @@ public static function get_identifier_and_host( $url ) {
 		}
 
 		if ( empty( $host ) ) {
-			return new WP_Error( 'webfinger_invalid_identifier', __( 'Invalid Identifier', 'activitypub' ) );
+			return new WP_Error(
+				'webfinger_invalid_identifier',
+				__( 'Invalid Identifier', 'activitypub' ),
+				array(
+					'status' => 400,
+					'data'   => $url,
+				)
+			);
 		}
 
 		return array( $identifier, $host );
@@ -187,7 +203,10 @@ public static function get_data( $uri ) {
 			return new WP_Error(
 				'webfinger_url_not_accessible',
 				__( 'The WebFinger Resource is not accessible.', 'activitypub' ),
-				$webfinger_url
+				array(
+					'status' => 400,
+					'data'   => $webfinger_url,
+				)
 			);
 		}
 
@@ -215,7 +234,10 @@ public static function get_remote_follow_endpoint( $uri ) {
 			return new WP_Error(
 				'webfinger_missing_links',
 				__( 'No valid Link elements found.', 'activitypub' ),
-				$data
+				array(
+					'status' => 400,
+					'data'   => $data,
+				)
 			);
 		}
 
@@ -228,7 +250,10 @@ public static function get_remote_follow_endpoint( $uri ) {
 		return new WP_Error(
 			'webfinger_missing_remote_follow_endpoint',
 			__( 'No valid Remote-Follow endpoint found.', 'activitypub' ),
-			$data
+			array(
+				'status' => 400,
+				'data'   => $data,
+			)
 		);
 	}
 

includes/collection/class-interactions.php

@@ -54,10 +54,12 @@ public static function add_comment( $activity ) {
 			return false;
 		}
 
+		$url = object_to_uri( $meta['url'] );
+
 		$commentdata = array(
 			'comment_post_ID' => $comment_post_id,
 			'comment_author' => isset( $meta['name'] ) ? \esc_attr( $meta['name'] ) : \esc_attr( $meta['preferredUsername'] ),
-			'comment_author_url' => \esc_url_raw( $meta['url'] ),
+			'comment_author_url' => \esc_url_raw( $url ),
 			'comment_content' => \addslashes( $activity['object']['content'] ),
 			'comment_type' => 'comment',
 			'comment_author_email' => '',
@@ -73,7 +75,7 @@ public static function add_comment( $activity ) {
 		}
 
 		if ( isset( $activity['object']['url'] ) ) {
-			$commentdata['comment_meta']['source_url'] = \esc_url_raw( $activity['object']['url'] );
+			$commentdata['comment_meta']['source_url'] = \esc_url_raw( object_to_uri( $activity['object']['url'] ) );
 		}
 
 		// disable flood control
@@ -198,7 +200,7 @@ public static function get_interactions_by_actor( $actor ) {
 
 		// get URL, because $actor seems to be the ID
 		if ( $meta && ! is_wp_error( $meta ) && isset( $meta['url'] ) ) {
-			$actor = $meta['url'];
+			$actor = object_to_uri( $meta['url'] );
 		}
 
 		$args = array(

includes/functions.php

@@ -794,6 +794,7 @@ function is_local_comment( $comment ) {
  * Mark a WordPress object as federated.
  *
  * @param WP_Comment|WP_Post|mixed $wp_object
+ *
  * @return void
  */
 function set_wp_object_state( $wp_object, $state ) {
@@ -808,6 +809,25 @@ function set_wp_object_state( $wp_object, $state ) {
 	}
 }
 
+/**
+ * Get the federation state of a WordPress object.
+ *
+ * @param WP_Comment|WP_Post|mixed $wp_object
+ *
+ * @return string|false The state of the object or false if not found.
+ */
+function get_wp_object_state( $wp_object ) {
+	$meta_key = 'activitypub_status';
+
+	if ( $wp_object instanceof \WP_Post ) {
+		return \get_post_meta( $wp_object->ID, $meta_key, true );
+	} elseif ( $wp_object instanceof \WP_Comment ) {
+		return \get_comment_meta( $wp_object->comment_ID, $meta_key, true );
+	} else {
+		return \apply_filters( 'activitypub_get_wp_object_state', false, $wp_object );
+	}
+}
+
 /**
  * Get the description of a post type.
  *

includes/handler/class-create.php

@@ -61,7 +61,7 @@ public static function handle_create( $array, $user_id, $object = null ) {
 		$state    = Interactions::add_comment( $array );
 		$reaction = null;
 
-		if ( $state && ! \is_wp_error( $reaction ) ) {
+		if ( $state && ! \is_wp_error( $state ) ) {
 			$reaction = \get_comment( $state );
 		}
 

includes/rest/class-comment.php

@@ -29,7 +29,7 @@ public static function init() {
 	public static function register_routes() {
 		\register_rest_route(
 			ACTIVITYPUB_REST_NAMESPACE,
-			'/(users|actors)/(?P<comment_id>\d+)/remote-reply',
+			'/comments/(?P<comment_id>\d+)/remote-reply',
 			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,

includes/transformer/class-post.php

@@ -101,6 +101,9 @@ public function get_url() {
 
 		if ( 'trash' === get_post_status( $post ) ) {
 			$permalink = \get_post_meta( $post->ID, 'activitypub_canonical_url', true );
+		} elseif ( 'draft' === get_post_status( $post ) && get_sample_permalink( $post->ID ) ) {
+			$sample    = get_sample_permalink( $post->ID );
+			$permalink = str_replace( array( '%pagename%', '%postname%' ), $sample[1], $sample[0] );
 		} else {
 			$permalink = \get_permalink( $post );
 		}
@@ -137,6 +140,11 @@ protected function get_attributed_to() {
 	 * @return array The Attachments.
 	 */
 	protected function get_attachment() {
+		// Remove attachments from drafts.
+		if ( 'draft' === \get_post_status( $this->wp_object ) ) {
+			return array();
+		}
+
 		// Once upon a time we only supported images, but we now support audio/video as well.
 		// We maintain the image-centric naming for backwards compatibility.
 		$max_media = \intval(
@@ -692,6 +700,11 @@ protected function get_summary() {
 			return null;
 		}
 
+		// Remove Teaser from drafts.
+		if ( 'draft' === \get_post_status( $this->wp_object ) ) {
+			return \__( '(This post is being modified)', 'activitypub' );
+		}
+
 		$content = \get_post_field( 'post_content', $this->wp_object->ID );
 		$content = \html_entity_decode( $content );
 		$content = \wp_strip_all_tags( $content );
@@ -746,6 +759,11 @@ protected function get_name() {
 	 * @return string The content.
 	 */
 	protected function get_content() {
+		// Remove Content from drafts.
+		if ( 'draft' === \get_post_status( $this->wp_object ) ) {
+			return \__( '(This post is being modified)', 'activitypub' );
+		}
+
 		global $post;
 
 		/**