Rework Follower Structure

.github/changelog/1759-from-description

@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+Reworked follower structure to simplify handling and enable reuse for following mechanism.

includes/class-blocks.php

@@ -8,7 +8,6 @@
 namespace Activitypub;
 
 use Activitypub\Collection\Actors;
-use Activitypub\Collection\Followers;
 
 /**
  * Block class.

includes/class-migration.php

@@ -1035,7 +1035,5 @@ public static function update_actor_json_storage( $batch_size = 100 ) {
 				'batch_size' => $batch_size,
 			);
 		}
-
-		return null;
 	}
 }

includes/class-scheduler.php

@@ -142,9 +142,9 @@ public static function unschedule_events_for_item( $outbox_item_id ) {
 	}
 
 	/**
-	 * Update followers.
+	 * Update imported actors.
 	 */
-	public static function update_followers() {
+	public static function update_imported_actors() {
 		$number = 5;
 
 		if ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) {
@@ -156,19 +156,20 @@ public static function update_followers() {
 		 *
 		 * @param int $number The number of followers to update.
 		 */
-		$number    = apply_filters( 'activitypub_update_followers_number', $number );
-		$followers = Followers::get_outdated_followers( $number );
+		$number = apply_filters( 'activitypub_update_followers_number', $number );
+		$actors = Actors::get_outdated( $number );
 
-		foreach ( $followers as $follower ) {
-			$meta = get_remote_metadata_by_actor( $follower->get_id(), false );
+		foreach ( $actors as $actor ) {
+			$meta = get_remote_metadata_by_actor( $actor->guid, false );
 
 			if ( empty( $meta ) || ! is_array( $meta ) || is_wp_error( $meta ) ) {
-				Followers::add_error( $follower->get__id(), $meta );
+				Actors::track_error( $actor->ID, 'Failed to fetch or parse metadata' );
 			} else {
-				$follower->from_array( $meta );
-				$follower->update();
-
-				$follower->clear_errors();
+				$id = Actors::add( $meta );
+				if ( \is_wp_error( $id ) ) {
+					continue;
+				}
+				Actors::clear_errors( $id );
 			}
 		}
 	}
@@ -188,27 +189,27 @@ public static function cleanup_followers() {
 		 *
 		 * @param int $number The number of followers to clean up.
 		 */
-		$number    = apply_filters( 'activitypub_update_followers_number', $number );
-		$followers = Followers::get_faulty_followers( $number );
+		$number = apply_filters( 'activitypub_update_followers_number', $number );
+		$actors = Actors::get_faulty( $number );
 
-		foreach ( $followers as $follower ) {
-			$meta = get_remote_metadata_by_actor( $follower->get_url(), false );
+		foreach ( $actors as $actor ) {
+			$meta = get_remote_metadata_by_actor( $actor->guid, false );
 
 			if ( is_tombstone( $meta ) ) {
-				$follower->delete();
+				\wp_delete_post( $actor->ID );
 			} elseif ( empty( $meta ) || ! is_array( $meta ) || is_wp_error( $meta ) ) {
-				if ( $follower->count_errors() >= 5 ) {
-					$follower->delete();
+				if ( Actors::count_errors( $actor->ID ) >= 5 ) {
+					\wp_delete_post( $actor->ID );
 					\wp_schedule_single_event(
 						\time(),
 						'activitypub_delete_actor_interactions',
-						array( $follower->get_id() )
+						array( $actor->ID )
 					);
 				} else {
-					Followers::add_error( $follower->get__id(), $meta );
+					Actors::track_error( $actor->ID, $meta );
 				}
 			} else {
-				$follower->reset_errors();
+				Actors::clear_errors( $actor->ID );
 			}
 		}
 	}