Merge branch 'trunk' into add/reader

Author: pfefferle

.github/changelog/2604-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Cache expensive operations in Post transformer to improve performance.

.github/changelog/2605-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Use stable term_id-based IDs for Term transformer to ensure federation consistency.

.github/changelog/fix-skip-video-audio-sideload

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Skip downloading video and audio attachments, embedding remote URLs directly to avoid storage limits.

includes/class-attachments.php

@@ -483,19 +483,33 @@ private static function save_attachment( $attachment_data, $post_id, $author_id
 	/**
 	 * Save a file directly to uploads/activitypub/{type}/{id}/.
 	 *
+	 * For video and audio files, returns the remote URL directly without downloading
+	 * to avoid storage overhead for large media files.
+	 *
 	 * @param array  $attachment_data The normalized attachment data.
 	 * @param int    $object_id       The post or comment ID to attach to.
 	 * @param string $object_type     The object type ('post' or 'comment').
 	 *
 	 * @return array|\WP_Error {
 	 *     Array of file data on success, WP_Error on failure.
 	 *
-	 *     @type string $url       Full URL to the saved file.
+	 *     @type string $url       Full URL to the saved file (or remote URL for video/audio).
 	 *     @type string $mime_type MIME type of the file.
 	 *     @type string $alt       Alt text from attachment name field.
 	 * }
 	 */
 	private static function save_file( $attachment_data, $object_id, $object_type ) {
+		$mime_type = $attachment_data['mediaType'] ?? '';
+
+		// Skip download for video and audio files - use remote URL directly.
+		if ( str_starts_with( $mime_type, 'video/' ) || str_starts_with( $mime_type, 'audio/' ) ) {
+			return array(
+				'url'       => $attachment_data['url'],
+				'mime_type' => $attachment_data['mediaType'],
+				'alt'       => $attachment_data['name'] ?? '',
+			);
+		}
+
 		if ( ! \function_exists( 'download_url' ) ) {
 			require_once ABSPATH . 'wp-admin/includes/file.php';
 		}

includes/class-query.php

@@ -198,6 +198,14 @@ public function get_queried_object() {
 			}
 		}
 
+		// Check Term by ID.
+		if ( ! $queried_object ) {
+			$term_id = \get_query_var( 'term_id' );
+			if ( $term_id ) {
+				$queried_object = \get_term( $term_id );
+			}
+		}
+
 		// Try to get Author by ID.
 		if ( ! $queried_object ) {
 			$url       = $this->get_request_url();

includes/class-router.php

@@ -262,6 +262,28 @@ public static function template_redirect() {
 			\wp_safe_redirect( $actor->get_url(), 301 );
 			exit;
 		}
+
+		$term_id = \get_query_var( 'term_id', null );
+		if ( $term_id ) {
+			$term = \get_term( $term_id );
+
+			// Load a 404-page if `term_id` is set but not valid.
+			if ( ! $term || \is_wp_error( $term ) ) {
+				$wp_query->set_404();
+				return;
+			}
+
+			// Don't redirect for ActivityPub requests.
+			if ( is_activitypub_request() ) {
+				return;
+			}
+
+			$term_link = \get_term_link( $term );
+			if ( ! \is_wp_error( $term_link ) ) {
+				\wp_safe_redirect( $term_link, 301 );
+				exit;
+			}
+		}
 	}
 
 	/**
@@ -280,6 +302,7 @@ public static function add_query_vars( $vars ) {
 		$vars[] = 'type';
 		$vars[] = 'c';
 		$vars[] = 'p';
+		$vars[] = 'term_id';
 
 		return $vars;
 	}

includes/transformer/class-post.php

@@ -41,6 +41,48 @@ class Post extends Base {
 	 */
 	private $actor_object = null;
 
+	/**
+	 * The content.
+	 *
+	 * @var string|false False indicates not yet computed.
+	 */
+	private $content = false;
+
+	/**
+	 * The summary.
+	 *
+	 * @var string|null|false False indicates not yet computed.
+	 */
+	private $summary = false;
+
+	/**
+	 * The tags.
+	 *
+	 * @var array|false False indicates not yet computed.
+	 */
+	private $tags = false;
+
+	/**
+	 * The attachment.
+	 *
+	 * @var array|false False indicates not yet computed.
+	 */
+	private $attachment = false;
+
+	/**
+	 * The mentions.
+	 *
+	 * @var array|false False indicates not yet computed.
+	 */
+	private $mentions = false;
+
+	/**
+	 * The in_reply_to.
+	 *
+	 * @var string|array|null|false False indicates not yet computed.
+	 */
+	private $in_reply_to = false;
+
 	/**
 	 * Transforms the WP_Post object to an ActivityPub Object
 	 *
@@ -290,12 +332,18 @@ protected function get_icon() {
 	 * @return array The Attachments.
 	 */
 	protected function get_attachment() {
+		if ( false !== $this->attachment ) {
+			return $this->attachment;
+		}
+
 		/*
 		 * Remove attachments from the Fediverse if a post was federated and then set back to draft.
 		 * Except in preview mode, where we want to show attachments.
 		 */
 		if ( ! $this->is_preview() && 'draft' === \get_post_status( $this->item ) ) {
-			return array();
+			$this->attachment = array();
+
+			return $this->attachment;
 		}
 
 		$max_media = \get_post_meta( $this->item->ID, 'activitypub_max_image_attachments', true );
@@ -316,7 +364,9 @@ protected function get_attachment() {
 		$max_media = (int) \apply_filters( 'activitypub_max_image_attachments', $max_media );
 
 		if ( 0 === $max_media ) {
-			return array();
+			$this->attachment = array();
+
+			return $this->attachment;
 		}
 
 		$media = array(
@@ -363,7 +413,9 @@ protected function get_attachment() {
 		 *
 		 * @return array The filtered attachments.
 		 */
-		return \apply_filters( 'activitypub_attachments', $attachments, $this->item );
+		$this->attachment = \apply_filters( 'activitypub_attachments', $attachments, $this->item );
+
+		return $this->attachment;
 	}
 
 	/**
@@ -381,15 +433,8 @@ protected function get_type() {
 			return \ucfirst( $post_format_setting );
 		}
 
-		$has_title = \post_type_supports( $this->item->post_type, 'title' );
-		$content   = \wp_strip_all_tags( $this->item->post_content );
-
 		// Check if the post has a title.
-		if (
-			! $has_title ||
-			! $this->item->post_title ||
-			\strlen( $content ) <= ACTIVITYPUB_NOTE_LENGTH
-		) {
+		if ( ! \post_type_supports( $this->item->post_type, 'title' ) || ! $this->item->post_title ) {
 			return 'Note';
 		}
 
@@ -430,6 +475,10 @@ public function get_audience() {
 	 * @return array The list of Tags.
 	 */
 	protected function get_tag() {
+		if ( false !== $this->tags ) {
+			return $this->tags;
+		}
+
 		$tags = parent::get_tag();
 
 		$post_tags = \get_the_tags( $this->item->ID );
@@ -448,7 +497,9 @@ protected function get_tag() {
 			}
 		}
 
-		return \array_unique( $tags, SORT_REGULAR );
+		$this->tags = \array_unique( $tags, SORT_REGULAR );
+
+		return $this->tags;
 	}
 
 	/**
@@ -464,12 +515,20 @@ protected function get_summary() {
 			return null;
 		}
 
+		if ( false !== $this->summary ) {
+			return $this->summary;
+		}
+
 		// Remove Teaser from drafts.
 		if ( ! $this->is_preview() && 'draft' === \get_post_status( $this->item ) ) {
-			return \__( '(This post is being modified)', 'activitypub' );
+			$this->summary = \__( '(This post is being modified)', 'activitypub' );
+
+			return $this->summary;
 		}
 
-		return generate_post_summary( $this->item );
+		$this->summary = generate_post_summary( $this->item );
+
+		return $this->summary;
 	}
 
 	/**
@@ -506,9 +565,15 @@ protected function get_name() {
 	 * @return string The content.
 	 */
 	protected function get_content() {
+		if ( false !== $this->content ) {
+			return $this->content;
+		}
+
 		// Remove Content from drafts.
 		if ( ! $this->is_preview() && 'draft' === \get_post_status( $this->item ) ) {
-			return \__( '(This post is being modified)', 'activitypub' );
+			$this->content = \__( '(This post is being modified)', 'activitypub' );
+
+			return $this->content;
 		}
 
 		global $post;
@@ -551,7 +616,9 @@ protected function get_content() {
 		 * @param string   $content The transformed post content.
 		 * @param \WP_Post $post    The post object being transformed.
 		 */
-		return \apply_filters( 'activitypub_the_content', $content, $post );
+		$this->content = \apply_filters( 'activitypub_the_content', $content, $post );
+
+		return $this->content;
 	}
 
 	/**
@@ -578,8 +645,13 @@ public function generate_reply_link( $block_content, $block ) {
 	 * @return string|array|null The in-reply-to URL of the post.
 	 */
 	protected function get_in_reply_to() {
+		if ( false !== $this->in_reply_to ) {
+			return $this->in_reply_to;
+		}
+
 		if ( ! site_supports_blocks() ) {
-			return null;
+			$this->in_reply_to = null;
+			return $this->in_reply_to;
 		}
 
 		$reply_urls = array();
@@ -596,14 +668,20 @@ protected function get_in_reply_to() {
 		}
 
 		if ( empty( $reply_urls ) ) {
-			return null;
+			$this->in_reply_to = null;
+
+			return $this->in_reply_to;
 		}
 
 		if ( 1 === count( $reply_urls ) ) {
-			return \current( $reply_urls );
+			$this->in_reply_to = \current( $reply_urls );
+
+			return $this->in_reply_to;
 		}
 
-		return \array_values( \array_unique( $reply_urls ) );
+		$this->in_reply_to = \array_values( \array_unique( $reply_urls ) );
+
+		return $this->in_reply_to;
 	}
 
 	/**
@@ -639,6 +717,10 @@ protected function get_updated() {
 	 * @return array The list of @-Mentions.
 	 */
 	protected function get_mentions() {
+		if ( false !== $this->mentions ) {
+			return $this->mentions;
+		}
+
 		/**
 		 * Filter the mentions in the post content.
 		 *
@@ -648,12 +730,14 @@ protected function get_mentions() {
 		 *
 		 * @return array The filtered mentions.
 		 */
-		return apply_filters(
+		$this->mentions = apply_filters(
 			'activitypub_extract_mentions',
 			array(),
 			$this->item->post_content . ' ' . $this->item->post_excerpt,
 			$this->item
 		);
+
+		return $this->mentions;
 	}
 
 	/**

includes/transformer/class-term.php

@@ -22,17 +22,45 @@ public function to_object() {
 		$base_object               = new \Activitypub\Activity\Base_Object();
 		$base_object->{'@context'} = 'https://www.w3.org/ns/activitystreams';
 		$base_object->set_type( 'OrderedCollection' );
-		$base_object->set_id( \get_term_link( $this->item ) );
+		$base_object->set_id( $this->get_id() );
+		$base_object->set_url( $this->get_url() );
 
 		return $base_object;
 	}
 
 	/**
-	 * Get the OrderedCollection ID (term link).
+	 * Get the OrderedCollection ID.
 	 *
-	 * @return string The OrderedCollection ID (term link).
+	 * @return string The OrderedCollection ID.
 	 */
 	public function to_id() {
-		return \get_term_link( $this->item );
+		return $this->get_id();
+	}
+
+	/**
+	 * Returns the stable ID of the Term.
+	 *
+	 * Uses term_id query parameter to ensure the ID remains stable
+	 * even if the term slug is changed.
+	 *
+	 * @return string The Term's stable ID.
+	 */
+	public function get_id() {
+		return \add_query_arg( 'term_id', $this->item->term_id, \home_url( '/' ) );
+	}
+
+	/**
+	 * Returns the URL of the Term.
+	 *
+	 * @return string The Term's URL (term link).
+	 */
+	public function get_url() {
+		$term_link = \get_term_link( $this->item );
+
+		if ( \is_wp_error( $term_link ) ) {
+			return '';
+		}
+
+		return \esc_url( $term_link );
 	}
 }