Emails: Make sure actor URL is set correctly (#1677)

Author: obenland

.github/changelog/1677-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Email notifications for interactions with Brid.gy actors no longer trigger PHP Warnings.

includes/class-mailer.php

@@ -346,6 +346,7 @@ private static function normalize_actor( $actor ) {
 		if ( empty( $actor['url'] ) ) {
 			$actor['url'] = $actor['id'];
 		}
+		$actor['url'] = object_to_uri( $actor['url'] );
 
 		if ( empty( $actor['webfinger'] ) ) {
 			$actor['webfinger'] = '@' . ( $actor['preferredUsername'] ?? $actor['name'] ) . '@' . \wp_parse_url( $actor['url'], PHP_URL_HOST );

tests/includes/class-test-mailer.php

@@ -9,7 +9,6 @@
 
 use Activitypub\Mailer;
 use Activitypub\Collection\Actors;
-use Activitypub\Notification;
 use WP_UnitTestCase;
 
 /**
@@ -410,9 +409,8 @@ function ( $args ) use ( $user_id, $activity ) {
 		} else {
 			add_filter(
 				'wp_mail',
-				function ( $args ) {
+				function () {
 					$this->fail( 'Email should not be sent for public activity' );
-					return $args;
 				}
 			);
 
@@ -428,6 +426,56 @@ function ( $args ) {
 		wp_delete_user( $user_id );
 	}
 
+	/**
+	 * Test direct message notification from Bridgy.
+	 *
+	 * @covers ::direct_message
+	 */
+	public function test_direct_message_from_bridgy() {
+		$activity = array(
+			'actor'  => 'https://example.com/author',
+			'object' => array(
+				'id'      => 'https://example.com/post/1',
+				'content' => 'Test direct message',
+			),
+			'to'     => array( Actors::get_by_id( self::$user_id )->get_id() ),
+		);
+
+		// Mock remote metadata.
+		add_filter(
+			'pre_get_remote_metadata_by_actor',
+			function () {
+				return array(
+					'name' => 'Test Sender',
+					'url'  => array(
+						'https://fed.brid.gy/r/https://example.com/author',
+						'acct:[email protected]',
+					),
+				);
+			}
+		);
+
+		// Capture email.
+		add_filter(
+			'wp_mail',
+			function ( $args ) {
+				$this->assertStringContainsString(
+					'<a href="https://fed.brid.gy/r/https://example.com/author">@Test [email protected]</a>',
+					$args['message']
+				);
+				return $args;
+			}
+		);
+
+		// Call the method.
+		Mailer::direct_message( $activity, self::$user_id );
+
+		// Clean up.
+		remove_all_filters( 'wp_before_load_template' );
+		remove_all_filters( 'pre_get_remote_metadata_by_actor' );
+		remove_all_filters( 'wp_mail' );
+	}
+
 	/**
 	 * Data provider for direct message notification text.
 	 *