Add default avatars for actors without icons in admin tables (#2106)

Author: obenland

.github/changelog/2106-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Add default avatars for actors without icons in admin tables

includes/wp-admin/table/class-blocked-actors.php

@@ -231,14 +231,12 @@ public function prepare_items() {
 				continue;
 			}
 
-			$url = object_to_uri( $actor->get_url() ?? $actor->get_id() );
-
 			$this->items[] = array(
 				'id'         => $blocked_actor_post->ID,
-				'icon'       => object_to_uri( $actor->get_icon() ?? '' ),
+				'icon'       => object_to_uri( $actor->get_icon() ?? ACTIVITYPUB_PLUGIN_URL . 'assets/img/mp.jpg' ),
 				'post_title' => $actor->get_name() ?? $actor->get_preferred_username(),
 				'username'   => $actor->get_preferred_username(),
-				'url'        => $url,
+				'url'        => object_to_uri( $actor->get_url() ?? $actor->get_id() ),
 				'webfinger'  => $this->get_webfinger( $actor ),
 				'identifier' => $actor->get_id(),
 				'modified'   => $blocked_actor_post->post_modified_gmt,

includes/wp-admin/table/class-followers.php

@@ -275,19 +275,16 @@ public function prepare_items() {
 
 		foreach ( $followers as $follower ) {
 			$actor = Actors::get_actor( $follower );
-
 			if ( \is_wp_error( $actor ) ) {
 				continue;
 			}
 
-			$url = object_to_uri( $actor->get_url() ?? $actor->get_id() );
-
 			$this->items[] = array(
 				'id'         => $follower->ID,
-				'icon'       => object_to_uri( $actor->get_icon() ?? '' ),
+				'icon'       => object_to_uri( $actor->get_icon() ?? ACTIVITYPUB_PLUGIN_URL . 'assets/img/mp.jpg' ),
 				'post_title' => $actor->get_name() ?? $actor->get_preferred_username(),
 				'username'   => $actor->get_preferred_username(),
-				'url'        => $url,
+				'url'        => object_to_uri( $actor->get_url() ?? $actor->get_id() ),
 				'webfinger'  => $this->get_webfinger( $actor ),
 				'identifier' => $actor->get_id(),
 				'modified'   => $follower->post_modified_gmt,

includes/wp-admin/table/class-following.php

@@ -256,19 +256,16 @@ public function prepare_items() {
 
 		foreach ( $followings as $following ) {
 			$actor = Actors::get_actor( $following );
-
 			if ( \is_wp_error( $actor ) ) {
 				continue;
 			}
 
-			$url = object_to_uri( $actor->get_url() ?? $actor->get_id() );
-
 			$this->items[] = array(
 				'id'         => $following->ID,
-				'icon'       => object_to_uri( $actor->get_icon() ?? '' ),
+				'icon'       => object_to_uri( $actor->get_icon() ?? ACTIVITYPUB_PLUGIN_URL . 'assets/img/mp.jpg' ),
 				'post_title' => $actor->get_name() ?? $actor->get_preferred_username(),
 				'username'   => $actor->get_preferred_username(),
-				'url'        => $url,
+				'url'        => object_to_uri( $actor->get_url() ?? $actor->get_id() ),
 				'webfinger'  => $this->get_webfinger( $actor ),
 				'status'     => Following_Collection::check_status( $this->user_id, $following->ID ),
 				'identifier' => $actor->get_id(),