change hook name for registering transformers

follow WordPress coding style and coding style of this plugin

activitypub.php

@@ -33,7 +33,7 @@ require_once __DIR__ . '/includes/functions.php';
 \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_DEFAULT_TRANSFORMER' ) || \define( 'ACTIVITYPUB_DEFAULT_TRANSFORMER', 'activitypub/defualt' );
+\defined( 'ACTIVITYPUB_DEFAULT_TRANSFORMER' ) || \define( 'ACTIVITYPUB_DEFAULT_TRANSFORMER', 'activitypub/default' );
 
 
 \define( 'ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );

includes/class-activity-dispatcher.php

@@ -5,7 +5,7 @@ use WP_Post;
 use Activitypub\Activity\Activity;
 use Activitypub\Collection\Users;
 use Activitypub\Collection\Followers;
-use Activitypub\Transformers_Manager;
+use Activitypub\Transformer\Transformers_Manager;
 
 use function Activitypub\is_single_user;
 use function Activitypub\is_user_disabled;
@@ -65,7 +65,7 @@ class Activity_Dispatcher {
 			return;
 		}
 
-		$transformer = \Activitypub\Transformers_Manager::instance()->get_transformer( $wp_post );
+		$transformer = \Activitypub\Transformer\Transformers_Manager::instance()->get_transformer( $wp_post );
 		$object = $transformer->to_object();
 
 		$activity = new Activity();
@@ -102,7 +102,7 @@ class Activity_Dispatcher {
 			return;
 		}
 
-		$transformer = \Activitypub\Transformers_Manager::instance()->get_transformer( $wp_post );
+		$transformer = \Activitypub\Transformer\Transformers_Manager::instance()->get_transformer( $wp_post );
 		$object = $transformer->to_object();
 
 		$activity = new Activity();

includes/class-admin.php

@@ -3,7 +3,7 @@ namespace Activitypub;
 
 use WP_User_Query;
 use Activitypub\Model\Blog_User;
-use Activitypub\Base\Transformer_Base;
+use Activitypub\Base\Transformer\Base as Transformer_Base;
 
 /**
  * ActivityPub Admin Class
@@ -24,9 +24,14 @@ class Admin {
 			\add_action( 'show_user_profile', array( self::class, 'add_profile' ) );
 		}
 
-		add_filter( 'activitypub/transformers/is_transformer_enabled', function( $should_register, Transformer_Base $widget_instance ) {
+		add_filter(
+			'activitypub/transformers/is_transformer_enabled',
+			function( $should_register, Transformer_Base $transformer_instance ) {
 				return ! Options::is_transformer_disabled( $transformer_instance->get_name() );
-		}, 10, 2 );
+			},
+			10,
+			2
+		);
 	}
 
 	/**
@@ -186,7 +191,7 @@ class Admin {
 				),
 				'sanitize_callback' => function ( $value ) {
 					// Check if $value is an array
-					if (!is_array($value)) {
+					if ( ! is_array( $value ) ) {
 						return array();
 					}
 					$value_keys = array_keys( $value );
@@ -195,12 +200,11 @@ class Admin {
 
 					// Unset the keys that are missing in $keysToCheck
 					foreach ( array_diff( $value_keys, $all_public_post_types ) as $missing_key ) {
-						unset($value[$missing_key]);
+						unset( $value[ $missing_key ] );
 					}
 					// var_dump($value);
 					return $value;
-
+				},
-				}
 			)
 		);
 		\register_setting(

includes/class-webfinger.php

@@ -41,9 +41,14 @@ class Webfinger {
 	 * @return string|WP_Error The URL or WP_Error
 	 */
 	public static function resolve( $resource ) {
+		if ( ! $resource ) {
+			return null;
+		}
+
 		if ( ! preg_match( '/^@?' . ACTIVITYPUB_USERNAME_REGEXP . '$/i', $resource, $m ) ) {
 			return null;
 		}
+
 		$transient_key = 'activitypub_resolve_' . ltrim( $resource, '@' );
 
 		$link = \get_transient( $transient_key );

includes/model/class-post.php

@@ -1,7 +1,7 @@
 <?php
 namespace Activitypub\Model;
 
-use Activitypub\Transformer_Post as Post_Transformer;
+use Activitypub\Transformer\Post as Transformer_Post;
 
 /**
  * ActivityPub Post Class
@@ -31,10 +31,10 @@ class Post {
 	 */
 	// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed, VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
 	public function __construct( $post, $post_author = null ) {
-		_deprecated_function( __CLASS__, '1.0.0', '\Activitypub\Transformer_Post' );
+		_deprecated_function( __CLASS__, '1.0.0', '\Activitypub\Transformer\Post' );
 
 		$this->post   = $post;
-		$this->object = Post_Transformer->set_wp_post( $post )->to_object();
+		$this->object = Transformer_Post->set_wp_post( $post )->to_object();
 	}
 
 	/**

includes/rest/class-collection.php

@@ -4,7 +4,7 @@ namespace Activitypub\Rest;
 use WP_Error;
 use WP_REST_Server;
 use WP_REST_Response;
-use Activitypub\Transformers_Manager;
+use Activitypub\Transformer\Transformers_Manager;
 use Activitypub\Activity\Activity;
 use Activitypub\Collection\Users as User_Collection;
 

includes/rest/class-inbox.php

@@ -236,8 +236,12 @@ class Inbox {
 		$params['actor'] = array(
 			'required' => true,
 			'sanitize_callback' => function( $param, $request, $key ) {
-				if ( ! \is_string( $param ) ) {
+				if ( \is_array( $param ) ) {
+					if ( isset( $param['id'] ) ) {
 						$param = $param['id'];
+					} else {
+						$param = $param['url'];
+					}
 				}
 				return \esc_url_raw( $param );
 			},

includes/rest/class-outbox.php

@@ -5,7 +5,7 @@ use stdClass;
 use WP_Error;
 use WP_REST_Server;
 use WP_REST_Response;
-use Activitypub\Transformers_Manager;
+use Activitypub\Transformer\Transformers_Manager;
 use Activitypub\Activity\Activity;
 use Activitypub\Collection\Users as User_Collection;
 
@@ -59,7 +59,7 @@ class Outbox {
 			return $user;
 		}
 
-		$post_types = array_keys( \get_option( 'activitypub_transformer_mapping', array( 'post' => 'activitypub/default', 'page' => 'activitypub/default') ) );
+		$post_types = array_keys( \get_option( 'activitypub_transformer_mapping', array( 'post' => 'activitypub/default', 'page' => 'activitypub/default' ) ) );
 
 		$page = $request->get_param( 'page', 1 );
 
@@ -105,7 +105,7 @@ class Outbox {
 			);
 
 			foreach ( $posts as $post ) {
-				$transformer = \Activitypub\Transformers_Manager::instance()->get_transformer( $post );
+				$transformer = \Activitypub\Transformer\Transformers_Manager::instance()->get_transformer( $post );
 				$post = $transformer->to_object();
 				$activity = new Activity();
 				$activity->set_type( 'Create' );

includes/transformer/class-base.php

@@ -4,15 +4,13 @@
  *
  * @link https://github.com/landrok/activitypub
  */
-
+namespace Activitypub\Transformer;
-namespace Activitypub;
 
 use WP_Post;
 use Activitypub\Collection\Users;
 use Activitypub\Model\Blog_User;
 use Activitypub\Activity\Base_Object;
 use Activitypub\Shortcodes;
-use Activitypub\Transformer_Base;
 
 use function Activitypub\esc_hashtag;
 use function Activitypub\is_single_user;
@@ -22,7 +20,7 @@ use function Activitypub\site_supports_blocks;
 /**
  * Base class to implement WordPress to ActivityPub transformers.
  */
-abstract class Transformer_Base {
+abstract class Base {
 	/**
 	 * The WP_Post object.
 	 *
@@ -35,20 +33,24 @@ abstract class Transformer_Base {
 	 *
 	 * This helps to chain the output of the Transformer.
 	 *
-	 * @param WP_Post $wp_post The WP_Post object
+	 * @param WP_Post $wp_post The WP_Post object.
-	 *
 	 * @return void
 	 */
 	public function set_wp_post( WP_Post $wp_post ) {
-		if ( $this->supports_post_type( get_post_type( $wp_post ) ) ) {
+		$post_type = get_post_type( $wp_post );
-			$this->wp_post = $wp_post;
+		if ( ! $this->supports_post_type( $post_type ) ) {
-		} else {
+			_doing_it_wrong(
-			//TODO Error, this should not happen.
+				__METHOD__,
+				/* translators: %s: Block name. */
+				sprintf( 'The Transformer "%s" does not support the post type "%s".', esc_html( $this->get_label() ), esc_html( $post_type ) ),
+				'version_number_transformer_management_placeholder'
+			);
 		}
+		$this->wp_post = $wp_post;
 	}
 
 	/**
-	 * Get the supported WP post_types that the transformer can use as an input.
+	 * Get the supported WP post types that the transformer can use as an input.
 	 *
 	 * By default all post types are supported.
 	 * You may very likely wish to override this function.
@@ -64,7 +66,6 @@ abstract class Transformer_Base {
 	 * Get the name of the plugin that registered the transformer.
 	 *
 	 * @see Forked from the WordPress elementor plugin.
-     * 
 	 * @since version_number_transformer_management_placeholder
 	 * @return string Plugin name
 	 */
@@ -78,14 +79,17 @@ abstract class Transformer_Base {
 		$plugins_data = get_plugins( '/' . $plugin_directory );
 		$plugin_data  = array_shift( $plugins_data );
 
-		return $plugin_data['Name'] ?? esc_html__( 'Unknown', 'activitypub' );
+		if ( isset( $plugin_data['Name'] ) ) {
+			return $plugin_data['Name'];
+		} else {
+			return esc_html__( 'Unknown', 'activitypub' );
+		}
 	}
 
 	/**
 	 * Return whether the transformer supports a post type.
 	 *
 	 * @since version_number_transformer_management_placeholder
-     * 
 	 * @return string post_type Post type name.
 	 */
 	final public function supports_post_type( $post_type ) {
@@ -96,7 +100,6 @@ abstract class Transformer_Base {
 	 * Get the name used for registering the transformer with the ActivityPub plugin.
 	 *
 	 * @since version_number_transformer_management_placeholder
-     * 
 	 * @return string name
 	 */
 	abstract public function get_name();
@@ -105,7 +108,6 @@ abstract class Transformer_Base {
 	 * Get the display name for the ActivityPub transformer.
 	 *
 	 * @since version_number_transformer_management_placeholder
-     * 
 	 * @return string display name
 	 */
 	abstract public function get_label();
@@ -300,6 +302,7 @@ abstract class Transformer_Base {
 
 	/**
 	 * Recursively get media IDs from blocks.
+	 *
 	 * @param array $blocks The blocks to search for media IDs
 	 * @param array $media_ids The media IDs to append new IDs to
 	 * @param int   $max_media The maximum number of media to return.
@@ -593,5 +596,4 @@ abstract class Transformer_Base {
 
 		return $object;
 	}
-
 }

includes/transformer/class-post.php

@@ -1,12 +1,12 @@
 <?php
-namespace Activitypub;
+namespace Activitypub\Transformer;
 
 use WP_Post;
 use Activitypub\Collection\Users;
 use Activitypub\Model\Blog_User;
 use Activitypub\Activity\Base_Object;
 use Activitypub\Shortcodes;
-use Activitypub\Transformer_Base;
+use Activitypub\Transformer\Base;
 
 use function Activitypub\esc_hashtag;
 use function Activitypub\is_single_user;
@@ -18,12 +18,10 @@ use function Activitypub\site_supports_blocks;
  * The Post Transformer is responsible for transforming a WP_Post object into different othe
  * Object-Types.
  *
- *
  * Currently supported are:
- *
  * - Activitypub\Activity\Base_Object
  */
-class Transformer_Post extends Transformer_Base {
+class Post extends Base {
 	/**
 	 * Getter function for the name of the transformer.
 	 *
@@ -129,5 +127,4 @@ class Transformer_Post extends Transformer_Base {
 
 		return \get_option( 'activitypub_custom_post_content', ACTIVITYPUB_CUSTOM_POST_CONTENT );
 	}
-
 }

includes/transformer/class-transformers-manager.php

@@ -3,9 +3,10 @@
  * Inspired by the way elementor handles addons.
  *
  * @link https://github.com/elementor/elementor/
+ * @package Activitypub
  */
 
-namespace Activitypub;
+namespace Activitypub\Transformer;
 
 use WP_Post;
 use WP_Comment;
@@ -25,7 +26,6 @@ if ( ! defined( 'ABSPATH' ) ) {
  *
  * @since version_number_transformer_management_placeholder
  */
-
 class Transformers_Manager {
 	const DEFAULT_TRANSFORMER_MAPPING = array(
 		'post' => ACTIVITYPUB_DEFAULT_TRANSFORMER,
@@ -40,7 +40,7 @@ class Transformers_Manager {
 	 * @since version_number_transformer_management_placeholder
 	 * @access private
 	 *
-	 * @var \ActivityPub\Transformer_Base[]
+	 * @var \ActivityPub\Transformer\Base[]
 	 */
 	private $transformers = null;
 
@@ -112,7 +112,7 @@ class Transformers_Manager {
 	 * @access private
 	 */
 	private function require_files() {
-		require ACTIVITYPUB_PLUGIN_DIR . 'includes/class-transformer-base.php';
+		require ACTIVITYPUB_PLUGIN_DIR . 'includes/transformer/class-base.php';
 	}
 
 	/**
@@ -133,16 +133,16 @@ class Transformers_Manager {
 	 * @since version_number_transformer_management_placeholder
 	 * @access public
 	 *
-	 * @param \ActivityPub\Transformer_Base $transformer_instance ActivityPub Transformer.
+	 * @param \ActivityPub\Transformer\Base $transformer_instance ActivityPub Transformer.
 	 *
 	 * @return bool True if the ActivityPub transformer was registered.
 	 */
-	public function register( Transformer_Base $transformer_instance) {
+	public function register( \ActivityPub\Transformer\Base $transformer_instance ) {
 
-		if ( ! $transformer_instance instanceof Transformer_Base ) {
+		if ( ! $transformer_instance instanceof \ActivityPub\Transformer\Base ) {
 			_doing_it_wrong(
 				__METHOD__,
-				__( 'ActivityPub transformer instance must be a of \ActivityPub\Transformer_Base class.' ),
+				\esc_html__( 'ActivityPub transformer instance must be a of \ActivityPub\Transformer_Base class.' ),
 				'version_number_transformer_management_placeholder'
 			);
 			return false;
@@ -152,7 +152,7 @@ class Transformers_Manager {
 		if ( preg_match( '/[A-Z]+/', $transformer_name ) ) {
 			_doing_it_wrong(
 				__METHOD__,
-				__( 'ActivityPub transformer names must not contain uppercase characters.' ),
+				\esc_html__( 'ActivityPub transformer names must not contain uppercase characters.' ),
 				'version_number_transformer_management_placeholder'
 			);
 			return false;
@@ -162,7 +162,7 @@ class Transformers_Manager {
 		if ( ! preg_match( $name_matcher, $transformer_name ) ) {
 			_doing_it_wrong(
 				__METHOD__,
-				__( 'ActivityPub transformer names must contain a namespace prefix. Example: my-plugin/my-custom-transformer' ),
+				\esc_html__( 'ActivityPub transformer names must contain a namespace prefix. Example: my-plugin/my-custom-transformer' ),
 				'version_number_transformer_management_placeholder'
 			);
 			return false;
@@ -172,7 +172,7 @@ class Transformers_Manager {
 			_doing_it_wrong(
 				__METHOD__,
 				/* translators: %s: Block name. */
-				sprintf( __( 'ActivityPub transformer with name "%s" is already registered.' ), $transformer_name ),
+				sprintf( 'ActivityPub transformer with name "%s" is already registered.', esc_html( $transformer_name ) ),
 				'version_number_transformer_management_placeholder'
 			);
 			return false;
@@ -184,7 +184,7 @@ class Transformers_Manager {
 		 * @since version_number_transformer_management_placeholder
 		 *
 		 * @param bool $should_register Should the ActivityPub transformer be registered. Default is `true`.
-		 * @param \ActivityPub\Transformer_Base $transformer_instance Widget instance.
+		 * @param \ActivityPub\Transformer\Base $transformer_instance Widget instance.
 		 */
 		// TODO: does not implementing this slow down the website? -> compare with gutenberg block registration.
 		// $should_register = apply_filters( 'activitypub/transformers/is_transformer_enabled', true, $transformer_instance );
@@ -209,7 +209,7 @@ class Transformers_Manager {
 	 */
 	private function init_transformers() {
 		$builtin_transformers = [
-			'post'
+			'post',
 		];
 
 		$this->transformers = [];
@@ -219,7 +219,7 @@ class Transformers_Manager {
 
 			$class_name = ucfirst( $transformer_name );
 
-			$class_name = '\Activitypub\Transformer_' . $class_name;
+			$class_name = '\Activitypub\Transformer\\' . $class_name;
 
 			$this->register( new $class_name() );
 		}
@@ -233,7 +233,7 @@ class Transformers_Manager {
 		 *
 		 * @param Transformers_Manager $this The widgets manager.
 		 */
-		do_action( 'activitypub/transformers/register', $this );
+		do_action( 'activitypub_transformers_register', $this );
 	}
 
 
@@ -248,7 +248,7 @@ class Transformers_Manager {
 	 *
 	 * @param string $transformers Optional. Transformer name. Default is null.
 	 *
-	 * @return Transformer_Base|Transformer_Base[]|null Registered transformers.
+	 * @return Base|Base[]|null Registered transformers.
 	*/
 	public function get_transformers( $transformer_name = null ) {
 		if ( is_null( $this->transformers ) ) {
@@ -272,7 +272,7 @@ class Transformers_Manager {
 	 *
 	 * @param WP_Post|WP_Comment $wp_post The WordPress Post/Comment.
 	 *
-	 * @return Transformer_Base|null Registered transformers.
+	 * @return \ActivityPub\Transformer\Base|null Registered transformers.
 	*/
 	public function get_transformer( $object ) {
 		switch ( get_class( $object ) ) {
@@ -290,4 +290,3 @@ class Transformers_Manager {
 		}
 	}
 }
-

integration/class-webfinger.php

@@ -30,6 +30,10 @@ class Webfinger {
 	public static function add_user_discovery( $array, $resource, $user ) {
 		$user = User_Collection::get_by_id( $user->ID );
 
+		if ( ! $user || is_wp_error( $user ) ) {
+			return $array;
+		}
+
 		$array['links'][] = array(
 			'rel'  => 'self',
 			'type' => 'application/activity+json',

templates/post-json.php

@@ -2,7 +2,7 @@
 // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
 $post = \get_post();
 
-$transformer = \Activitypub\Transformers_Manager::instance()->get_transformer( $post );
+$transformer = \Activitypub\Transformer\Transformers_Manager::instance()->get_transformer( $post );
 
 $json = \array_merge( array( '@context' => \Activitypub\get_context() ), $transformer->to_object()->to_array() );
 

templates/settings.php

@@ -237,7 +237,7 @@
 					return $object->name;
 				}, $all_public_post_types);
 
-				$transformer_manager = \Activitypub\Transformers_Manager::instance();
+				$transformer_manager = \Activitypub\Transformer\Transformers_Manager::instance();
 				$transformers = $transformer_manager->get_transformers();
 
 				?>

tests/test-class-activitypub-activity.php

@@ -18,7 +18,7 @@ class Test_Activitypub_Activity extends WP_UnitTestCase {
 		);
 
 		$wp_post = get_post( $post );
-		$activitypub_post = \Activitypub\Transformers_Manager::instance()->get_transformer( $post )->to_object();
+		$activitypub_post = \Activitypub\Transformer\Transformers_Manager::instance()->get_transformer( $post )->to_object();
 
 		$activitypub_activity = new \Activitypub\Activity\Activity();
 		$activitypub_activity->set_type( 'Create' );

tests/test-class-activitypub-post.php

@@ -10,13 +10,13 @@ class Test_Activitypub_Post extends WP_UnitTestCase {
 
 		$permalink = \get_permalink( $post );
 
-		$activitypub_post = \Activitypub\Transformers_Manager::instance()->get_transformer( get_post( $post ) )->to_object();
+		$activitypub_post = \Activitypub\Transformer\Transformers_Manager::instance()->get_transformer( get_post( $post ) )->to_object();
 
 		$this->assertEquals( $permalink, $activitypub_post->get_id() );
 
 		\wp_trash_post( $post );
 
-		$activitypub_post = \Activitypub\Transformers_Manager::instance()->get_transformer( get_post( $post ) )->to_object();
+		$activitypub_post = \Activitypub\Transformer\Transformers_Manager::instance()->get_transformer( get_post( $post ) )->to_object();
 
 		$this->assertEquals( $permalink, $activitypub_post->get_id() );
 

tests/test-class-activitypub-rest-post-signature-verification.php

@@ -10,7 +10,7 @@ class Test_Activitypub_Signature_Verification extends WP_UnitTestCase {
 			)
 		);
 		$remote_actor = \get_author_posts_url( 2 );
-		$activitypub_post = \Activitypub\Transformers_Manager::instance()->get_transformer( get_post( $post ) )->to_object();
+		$activitypub_post = \Activitypub\Transformer\Transformers_Manager::instance()->get_transformer( get_post( $post ) )->to_object();
 		$activitypub_activity = new Activitypub\Activity\Activity( 'Create' );
 		$activitypub_activity->set_type( 'Create' );
 		$activitypub_activity->set_object( $activitypub_post );
@@ -82,7 +82,7 @@ class Test_Activitypub_Signature_Verification extends WP_UnitTestCase {
 		);
 		$remote_actor = \get_author_posts_url( 2 );
 		$remote_actor_inbox = Activitypub\get_rest_url_by_path( '/inbox' );
-		$activitypub_post = \Activitypub\Transformers_Manager::instance()->get_transformer( get_post( $post )  )->to_object();
+		$activitypub_post = \Activitypub\Transformer\Transformers_Manager::instance()->get_transformer( get_post( $post )  )->to_object();
 		$activitypub_activity = new Activitypub\Activity\Activity();
 		$activitypub_activity->set_type( 'Create' );
 		$activitypub_activity->set_object( $activitypub_post );