Respect WordPress "show avatars" setting for remote actors (#2611)

Author: pfefferle

.github/changelog/2611-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Respect WordPress "show avatars" setting for remote actor avatars.

build/followers/index.asset.php

@@ -47,6 +47,11 @@ public static function pre_get_avatar_data( $args, $id_or_email ) {
 			return $args;
 		}
 
+		// Respect WordPress "show avatars" setting.
+		if ( ! \get_option( 'show_avatars' ) ) {
+			return $args;
+		}
+
 		$avatar = null;
 
 		// First, try to get avatar from remote actor.

build/followers/index.js

@@ -46,6 +46,7 @@ public static function enqueue_editor_assets() {
 				'user' => \admin_url( 'profile.php#activitypub' ),
 				'blog' => \admin_url( 'options-general.php?page=activitypub&tab=blog-profile' ),
 			),
+			'showAvatars'      => (bool) \get_option( 'show_avatars' ),
 		);
 		wp_localize_script( 'wp-editor', '_activityPubOptions', $data );
 

build/followers/render.php

@@ -663,9 +663,11 @@ public static function get_acct( $id ) {
 	 *
 	 * @param int $id The ID of the remote actor post.
 	 *
-	 * @return string The avatar URL or empty string if not found.
+	 * @return string The avatar URL or a default one if not found.
 	 */
 	public static function get_avatar_url( $id ) {
+		$default_avatar_url = ACTIVITYPUB_PLUGIN_URL . 'assets/img/mp.jpg';
+
 		$avatar_url = \get_post_meta( $id, '_activitypub_avatar_url', true );
 		if ( $avatar_url ) {
 			return $avatar_url;
@@ -674,12 +676,11 @@ public static function get_avatar_url( $id ) {
 		// If not found in meta, try to extract from post_content JSON and cache it.
 		$post = \get_post( $id );
 		if ( ! $post || empty( $post->post_content ) ) {
-			return '';
+			return $default_avatar_url;
 		}
 
 		$actor_data = \json_decode( $post->post_content, true );
 		if ( empty( $actor_data['icon'] ) ) {
-			$default_avatar_url = ACTIVITYPUB_PLUGIN_URL . 'assets/img/mp.jpg';
 			\update_post_meta( $id, '_activitypub_avatar_url', \esc_url_raw( $default_avatar_url ) );
 
 			return $default_avatar_url;

includes/class-avatars.php

@@ -263,21 +263,23 @@ function Pagination( { page, pages, setPage } ) {
  */
 function Follower( { name, icon, url, preferredUsername } ) {
 	const handle = `@${ preferredUsername }`;
-	const { defaultAvatarUrl } = useOptions();
+	const { defaultAvatarUrl, showAvatars } = useOptions();
 	const avatar = icon?.url || defaultAvatarUrl;
 
 	return (
 		<a className="follower-link" href={ url } title={ handle } onClick={ ( event ) => event.preventDefault() }>
-			<img
-				width="48"
-				height="48"
-				src={ avatar }
-				className="follower-avatar"
-				alt={ name }
-				onError={ ( event ) => {
-					event.target.src = defaultAvatarUrl;
-				} }
-			/>
+			{ showAvatars && (
+				<img
+					width="48"
+					height="48"
+					src={ avatar }
+					className="follower-avatar"
+					alt={ name }
+					onError={ ( event ) => {
+						event.target.src = defaultAvatarUrl;
+					} }
+				/>
+			) }
 			<div className="follower-info">
 				<span className="follower-name">{ name }</span>
 				<span className="follower-username">{ handle }</span>

includes/class-blocks.php

@@ -46,6 +46,7 @@
 }
 
 $_per_page     = absint( $attributes['per_page'] );
+$_show_avatars = (bool) \get_option( 'show_avatars' );
 $follower_data = Followers::query( $user_id, $_per_page );
 
 // Prepare Followers data for the Interactivity API context.
@@ -115,6 +116,7 @@ class="follower-link"
 						rel="external noreferrer noopener"
 						data-wp-bind--title="context.item.handle">
 
+						<?php if ( $_show_avatars ) : ?>
 						<img
 							data-wp-bind--src="context.item.icon.url"
 							data-wp-on--error="callbacks.setDefaultAvatar"
@@ -124,6 +126,7 @@ class="follower-avatar"
 							width="48"
 							height="48"
 						>
+						<?php endif; ?>
 
 						<div class="follower-info">
 							<span class="follower-name" data-wp-text="context.item.name"></span>