Comment: Send announce for all new comments

Supersedes #1515 and fixes #1001

Author: pfefferle

includes/class-comment.php

@@ -33,6 +33,8 @@ public static function init() {
 		\add_action( 'update_option_activitypub_allow_likes', array( self::class, 'maybe_update_comment_counts' ), 10, 2 );
 		\add_action( 'update_option_activitypub_allow_reposts', array( self::class, 'maybe_update_comment_counts' ), 10, 2 );
 		\add_filter( 'pre_wp_update_comment_count_now', array( static::class, 'pre_wp_update_comment_count_now' ), 10, 3 );
+
+		\add_action( 'transition_comment_status', array( self::class, 'maybe_announce_interaction' ), 20, 3 );
 	}
 
 	/**
@@ -804,6 +806,38 @@ public static function pre_wp_update_comment_count_now( $new_count, $old_count,
 		return $new_count;
 	}
 
+	/**
+	 * Announce an interaction.
+	 *
+	 * @param string      $new_status The new comment status.
+	 * @param string      $old_status The old comment status.
+	 * @param \WP_Comment $comment    The comment object.
+	 */
+	public static function maybe_announce_interaction( $new_status, $old_status, $comment ) {
+		if ( defined( 'WP_IMPORTING' ) && WP_IMPORTING ) {
+			return;
+		}
+
+		if ( 'approved' !== $new_status || 'approved' === $old_status ) {
+			return;
+		}
+
+		$comment = \get_comment( $comment );
+
+		if ( ! self::was_received( $comment ) ) {
+			return;
+		}
+
+		// get activity from comment meta
+		$activity = \get_comment_meta( $comment->comment_ID, '_activitypub_activity', true );
+
+		if ( ! $activity ) {
+			return;
+		}
+
+		add_to_outbox( $activity, 'Announce', Actors::BLOG_USER_ID, ACTIVITYPUB_CONTENT_VISIBILITY_PUBLIC );
+	}
+
 	/**
 	 * Check if a comment type is enabled.
 	 *

includes/collection/class-interactions.php

@@ -270,8 +270,9 @@ public static function activity_to_comment( $activity ) {
 			'comment_type'         => 'comment',
 			'comment_author_email' => $webfinger,
 			'comment_meta'         => array(
-				'source_id' => \esc_url_raw( object_to_uri( $activity['object'] ) ),
-				'protocol'  => 'activitypub',
+				'source_id'             => \esc_url_raw( object_to_uri( $activity['object'] ) ),
+				'protocol'              => 'activitypub',
+				'_activitypub_activity' => $activity,
 			),
 		);