Filter empty strings from NodeInfo staffAccounts (#2639)

Author: obenland

.github/changelog/fix-nodeinfo-empty-staff-accounts

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Ensure NodeInfo accurately represents site administrators to the Fediverse.

integration/class-nodeinfo.php

@@ -135,15 +135,11 @@ private static function get_staff() {
 				'orderby' => 'ID',
 				'order'   => 'ASC',
 				'cap'     => 'activitypub',
-				'fields'  => array( 'ID' ),
+				'fields'  => 'ID',
 			)
 		);
+		$admins = array_map( array( Webfinger::class, 'get_user_resource' ), $admins );
 
-		return array_map(
-			static function ( $user ) {
-				return Webfinger::get_user_resource( $user->ID );
-			},
-			$admins
-		);
+		return array_values( array_filter( $admins ) );
 	}
 }

tests/phpunit/tests/integration/class-test-nodeinfo.php

@@ -363,6 +363,31 @@ public function test_methods_are_static() {
 		}
 	}
 
+	/**
+	 * Test staff accounts do not contain empty strings when user type is disabled.
+	 *
+	 * @covers ::add_nodeinfo_data
+	 * @covers ::get_staff
+	 */
+	public function test_nodeinfo_staff_accounts_filters_empty_strings() {
+		$original_nodeinfo = array(
+			'protocols' => array(),
+			'usage'     => array(),
+			'metadata'  => array(),
+		);
+
+		// Set blog-only mode, which disables user accounts.
+		\update_option( 'activitypub_actor_mode', ACTIVITYPUB_BLOG_MODE );
+
+		$result = Nodeinfo::add_nodeinfo_data( $original_nodeinfo, '2.0' );
+
+		// Check that staffAccounts is an array with no empty strings.
+		$this->assertIsArray( $result['metadata']['staffAccounts'] );
+		$this->assertEmpty( $result['metadata']['staffAccounts'], 'Staff accounts should be empty in blog-only mode' );
+
+		\delete_option( 'activitypub_actor_mode' );
+	}
+
 	/**
 	 * Test integration with actual WordPress hooks.
 	 *