From be0a10dc22d8ee839ec7b9466c253fe8e7e0d63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Menrath?= <andre.menrath@posteo.de>
Date: Wed, 18 Dec 2024 15:09:22 +0100
Subject: [PATCH] Move some functions from class ...\Collection\Event_Sources
 to Event_Sources class in the root namespace.

---
 .../collection/class-event-sources.php        | 62 ----------------
 includes/class-event-sources.php              | 70 ++++++++++++++++++-
 2 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/includes/activitypub/collection/class-event-sources.php b/includes/activitypub/collection/class-event-sources.php
index b3fb37e..d76ab89 100644
--- a/includes/activitypub/collection/class-event-sources.php
+++ b/includes/activitypub/collection/class-event-sources.php
@@ -233,57 +233,6 @@ class Event_Sources {
 		return $result;
 	}
 
-	/**
-	 * Get an array will all unique hosts of all Event-Sources.
-	 *
-	 * @return array The Term list of Event Sources.
-	 */
-	public static function get_event_sources_hosts() {
-		$hosts = get_transient( 'event_bridge_for_activitypub_event_sources_hosts' );
-
-		if ( $hosts ) {
-			return $hosts;
-		}
-
-		$actors = self::get_event_sources_with_count()['actors'];
-
-		$hosts = array();
-		foreach ( $actors as $actor ) {
-			$url = wp_parse_url( $actor->get_id() );
-			if ( isset( $url['host'] ) ) {
-				$hosts[] = $url['host'];
-			}
-		}
-
-		set_transient( 'event_bridge_for_activitypub_event_sources_hosts', $hosts );
-
-		return array_unique( $hosts );
-	}
-
-	/**
-	 * Get add Event Sources ActivityPub IDs.
-	 *
-	 * @return array The Term list of Event Sources.
-	 */
-	public static function get_event_sources_ids() {
-		$ids = get_transient( 'event_bridge_for_activitypub_event_sources_ids' );
-
-		if ( $ids ) {
-			return $ids;
-		}
-
-		$actors = self::get_event_sources_with_count()['actors'];
-
-		$ids = array();
-		foreach ( $actors as $actor ) {
-			$ids[] = $actor->get_id();
-		}
-
-		set_transient( 'event_bridge_for_activitypub_event_sources_ids', $ids );
-
-		return $ids;
-	}
-
 	/**
 	 * Get all Event-Sources.
 	 *
@@ -462,15 +411,4 @@ class Event_Sources {
 		$activity = $activity->to_json();
 		\Activitypub\safe_remote_post( $inbox, $activity, \Activitypub\Collection\Actors::BLOG_USER_ID );
 	}
-
-	/**
-	 * Add Event Sources hosts to allowed hosts used by safe redirect.
-	 *
-	 * @param array $hosts The hosts before the filter.
-	 * @return array
-	 */
-	public static function add_event_sources_hosts_to_allowed_redirect_hosts( $hosts ) {
-		$event_sources_hosts = self::get_event_sources_hosts();
-		return array_merge( $hosts, $event_sources_hosts );
-	}
 }
diff --git a/includes/class-event-sources.php b/includes/class-event-sources.php
index 7b6d3ff..e0619b2 100644
--- a/includes/class-event-sources.php
+++ b/includes/class-event-sources.php
@@ -52,7 +52,7 @@ class Event_Sources {
 		\add_action( 'event_bridge_for_activitypub_event_sources_clear_cache', array( self::class, 'clear_cache' ) );
 
 		// Add the actors followed by the event sources feature to the `follow` collection of the used ActivityPub actor.
-		\add_filter( 'activitypub_rest_following', array( self::class, 'add_event_sources_to_following_collection' ), 10, 2 );
+		\add_filter( 'activitypub_rest_following', array( self::class, 'add_event_sources_to_follow_collection' ), 10, 2 );
 	}
 
 
@@ -227,12 +227,12 @@ class Event_Sources {
 	 *
 	 * @return array The array of following urls.
 	 */
-	public static function add_event_sources_to_following_collection( $follow_list, $user ) {
+	public static function add_event_sources_to_follow_collection( $follow_list, $user ) {
 		if ( ! $user instanceof Blog ) {
 			return $follow_list;
 		}
 
-		$event_sources = Event_Sources_Collection::get_event_sources_ids();
+		$event_sources = self::get_event_sources_ids();
 
 		if ( ! is_array( $event_sources ) ) {
 			return $follow_list;
@@ -240,4 +240,68 @@ class Event_Sources {
 
 		return array_merge( $follow_list, $event_sources );
 	}
+
+	/**
+	 * Get an array will all unique hosts of all Event-Sources.
+	 *
+	 * @return array The Term list of Event Sources.
+	 */
+	public static function get_event_sources_hosts() {
+		$hosts = get_transient( 'event_bridge_for_activitypub_event_sources_hosts' );
+
+		if ( $hosts ) {
+			return $hosts;
+		}
+
+		$actors = Event_Sources_Collection::get_event_sources_with_count()['actors'];
+
+		$hosts = array();
+		foreach ( $actors as $actor ) {
+			$url = wp_parse_url( $actor->get_id() );
+			if ( isset( $url['host'] ) ) {
+				$hosts[] = $url['host'];
+			}
+		}
+
+		$hosts = array_unique( $hosts );
+
+		set_transient( 'event_bridge_for_activitypub_event_sources_hosts', $hosts );
+
+		return $hosts;
+	}
+
+	/**
+	 * Get add Event Sources ActivityPub IDs.
+	 *
+	 * @return array The Term list of Event Sources.
+	 */
+	public static function get_event_sources_ids() {
+		$ids = get_transient( 'event_bridge_for_activitypub_event_sources_ids' );
+
+		if ( $ids ) {
+			return $ids;
+		}
+
+		$actors = Event_Sources_Collection::get_event_sources_with_count()['actors'];
+
+		$ids = array();
+		foreach ( $actors as $actor ) {
+			$ids[] = $actor->get_id();
+		}
+
+		set_transient( 'event_bridge_for_activitypub_event_sources_ids', $ids );
+
+		return $ids;
+	}
+
+	/**
+	 * Add Event Sources hosts to allowed hosts used by safe redirect.
+	 *
+	 * @param array $hosts The hosts before the filter.
+	 * @return array
+	 */
+	public static function add_event_sources_hosts_to_allowed_redirect_hosts( $hosts ) {
+		$event_sources_hosts = self::get_event_sources_hosts();
+		return array_merge( $hosts, $event_sources_hosts );
+	}
 }