Extra Fields: Fix rel me count (#1241)

* Blog Model: Add failing test

* Move to Extra Fields test

* Remove rel me filter after using it

* Add changelog

* Skip tests for oder versions of WP

Author: obenland

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Handle deletes from remote servers that leave behind an accessible Tombstone object.
 * No longer parses tags for post types that don't support Activitypub.
+* rel attribute will now contain no more than one "me" value.
 
 ## [4.7.3] - 2025-01-21
 

includes/collection/class-extra-fields.php

@@ -93,14 +93,7 @@ public static function get_formatted_content( $post ) {
 	 */
 	public static function fields_to_attachments( $fields ) {
 		$attachments = array();
-		\add_filter(
-			'activitypub_link_rel',
-			function ( $rel ) {
-				$rel .= ' me';
-
-				return $rel;
-			}
-		);
+		\add_filter( 'activitypub_link_rel', array( self::class, 'add_rel_me' ) );
 
 		foreach ( $fields as $post ) {
 			$content       = self::get_formatted_content( $post );
@@ -114,7 +107,7 @@ function ( $rel ) {
 				),
 			);
 
-			$link_added = false;
+			$attachment = false;
 
 			// Add support for FEP-fb2a, for more information see FEDERATION.md.
 			$link_content = \trim( \strip_tags( $content, '<a>' ) );
@@ -139,12 +132,10 @@ function ( $rel ) {
 					if ( $rel && \is_string( $rel ) ) {
 						$attachment['rel'] = \explode( ' ', $rel );
 					}
-
-					$link_added = true;
 				}
 			}
 
-			if ( ! $link_added ) {
+			if ( ! $attachment ) {
 				$attachment = array(
 					'type'    => 'Note',
 					'name'    => \get_the_title( $post ),
@@ -159,6 +150,8 @@ function ( $rel ) {
 			$attachments[] = $attachment;
 		}
 
+		\remove_filter( 'activitypub_link_rel', array( self::class, 'add_rel_me' ) );
+
 		return $attachments;
 	}
 
@@ -285,6 +278,16 @@ public static function make_paragraph_block( $content ) {
 		return '<!-- wp:paragraph --><p>' . $content . '</p><!-- /wp:paragraph -->';
 	}
 
+	/**
+	 * Add the 'me' rel to the link.
+	 *
+	 * @param string $rel The rel attribute.
+	 * @return string The modified rel attribute.
+	 */
+	public static function add_rel_me( $rel ) {
+		return $rel . ' me';
+	}
+
 	/**
 	 * Checks if the user is the blog user.
 	 *

readme.txt

@@ -138,6 +138,7 @@ For reasons of data protection, it is not possible to see the followers of other
 * Changed: Improved content negotiation and AUTHORIZED_FETCH support for third-party plugins
 * Fixed: Handle deletes from remote servers that leave behind an accessible Tombstone object.
 * Fixed: No longer parses tags for post types that don't support Activitypub.
+* Fixed: rel attribute will now contain no more than one "me" value.
 
 = 4.7.3 =
 

tests/includes/collection/class-test-extra-fields.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Test file for Extra Fields.
+ *
+ * @package Activitypub
+ */
+
+namespace Activitypub\Tests\Collection;
+
+use Activitypub\Collection\Extra_Fields;
+
+/**
+ * Test class for Extra Fields.
+ *
+ * @coversDefaultClass \Activitypub\Collection\Extra_Fields
+ */
+class Test_Extra_Fields extends \WP_UnitTestCase {
+
+	/**
+	 * Test the get_attachment.
+	 *
+	 * @covers ::get_attachment
+	 */
+	public function test_get_attachment() {
+		if ( ! class_exists( '\WP_HTML_Tag_Processor' ) ) {
+			$this->markTestSkipped( 'WP_HTML_Tag_Processor not available' );
+		}
+
+		$post = self::factory()->post->create_and_get(
+			array(
+				'post_type'    => Extra_Fields::BLOG_POST_TYPE,
+				'post_content' => 'https://wordpress.org/plugins/activitypub/',
+				'post_title'   => 'ActivityPub',
+			)
+		);
+
+		// Multiple calls should not result in multiple "me" values in rel attribute.
+		Extra_Fields::fields_to_attachments( array( $post ) );
+		Extra_Fields::fields_to_attachments( array( $post ) );
+		$attachments = Extra_Fields::fields_to_attachments( array( $post ) );
+		$value_count = array_count_values( $attachments[1]['rel'] );
+
+		$this->assertEquals( 1, $value_count['me'] );
+	}
+}