Add all repliers as Mentions (#692)

* Add all repliers as Mentions

Add all repliers as Mentions so that they receive notifications.

See: https://wordpress.org/support/topic/ux-deviation-from-expected-behaviour-in-2-0/

* Fix readme

* typo

Author: pfefferle

README.md

@@ -141,6 +141,7 @@ Project maintained on GitHub at [automattic/wordpress-activitypub](https://githu
 * Fixed: Remove old/abandoned Crons
 * Added: Various endpoints for the "Enable Mastodon Apps" plugin
 * Added: Event Objects
+* Added: Send notification to all Repliers if a new Comment is added
 * Added: Vary-Header support behind feature flag
 
 ### 2.0.1 ###

includes/transformer/class-comment.php

@@ -4,6 +4,7 @@
 use WP_Comment;
 use WP_Comment_Query;
 
+use Activitypub\Webfinger;
 use Activitypub\Comment as Comment_Utils;
 use Activitypub\Model\Blog_User;
 use Activitypub\Collection\Users;
@@ -178,31 +179,7 @@ protected function get_cc() {
 			}
 		}
 
-		$comment_query = new WP_Comment_Query(
-			array(
-				'post_id'    => $this->wp_object->comment_post_ID,
-				// phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
-				'meta_query' => array(
-					array(
-						'key'     => 'source_id',
-						'compare' => 'EXISTS',
-					),
-				),
-			)
-		);
-
-		if ( $comment_query->comments ) {
-			foreach ( $comment_query->comments as $comment ) {
-				if ( empty( $comment->comment_author_url ) ) {
-					continue;
-				}
-				$cc[] = \esc_url( $comment->comment_author_url );
-			}
-		}
-
-		$cc = \array_unique( $cc );
-
-		return $cc;
+		return array_unique( $cc );
 	}
 
 	/**
@@ -236,9 +213,64 @@ protected function get_tag() {
 	 * @return array The list of @-Mentions.
 	 */
 	protected function get_mentions() {
+		\add_filter( 'activitypub_extract_mentions', array( $this, 'extract_reply_context' ) );
+
 		return apply_filters( 'activitypub_extract_mentions', array(), $this->wp_object->comment_content, $this->wp_object );
 	}
 
+	/**
+	 * Collect all other Users that participated in this comment-thread
+	 * to send them a notification about the new reply.
+	 *
+	 * @param array $mentions The already mentioned ActivityPub users
+	 *
+	 * @return array The list of all Repliers.
+	 */
+	public function extract_reply_context( $mentions ) {
+		// Check if `$this->wp_object` is a WP_Comment
+		if ( 'WP_Comment' !== get_class( $this->wp_object ) ) {
+			return $mentions;
+		}
+
+		$comment_query = new WP_Comment_Query(
+			array(
+				'post_id'    => $this->wp_object->comment_post_ID,
+				// phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
+				'meta_query' => array(
+					array(
+						'key'   => 'protocol',
+						'value' => 'activitypub',
+					),
+				),
+			)
+		);
+
+		if ( $comment_query->comments ) {
+			foreach ( $comment_query->comments as $comment ) {
+				$id           = null;
+				$comment_meta = \get_comment_meta( $comment->comment_ID );
+
+				if ( ! empty( $comment_meta['source_id'][0] ) ) {
+					$id = \esc_url( $comment_meta['source_id'][0] );
+				} elseif ( ! empty( $comment_meta['source_url'][0] ) ) {
+					$id = \esc_url( $comment_meta['source_url'][0] );
+				} elseif ( ! empty( $comment->comment_author_url ) ) {
+					$id = $comment->comment_author_url;
+				}
+
+				if ( $id ) {
+					$acct = Webfinger::uri_to_acct( $id );
+					if ( $acct && ! is_wp_error( $acct ) ) {
+						$acct = str_replace( 'acct:', '@', $acct );
+						$mentions[ $acct ] = $id;
+					}
+				}
+			}
+		}
+
+		return $mentions;
+	}
+
 	/**
 	 * Returns the locale of the post.
 	 *

readme.txt

@@ -141,6 +141,7 @@ Project maintained on GitHub at [automattic/wordpress-activitypub](https://githu
 * Fixed: Remove old/abandoned Crons
 * Added: Various endpoints for the "Enable Mastodon Apps" plugin
 * Added: Event Objects
+* Added: Send notification to all Repliers if a new Comment is added
 * Added: Vary-Header support behind feature flag
 
 = 2.0.1 =