Improve outbox scheduling of (custom) posts (#1359)

* Improve outbox scheduling of (custom) posts

* Fix tests

* no longer needed

* Update changelog

Author: pfefferle

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Changed
+
+* Use a later hook for Posts to get published to the Outbox, to get sure all `post_meta`s and `taxonomy`s are set stored properly.
+
 ## [5.3.0] - 2025-02-25
 
 ### Added

includes/scheduler/class-post.php

@@ -22,52 +22,23 @@ class Post {
 	 */
 	public static function init() {
 		// Post transitions.
-		\add_action( 'transition_post_status', array( self::class, 'schedule_post_activity' ), 33, 3 );
+		\add_action( 'wp_after_insert_post', array( self::class, 'schedule_post_activity' ), 33, 4 );
 
 		// Attachment transitions.
 		\add_action( 'add_attachment', array( self::class, 'transition_attachment_status' ) );
 		\add_action( 'edit_attachment', array( self::class, 'transition_attachment_status' ) );
 		\add_action( 'delete_attachment', array( self::class, 'transition_attachment_status' ) );
-
-		// Get all post types that support ActivityPub.
-		$post_types = \get_post_types_by_support( 'activitypub' );
-
-		foreach ( $post_types as $post_type ) {
-			\add_filter( "rest_pre_insert_{$post_type}", array( self::class, 'rest_insert' ), 10, 2 );
-		}
 	}
 
 	/**
-	 * Schedules Activities for attachment transitions.
+	 * Handle post updates and determine the appropriate Activity type.
 	 *
-	 * @param int $post_id Attachment ID.
+	 * @param int      $post_id     Post ID.
+	 * @param \WP_Post $post        Post object.
+	 * @param bool     $update      Whether this is an existing post being updated.
+	 * @param \WP_Post $post_before Post object before the update.
 	 */
-	public static function transition_attachment_status( $post_id ) {
-		if ( ! \post_type_supports( 'attachment', 'activitypub' ) ) {
-			return;
-		}
-
-		switch ( current_action() ) {
-			case 'add_attachment':
-				self::schedule_post_activity( 'publish', '', get_post( $post_id ) );
-				break;
-			case 'edit_attachment':
-				self::schedule_post_activity( 'publish', 'publish', get_post( $post_id ) );
-				break;
-			case 'delete_attachment':
-				self::schedule_post_activity( 'trash', '', get_post( $post_id ) );
-				break;
-		}
-	}
-
-	/**
-	 * Schedule Activities.
-	 *
-	 * @param string   $new_status New post status.
-	 * @param string   $old_status Old post status.
-	 * @param \WP_Post $post       Post object.
-	 */
-	public static function schedule_post_activity( $new_status, $old_status, $post ) {
+	public static function schedule_post_activity( $post_id, $post, $update, $post_before ) {
 		if ( defined( 'WP_IMPORTING' ) && WP_IMPORTING ) {
 			return;
 		}
@@ -81,9 +52,12 @@ public static function schedule_post_activity( $new_status, $old_status, $post )
 			return;
 		}
 
+		$new_status = get_post_status( $post );
+		$old_status = $post_before ? get_post_status( $post_before ) : null;
+
 		switch ( $new_status ) {
 			case 'publish':
-				$type = ( 'publish' === $old_status ) ? 'Update' : 'Create';
+				$type = $update ? 'Update' : 'Create';
 				break;
 
 			case 'draft':
@@ -108,37 +82,30 @@ public static function schedule_post_activity( $new_status, $old_status, $post )
 	}
 
 	/**
-	 * Filter the post data before it is inserted via the REST API.
-	 *
-	 * Posts being inserted via the REST API have a different order of operations than in wp_insert_post().
-	 * This filter updates post meta before the post is inserted into the database, so that the
-	 * information is available by the time @see Outbox::add() runs.
-	 *
-	 * @param \stdClass        $post    An object representing a single post prepared for inserting or updating the database.
-	 * @param \WP_REST_Request $request The request object.
+	 * Schedules Activities for attachment transitions.
 	 *
-	 * @return \stdClass The prepared post.
+	 * @param int $post_id Attachment ID.
 	 */
-	public static function rest_insert( $post, $request ) {
-		$metas = $request->get_param( 'meta' );
-
-		if ( empty( $post->ID ) || ! $metas || ! is_array( $metas ) ) {
-			return $post;
+	public static function transition_attachment_status( $post_id ) {
+		if ( ! \post_type_supports( 'attachment', 'activitypub' ) ) {
+			return;
 		}
 
-		foreach ( $metas as $meta_key => $meta_value ) {
-			if (
-				\str_starts_with( $meta_key, 'activitypub_' ) ||
-				\str_starts_with( $meta_key, '_activitypub_' )
-			) {
-				if ( $meta_value ) {
-					\update_post_meta( $post->ID, $meta_key, $meta_value );
-				} else {
-					\delete_post_meta( $post->ID, $meta_key );
-				}
-			}
-		}
+		$post = \get_post( $post_id );
 
-		return $post;
+		switch ( current_action() ) {
+			case 'add_attachment':
+				// Add the post to the outbox.
+				add_to_outbox( $post, 'Create', $post->post_author );
+				break;
+			case 'edit_attachment':
+				// Update the post to the outbox.
+				add_to_outbox( $post, 'Update', $post->post_author );
+				break;
+			case 'delete_attachment':
+				// Delete the post from the outbox.
+				add_to_outbox( $post, 'Delete', $post->post_author );
+				break;
+		}
 	}
 }

readme.txt

@@ -129,6 +129,10 @@ For reasons of data protection, it is not possible to see the followers of other
 
 == Changelog ==
 
+= Unreleased =
+
+* Changed: Use a later hook for Posts to get published to the Outbox, to get sure all `post_meta`s and `taxonomy`s are set stored properly.
+
 = 5.3.0 =
 
 * Added: A fallback `Note` for `Article` objects to improve previews on services that don't support Articles yet.

tests/includes/class-test-migration.php

@@ -29,7 +29,7 @@ class Test_Migration extends ActivityPub_TestCase_Cache_HTTP {
 	 * Set up the test.
 	 */
 	public static function set_up_before_class() {
-		\remove_action( 'transition_post_status', array( \Activitypub\Scheduler\Post::class, 'schedule_post_activity' ), 33 );
+		\remove_action( 'wp_after_insert_post', array( \Activitypub\Scheduler\Post::class, 'schedule_post_activity' ), 33 );
 		\remove_action( 'transition_comment_status', array( \Activitypub\Scheduler\Comment::class, 'schedule_comment_activity' ), 20 );
 		\remove_action( 'wp_insert_comment', array( \Activitypub\Scheduler\Comment::class, 'schedule_comment_activity_on_insert' ) );
 

tests/includes/class-test-shortcodes.php

@@ -30,7 +30,7 @@ class Test_Shortcodes extends \WP_UnitTestCase {
 	public function set_up() {
 		parent::set_up();
 
-		remove_action( 'transition_post_status', array( Post::class, 'schedule_post_activity' ), 33 );
+		remove_action( 'wp_after_insert_post', array( Post::class, 'schedule_post_activity' ), 33 );
 
 		Shortcodes::register();