Fix #1970 (#1973)

Author: pfefferle

.github/changelog/1973-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fixed a PHP error that prevented the Follower overview from loading.

includes/class-scheduler.php

@@ -196,15 +196,20 @@ public static function cleanup_remote_actors() {
 
 			if ( is_tombstone( $meta ) ) {
 				\wp_delete_post( $actor->ID );
-			} elseif ( empty( $meta ) || ! is_array( $meta ) || is_wp_error( $meta ) ) {
+			} elseif ( empty( $meta ) || ! is_array( $meta ) || \is_wp_error( $meta ) ) {
 				if ( Actors::count_errors( $actor->ID ) >= 5 ) {
 					\wp_schedule_single_event( \time(), 'activitypub_delete_actor_interactions', array( $actor->guid ) );
 					\wp_delete_post( $actor->ID );
 				} else {
 					Actors::add_error( $actor->ID, $meta );
 				}
 			} else {
-				Actors::clear_errors( $actor->ID );
+				$id = Actors::upsert( $meta );
+				if ( \is_wp_error( $id ) ) {
+					Actors::add_error( $actor->ID, $id );
+				} else {
+					Actors::clear_errors( $actor->ID );
+				}
 			}
 		}
 	}

includes/collection/class-actors.php

@@ -715,7 +715,13 @@ public static function get_actor( $post ) {
 			$json = \get_post_meta( $post->ID, '_activitypub_actor_json', true );
 		}
 
-		return Actor::init_from_json( $json );
+		$actor = Actor::init_from_json( $json );
+
+		if ( \is_wp_error( $actor ) ) {
+			self::add_error( $post->ID, $actor );
+		}
+
+		return $actor;
 	}
 
 	/**

includes/table/class-followers.php

@@ -199,7 +199,12 @@ public function prepare_items() {
 		);
 
 		foreach ( $followers as $follower ) {
-			$actor     = Actors::get_actor( $follower );
+			$actor = Actors::get_actor( $follower );
+
+			if ( \is_wp_error( $actor ) ) {
+				continue;
+			}
+
 			$url       = object_to_uri( $actor->get_url() ?? $actor->get_id() );
 			$webfinger = Webfinger::uri_to_acct( $url );
 

includes/table/class-following.php

@@ -229,7 +229,12 @@ public function prepare_items() {
 		);
 
 		foreach ( $followings as $following ) {
-			$actor     = Actors::get_actor( $following );
+			$actor = Actors::get_actor( $following );
+
+			if ( \is_wp_error( $actor ) ) {
+				continue;
+			}
+
 			$url       = object_to_uri( $actor->get_url() ?? $actor->get_id() );
 			$webfinger = Webfinger::uri_to_acct( $url );