Merge branch 'master' into feature-guidance

Author: pfefferle

includes/rest/class-nodeinfo.php

@@ -116,13 +116,24 @@ public static function nodeinfo2( $request ) {
 			'version' => \get_bloginfo( 'version' ),
 		);
 
-		$users = \count_users();
+		$users = \get_users(
+			array(
+				'capability__in' => array( 'publish_posts' ),
+			)
+		);
+
+		if ( is_array( $users ) ) {
+			$users = count( $users );
+		} else {
+			$users = 1;
+		}
+
 		$posts = \wp_count_posts();
 		$comments = \wp_count_comments();
 
 		$nodeinfo['usage'] = array(
 			'users' => array(
-				'total' => (int) $users['total_users'],
+				'total' => (int) $users,
 			),
 			'localPosts' => (int) $posts->publish,
 			'localComments' => (int) $comments->approved,

includes/rest/class-outbox.php

@@ -75,6 +75,9 @@ public static function user_outbox_get( $request ) {
 		$json->partOf = \get_rest_url( null, "/activitypub/1.0/users/$user_id/outbox" ); // phpcs:ignore
 		$json->totalItems = 0; // phpcs:ignore
 
+		// phpcs:ignore
+		$json->totalItems = 0;
+
 		foreach ( $post_types as $post_type ) {
 			$count_posts = \wp_count_posts( $post_type );
 			$json->totalItems += \intval( $count_posts->publish ); // phpcs:ignore