Merge branch 'master' into Comments

README.md

@@ -3,7 +3,7 @@
 **Tags:** OStatus, fediverse, activitypub, activitystream  
 **Requires at least:** 4.7  
 **Tested up to:** 6.3  
-**Stable tag:** 1.0.2  
+**Stable tag:** 1.0.5  
 **Requires PHP:** 5.6  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
@@ -105,6 +105,23 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
 
 Project maintained on GitHub at [automattic/wordpress-activitypub](https://github.com/automattic/wordpress-activitypub).
 
+### 1.0.5 ###
+
+* Fixed: compatibility with WebFinger and NodeInfo plugin
+
+### 1.0.4 ###
+
+* Fixed: Constants were not loaded early enough, resulting in a race condition
+* Fixed: Featured image was ignored when using the block editor
+
+### 1.0.3 ###
+
+* Fixed: compatibility with older WordPress/PHP versions
+* Update: refactoring of the Plugin init process
+* Update: better frontend UX and improved theme compat for blocks
+* Compatibility: add a ACTIVITYPUB_DISABLE_REWRITES constant
+* Compatibility: add pre-fetch hook to allow plugins to hang filters on
+
 ### 1.0.2 ###
 
 * Updated: improved hashtag visibility in default template

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: 1.0.2
+ * Version: 1.0.5
  * Author: Matthias Pfefferle & Automattic
  * Author URI: https://automattic.com/
  * License: MIT
@@ -17,27 +17,26 @@ namespace Activitypub;
 
 use function Activitypub\site_supports_blocks;
 
+require_once __DIR__ . '/includes/compat.php';
 require_once __DIR__ . '/includes/functions.php';
 
 /**
  * Initialize the plugin constants.
  */
-function define_constants() {
-	\defined( 'ACTIVITYPUB_REST_NAMESPACE' ) || \define( 'ACTIVITYPUB_REST_NAMESPACE', 'activitypub/1.0' );
-	\defined( 'ACTIVITYPUB_EXCERPT_LENGTH' ) || \define( 'ACTIVITYPUB_EXCERPT_LENGTH', 400 );
-	\defined( 'ACTIVITYPUB_SHOW_PLUGIN_RECOMMENDATIONS' ) || \define( 'ACTIVITYPUB_SHOW_PLUGIN_RECOMMENDATIONS', true );
-	\defined( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS' ) || \define( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS', 3 );
-	\defined( 'ACTIVITYPUB_HASHTAGS_REGEXP' ) || \define( 'ACTIVITYPUB_HASHTAGS_REGEXP', '(?:(?<=\s)|(?<=<p>)|(?<=<br>)|^)#([A-Za-z0-9_]+)(?:(?=\s|[[:punct:]]|$))' );
-	\defined( 'ACTIVITYPUB_USERNAME_REGEXP' ) || \define( 'ACTIVITYPUB_USERNAME_REGEXP', '(?:([A-Za-z0-9_-]+)@((?:[A-Za-z0-9_-]+\.)+[A-Za-z]+))' );
-	\defined( 'ACTIVITYPUB_CUSTOM_POST_CONTENT' ) || \define( 'ACTIVITYPUB_CUSTOM_POST_CONTENT', "<strong>[ap_title]</strong>\n\n[ap_content]\n\n[ap_hashtags]\n\n[ap_shortlink]" );
-	\defined( 'ACTIVITYPUB_AUTHORIZED_FETCH' ) || \define( 'ACTIVITYPUB_AUTHORIZED_FETCH', false );
-	\defined( 'ACTIVITYPUB_DISABLE_REWRITES' ) || \define( 'ACTIVITYPUB_DISABLE_REWRITES', false );
+\defined( 'ACTIVITYPUB_REST_NAMESPACE' ) || \define( 'ACTIVITYPUB_REST_NAMESPACE', 'activitypub/1.0' );
+\defined( 'ACTIVITYPUB_EXCERPT_LENGTH' ) || \define( 'ACTIVITYPUB_EXCERPT_LENGTH', 400 );
+\defined( 'ACTIVITYPUB_SHOW_PLUGIN_RECOMMENDATIONS' ) || \define( 'ACTIVITYPUB_SHOW_PLUGIN_RECOMMENDATIONS', true );
+\defined( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS' ) || \define( 'ACTIVITYPUB_MAX_IMAGE_ATTACHMENTS', 3 );
+\defined( 'ACTIVITYPUB_HASHTAGS_REGEXP' ) || \define( 'ACTIVITYPUB_HASHTAGS_REGEXP', '(?:(?<=\s)|(?<=<p>)|(?<=<br>)|^)#([A-Za-z0-9_]+)(?:(?=\s|[[:punct:]]|$))' );
+\defined( 'ACTIVITYPUB_USERNAME_REGEXP' ) || \define( 'ACTIVITYPUB_USERNAME_REGEXP', '(?:([A-Za-z0-9_-]+)@((?:[A-Za-z0-9_-]+\.)+[A-Za-z]+))' );
+\defined( 'ACTIVITYPUB_CUSTOM_POST_CONTENT' ) || \define( 'ACTIVITYPUB_CUSTOM_POST_CONTENT', "<strong>[ap_title]</strong>\n\n[ap_content]\n\n[ap_hashtags]\n\n[ap_shortlink]" );
+\defined( 'ACTIVITYPUB_AUTHORIZED_FETCH' ) || \define( 'ACTIVITYPUB_AUTHORIZED_FETCH', false );
+\defined( 'ACTIVITYPUB_DISABLE_REWRITES' ) || \define( 'ACTIVITYPUB_DISABLE_REWRITES', false );
 
-	\define( 'ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
-	\define( 'ACTIVITYPUB_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
-	\define( 'ACTIVITYPUB_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) );
-	\define( 'ACTIVITYPUB_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
-}
+\define( 'ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
+\define( 'ACTIVITYPUB_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
+\define( 'ACTIVITYPUB_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) );
+\define( 'ACTIVITYPUB_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 
 /**
  * Initialize REST routes.
@@ -63,8 +62,6 @@ function rest_init() {
  * Initialize plugin.
  */
 function plugin_init() {
-	define_constants();
-
 	\add_action( 'init', array( __NAMESPACE__ . '\Migration', 'init' ) );
 	\add_action( 'init', array( __NAMESPACE__ . '\Activitypub', 'init' ) );
 	\add_action( 'init', array( __NAMESPACE__ . '\Activity_Dispatcher', 'init' ) );
@@ -85,6 +82,12 @@ function plugin_init() {
 		require_once $debug_file;
 		Debug::init();
 	}
+
+	require_once __DIR__ . '/integration/class-webfinger.php';
+	Integration\Webfinger::init();
+
+	require_once __DIR__ . '/integration/class-nodeinfo.php';
+	Integration\Nodeinfo::init();
 }
 \add_action( 'plugins_loaded', __NAMESPACE__ . '\plugin_init' );
 

includes/compat.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * ActivityPub implementation for WordPress/PHP functions either missing from older WordPress/PHP versions or not included by default.
+ */
+
+if ( ! function_exists( 'str_starts_with' ) ) {
+	/**
+	 * Polyfill for `str_starts_with()` function added in PHP 8.0.
+	 *
+	 * Performs a case-sensitive check indicating if
+	 * the haystack begins with needle.
+	 *
+	 * @param string $haystack The string to search in.
+	 * @param string $needle   The substring to search for in the `$haystack`.
+	 * @return bool True if `$haystack` starts with `$needle`, otherwise false.
+	 */
+	function str_starts_with( $haystack, $needle ) {
+		if ( '' === $needle ) {
+			return true;
+		}
+
+		return 0 === strpos( $haystack, $needle );
+	}
+}
+
+if ( ! function_exists( 'get_self_link' ) ) {
+	/**
+	 * Returns the link for the currently displayed feed.
+	 *
+	 * @return string Correct link for the atom:self element.
+	 */
+	function get_self_link() {
+		$host = wp_parse_url( home_url() );
+		$path = isset( $_SERVER['REQUEST_URI'] ) ? sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : '';
+		return esc_url( apply_filters( 'self_link', set_url_scheme( 'http://' . $host['host'] . $path ) ) );
+	}
+}

includes/functions.php

@@ -682,19 +682,6 @@ function is_single_user() {
 	return false;
 }
 
-if ( ! function_exists( 'get_self_link' ) ) {
-	/**
-	 * Returns the link for the currently displayed feed.
-	 *
-	 * @return string Correct link for the atom:self element.
-	 */
-	function get_self_link() {
-		$host = wp_parse_url( home_url() );
-		$path = isset( $_SERVER['REQUEST_URI'] ) ? sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : '';
-		return esc_url( apply_filters( 'self_link', set_url_scheme( 'http://' . $host['host'] . $path ) ) );
-	}
-}
-
 /**
  * Check if a site supports the block editor.
  *

includes/rest/class-nodeinfo.php

@@ -18,9 +18,6 @@ class Nodeinfo {
 	 */
 	public static function init() {
 		self::register_routes();
-
-		\add_filter( 'nodeinfo_data', array( self::class, 'add_nodeinfo_discovery' ), 10, 2 );
-		\add_filter( 'nodeinfo2_data', array( self::class, 'add_nodeinfo2_discovery' ), 10 );
 	}
 
 	/**
@@ -194,36 +191,4 @@ class Nodeinfo {
 
 		return new \WP_REST_Response( $discovery, 200 );
 	}
-
-	/**
-	 * Extend NodeInfo data
-	 *
-	 * @param array  $nodeinfo NodeInfo data
-	 * @param string           The NodeInfo Version
-	 *
-	 * @return array           The extended array
-	 */
-	public static function add_nodeinfo_discovery( $nodeinfo, $version ) {
-		if ( '2.0' === $version ) {
-			$nodeinfo['protocols'][] = 'activitypub';
-		} else {
-			$nodeinfo['protocols']['inbound'][]  = 'activitypub';
-			$nodeinfo['protocols']['outbound'][] = 'activitypub';
-		}
-
-		return $nodeinfo;
-	}
-
-	/**
-	 * Extend NodeInfo2 data
-	 *
-	 * @param  array $nodeinfo NodeInfo2 data
-	 *
-	 * @return array           The extended array
-	 */
-	public static function add_nodeinfo2_discovery( $nodeinfo ) {
-		$nodeinfo['protocols'][] = 'activitypub';
-
-		return $nodeinfo;
-	}
 }

includes/rest/class-webfinger.php

@@ -20,9 +20,6 @@ class Webfinger {
 	 */
 	public static function init() {
 		self::register_routes();
-
-		\add_filter( 'webfinger_user_data', array( self::class, 'add_user_discovery' ), 10, 3 );
-		\add_filter( 'webfinger_data', array( self::class, 'add_pseudo_user_discovery' ), 99, 2 );
 	}
 
 	/**
@@ -81,44 +78,6 @@ class Webfinger {
 		return $params;
 	}
 
-	/**
-	 * Add WebFinger discovery links
-	 *
-	 * @param array   $array    the jrd array
-	 * @param string  $resource the WebFinger resource
-	 * @param WP_User $user     the WordPress user
-	 *
-	 * @return array the jrd array
-	 */
-	public static function add_user_discovery( $array, $resource, $user ) {
-		$user = User_Collection::get_by_id( $user->ID );
-
-		$array['links'][] = array(
-			'rel'  => 'self',
-			'type' => 'application/activity+json',
-			'href' => $user->get_url(),
-		);
-
-		return $array;
-	}
-
-	/**
-	 * Add WebFinger discovery links
-	 *
-	 * @param array   $array    the jrd array
-	 * @param string  $resource the WebFinger resource
-	 * @param WP_User $user     the WordPress user
-	 *
-	 * @return array the jrd array
-	 */
-	public static function add_pseudo_user_discovery( $array, $resource ) {
-		if ( $array ) {
-			return $array;
-		}
-
-		return self::get_profile( $resource );
-	}
-
 	/**
 	 * Get the WebFinger profile.
 	 *

includes/transformer/class-post.php

@@ -229,7 +229,8 @@ class Post {
 		if ( $max_images > 0 ) {
 			// first try to get images that are actually in the post content
 			if ( site_supports_blocks() && \has_blocks( $this->wp_post->post_content ) ) {
-				$image_ids = $this->get_block_image_ids( $max_images, $image_ids );
+				$block_image_ids = $this->get_block_image_ids( $max_images, $image_ids );
+				$image_ids = \array_merge( $image_ids, $block_image_ids );
 			} else {
 				// fallback to images attached to the post
 				$query = new \WP_Query(

integration/class-buddypress.php

@@ -1,7 +1,15 @@
 <?php
 namespace Activitypub\Integration;
 
+/**
+ * Compatibility with the BuddyPress plugin
+ *
+ * @see https://buddypress.org/
+ */
 class Buddypress {
+	/**
+	 * Initialize the class, registering WordPress hooks
+	 */
 	public static function init() {
 		\add_filter( 'activitypub_json_author_array', array( self::class, 'add_user_metadata' ), 11, 2 );
 	}

integration/class-nodeinfo.php

@@ -0,0 +1,49 @@
+<?php
+namespace Activitypub\Integration;
+
+/**
+ * Compatibility with the NodeInfo plugin
+ *
+ * @see https://wordpress.org/plugins/nodeinfo/
+ */
+class Nodeinfo {
+	/**
+	 * Initialize the class, registering WordPress hooks
+	 */
+	public static function init() {
+		\add_filter( 'nodeinfo_data', array( self::class, 'add_nodeinfo_discovery' ), 10, 2 );
+		\add_filter( 'nodeinfo2_data', array( self::class, 'add_nodeinfo2_discovery' ), 10 );
+	}
+
+	/**
+	 * Extend NodeInfo data
+	 *
+	 * @param array  $nodeinfo NodeInfo data
+	 * @param string           The NodeInfo Version
+	 *
+	 * @return array The extended array
+	 */
+	public static function add_nodeinfo_discovery( $nodeinfo, $version ) {
+		if ( $version >= '2.0' ) {
+			$nodeinfo['protocols'][] = 'activitypub';
+		} else {
+			$nodeinfo['protocols']['inbound'][]  = 'activitypub';
+			$nodeinfo['protocols']['outbound'][] = 'activitypub';
+		}
+
+		return $nodeinfo;
+	}
+
+	/**
+	 * Extend NodeInfo2 data
+	 *
+	 * @param  array $nodeinfo NodeInfo2 data
+	 *
+	 * @return array The extended array
+	 */
+	public static function add_nodeinfo2_discovery( $nodeinfo ) {
+		$nodeinfo['protocols'][] = 'activitypub';
+
+		return $nodeinfo;
+	}
+}

integration/class-webfinger.php

@@ -0,0 +1,57 @@
+<?php
+namespace Activitypub\Integration;
+
+use Activitypub\Collection\Users as User_Collection;
+
+/**
+ * Compatibility with the WebFinger plugin
+ *
+ * @see https://wordpress.org/plugins/webfinger/
+ */
+class Webfinger {
+	/**
+	 * Initialize the class, registering WordPress hooks
+	 */
+	public static function init() {
+		\add_filter( 'webfinger_user_data', array( self::class, 'add_user_discovery' ), 10, 3 );
+		\add_filter( 'webfinger_data', array( self::class, 'add_pseudo_user_discovery' ), 99, 2 );
+	}
+
+	/**
+	 * Add WebFinger discovery links
+	 *
+	 * @param array   $array    the jrd array
+	 * @param string  $resource the WebFinger resource
+	 * @param WP_User $user     the WordPress user
+	 *
+	 * @return array the jrd array
+	 */
+	public static function add_user_discovery( $array, $resource, $user ) {
+		$user = User_Collection::get_by_id( $user->ID );
+
+		$array['links'][] = array(
+			'rel'  => 'self',
+			'type' => 'application/activity+json',
+			'href' => $user->get_url(),
+		);
+
+		return $array;
+	}
+
+	/**
+	 * Add WebFinger discovery links
+	 *
+	 * @param array   $array    the jrd array
+	 * @param string  $resource the WebFinger resource
+	 * @param WP_User $user     the WordPress user
+	 *
+	 * @return array the jrd array
+	 */
+	public static function add_pseudo_user_discovery( $array, $resource ) {
+		if ( $array ) {
+			return $array;
+		}
+
+		return self::get_profile( $resource );
+	}
+}

readme.txt

@@ -3,7 +3,7 @@ Contributors: automattic, pfefferle, mediaformat, mattwiebe, akirk, jeherve, nur
 Tags: OStatus, fediverse, activitypub, activitystream
 Requires at least: 4.7
 Tested up to: 6.3
-Stable tag: 1.0.2
+Stable tag: 1.0.5
 Requires PHP: 5.6
 License: MIT
 License URI: http://opensource.org/licenses/MIT
@@ -105,6 +105,23 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
 
 Project maintained on GitHub at [automattic/wordpress-activitypub](https://github.com/automattic/wordpress-activitypub).
 
+= 1.0.5 =
+
+* Fixed: compatibility with WebFinger and NodeInfo plugin
+
+= 1.0.4 =
+
+* Fixed: Constants were not loaded early enough, resulting in a race condition
+* Fixed: Featured image was ignored when using the block editor
+
+= 1.0.3 =
+
+* Fixed: compatibility with older WordPress/PHP versions
+* Update: refactoring of the Plugin init process
+* Update: better frontend UX and improved theme compat for blocks
+* Compatibility: add a ACTIVITYPUB_DISABLE_REWRITES constant
+* Compatibility: add pre-fetch hook to allow plugins to hang filters on
+
 = 1.0.2 =
 
 * Updated: improved hashtag visibility in default template