Normalize Account-Aliases to always use the ID (#1974)

Author: pfefferle

.github/changelog/1974-from-description

@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Improved Account-Aliases handling by internally normalizing input formats.

includes/class-activitypub.php

@@ -762,7 +762,7 @@ public static function register_user_meta() {
 				'description'       => 'An array of URLs that the user is known by.',
 				'single'            => true,
 				'default'           => array(),
-				'sanitize_callback' => array( Sanitize::class, 'url_list' ),
+				'sanitize_callback' => array( Sanitize::class, 'identifier_list' ),
 			)
 		);
 

includes/class-sanitize.php

@@ -7,6 +7,7 @@
 
 namespace Activitypub;
 
+use Activitypub\Collection\Actors;
 use Activitypub\Model\Blog;
 
 /**
@@ -32,6 +33,50 @@ public static function url_list( $value ) {
 		return \array_values( $value );
 	}
 
+	/**
+	 * Sanitize and normalize a list of account identifiers to ActivityPub IDs.
+	 *
+	 * This function processes various identifier formats, such as URLs and
+	 * webfinger identifiers, and normalizes them into a consistent format.
+	 *
+	 * @param string|array $value The value to sanitize.
+	 *
+	 * @return array The sanitized and normalized list of account identifiers.
+	 */
+	public static function identifier_list( $value ) {
+		if ( ! \is_array( $value ) ) {
+			$value = \explode( PHP_EOL, $value );
+		}
+
+		$value = \array_filter( $value );
+		$uris  = array();
+
+		foreach ( $value as $uri ) {
+			$uri = \trim( $uri );
+			$uri = \ltrim( $uri, '@' );
+
+			if ( \is_email( $uri ) ) {
+				$_uri = Webfinger::resolve( $uri );
+				if ( \is_wp_error( $_uri ) ) {
+					$uris[] = $uri;
+					continue;
+				}
+
+				$uri = $_uri;
+			}
+
+			$uri   = \sanitize_url( $uri );
+			$actor = Actors::fetch_remote_by_uri( $uri );
+			if ( \is_wp_error( $actor ) ) {
+				$uris[] = $uri;
+			} else {
+				$uris[] = \sanitize_url( $actor->guid );
+			}
+		}
+
+		return \array_values( \array_unique( $uris ) );
+	}
+
 	/**
 	 * Sanitize a list of hosts.
 	 *

includes/wp-admin/class-blog-settings-fields.php

@@ -298,7 +298,7 @@ class="large-text"
 			<?php esc_html_e( 'If you’re moving from another account to this one, you’ll need to create an alias here first before transferring your followers. This step is safe, reversible, and doesn’t affect anything on its own. The migration itself is initiated from your old account.', 'activitypub' ); ?>
 		</p>
 		<p class="description">
-			<?php esc_html_e( 'Enter one URL per line.', 'activitypub' ); ?>
+		<?php echo \wp_kses_post( \__( 'Enter one account per line. Profile links or usernames like <code>@[email protected]</code> are accepted and will be automatically normalized to the correct format.', 'activitypub' ) ); ?>
 		</p>
 		<?php
 	}

includes/wp-admin/class-settings.php

@@ -311,7 +311,7 @@ public static function register_settings() {
 				'type'              => 'array',
 				'description'       => 'An array of URLs that the blog user is known by.',
 				'default'           => array(),
-				'sanitize_callback' => array( Sanitize::class, 'url_list' ),
+				'sanitize_callback' => array( Sanitize::class, 'identifier_list' ),
 			)
 		);
 	}

includes/wp-admin/class-user-settings-fields.php

@@ -270,7 +270,7 @@ class="large-text"
 			<?php \esc_html_e( 'If you&#8217;re moving from another account to this one, you&#8217;ll need to create an alias here first before transferring your followers. This step is safe, reversible, and doesn&#8217;t affect anything on its own. The migration itself is initiated from your old account.', 'activitypub' ); ?>
 		</p>
 		<p class="description">
-			<?php \esc_html_e( 'Enter one URL per line.', 'activitypub' ); ?>
+			<?php echo \wp_kses_post( \__( 'Enter one account per line. Profile links or usernames like <code>@[email protected]</code> are accepted and will be automatically normalized to the correct format.', 'activitypub' ) ); ?>
 		</p>
 		<?php
 	}