User: Don't fall back to global post when looking for avatar (#1460)

* User: Don't fall back to global post when looking for avatar

* Make test pass

* Changelog

Author: obenland

.github/changelog/fix-follow-me-button

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Follow-Me blocks now show the correct avatar on attachment pages.

includes/model/class-user.php

@@ -173,7 +173,7 @@ public function get_preferred_username() {
 	 */
 	public function get_icon() {
 		$icon = \get_user_option( 'activitypub_icon', $this->_id );
-		if ( wp_attachment_is_image( $icon ) ) {
+		if ( false !== $icon && wp_attachment_is_image( $icon ) ) {
 			return array(
 				'type' => 'Image',
 				'url'  => esc_url( wp_get_attachment_url( $icon ) ),

tests/includes/class-test-move.php

@@ -78,7 +78,7 @@ public function test_account_with_invalid_user() {
 	 */
 	public function test_account_with_invalid_target() {
 		$from = Actors::get_by_id( self::$user_id )->get_id();
-		$to   = 'https://invalid-url.com/user/1';
+		$to   = 'https://example.com/user/1';
 
 		$filter = function () {
 			return new \WP_Error( 'http_request_failed', 'Invalid URL' );

tests/includes/model/class-test-user.php

@@ -48,4 +48,26 @@ public function test_activitypub_cap() {
 
 		$this->assertTrue( $can );
 	}
+
+	/**
+	 * Test that on attachment pages the user avatar is returned.
+	 *
+	 * @ticket https://github.com/Automattic/wordpress-activitypub/issues/1459
+	 * @covers ::get_icon
+	 */
+	public function test_icon() {
+		$user_id = self::factory()->user->create( array( 'role' => 'author' ) );
+		$user    = User::from_wp_user( $user_id );
+
+		// Add attachment.
+		$attachment_id = self::factory()->attachment->create_upload_object( AP_TESTS_DIR . '/assets/test.jpg' );
+
+		// Navigate to attachment page.
+		$this->go_to( get_attachment_link( $attachment_id ) );
+
+		$icon = $user->get_icon();
+
+		$this->assertArrayHasKey( 'url', $icon );
+		$this->assertNotSame( wp_get_attachment_url( $attachment_id ), $icon['url'] );
+	}
 }