Import: Convert to blocks and add reply (#1591)

Author: obenland

.github/changelog/1591-from-description

@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Mastodon imports now support blocks, with automatic reply embedding for conversations.

includes/class-blocks.php

@@ -27,6 +27,8 @@ public static function init() {
 		// Add editor plugin.
 		\add_action( 'enqueue_block_editor_assets', array( self::class, 'enqueue_editor_assets' ) );
 		\add_action( 'init', array( self::class, 'register_postmeta' ), 11 );
+
+		\add_filter( 'activitypub_import_mastodon_post_data', array( self::class, 'filter_import_mastodon_post_data' ), 10, 2 );
 	}
 
 	/**
@@ -412,4 +414,33 @@ public static function render_follower( $follower ) {
 			$external_svg
 		);
 	}
+
+	/**
+	 * Converts content to blocks before saving to the database.
+	 *
+	 * @param array  $data The post data to be inserted.
+	 * @param object $post The Mastodon Create activity.
+	 *
+	 * @return array
+	 */
+	public static function filter_import_mastodon_post_data( $data, $post ) {
+		// Convert paragraphs to blocks.
+		\preg_match_all( '#<p>.*?</p>#is', $data['post_content'], $matches );
+		$blocks = \array_map(
+			function ( $paragraph ) {
+				return '<!-- wp:paragraph -->' . PHP_EOL . $paragraph . PHP_EOL . '<!-- /wp:paragraph -->' . PHP_EOL;
+			},
+			$matches[0] ?? array()
+		);
+
+		$data['post_content'] = \rtrim( \implode( PHP_EOL, $blocks ), PHP_EOL );
+
+		// Add reply block if it's a reply.
+		if ( null !== $post->object->inReplyTo ) {
+			$reply_block          = \sprintf( '<!-- wp:activitypub/reply {"url":"%1$s","embedPost":true} /-->' . PHP_EOL, \esc_url( $post->object->inReplyTo ) );
+			$data['post_content'] = $reply_block . $data['post_content'];
+		}
+
+		return $data;
+	}
 }

includes/wp-admin/import/class-mastodon.php

@@ -312,9 +312,10 @@ function ( $tag ) {
 			/**
 			 * Filter the post data before inserting it into the database.
 			 *
-			 * @param array $post_data The post data to be inserted.
+			 * @param array  $post_data The post data to be inserted.
+			 * @param object $post      The Mastodon Create activity.
 			 */
-			$post_data = \apply_filters( 'activitypub_import_mastodon_post_data', $post_data );
+			$post_data = \apply_filters( 'activitypub_import_mastodon_post_data', $post_data, $post );
 
 			$post_exists = \post_exists( '', $post_data['post_content'], $post_data['post_date'], $post_data['post_type'] );
 

tests/includes/class-test-blocks.php

@@ -133,4 +133,48 @@ public function test_render_reply_block_with_no_embed() {
 		$this->assertStringContainsString( 'u-in-reply-to', $output, 'Output should contain the reply link.' );
 		$this->assertStringContainsString( 'example.com/no-embed', $output, 'Output should contain the formatted URL.' );
 	}
+
+	/**
+	 * Test filter_import_mastodon_post_data with regular paragraphs.
+	 *
+	 * @covers ::filter_import_mastodon_post_data
+	 */
+	public function test_filter_import_mastodon_post_data_with_paragraphs() {
+		$data = array(
+			'post_content' => '<p>First paragraph</p><p>Second paragraph</p>',
+		);
+
+		$post = (object) array(
+			'object' => (object) array(
+				'inReplyTo' => null,
+			),
+		);
+
+		$result = Blocks::filter_import_mastodon_post_data( $data, $post );
+
+		$this->assertSame( "<!-- wp:paragraph -->\n<p>First paragraph</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>Second paragraph</p>\n<!-- /wp:paragraph -->", $result['post_content'] );
+	}
+
+	/**
+	 * Test filter_import_mastodon_post_data with a reply post.
+	 *
+	 * @covers ::filter_import_mastodon_post_data
+	 */
+	public function test_filter_import_mastodon_post_data_with_reply() {
+		$data = array(
+			'post_content' => '<p>This is a reply</p>',
+		);
+
+		$reply_url = 'https://mastodon.social/@user/123456';
+		$post      = (object) array(
+			'object' => (object) array(
+				'inReplyTo' => $reply_url,
+			),
+		);
+
+		$result = Blocks::filter_import_mastodon_post_data( $data, $post );
+
+		$this->assertStringContainsString( '<!-- wp:activitypub/reply {"url":"https://mastodon.social/@user/123456","embedPost":true} /-->', $result['post_content'] );
+		$this->assertStringContainsString( "<!-- wp:paragraph -->\n<p>This is a reply</p>\n<!-- /wp:paragraph -->", $result['post_content'] );
+	}
 }