Don't send direct message notification for received public activities (#1092)

* Don't send direct message notification for public actitivies

* Changelog

* readme

* Use filter instead of action for clarity

* Better test texts, add cc

* added some other little tweaks

---------

Co-authored-by: Matthias Pfefferle <[email protected]>

Author: akirk

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Improved
 * Reactions block: Remove the `wp-block-editor` dependency for frontend views 
 
+### Fixed
+* Direct Messages: Don't send notification for received public activities
+
 ## [4.5.0] - 2024-12-17
 
 ### Added

includes/class-mailer.php

@@ -149,10 +149,7 @@ public static function new_follower( $notification ) {
 	 */
 	public static function direct_message( $activity, $user_id ) {
 		// Check if Activity is public or not.
-		if (
-			is_activity_public( $activity ) &&
-			is_activity_reply( $activity )
-		) {
+		if ( is_activity_public( $activity ) ) {
 			return;
 		}
 

includes/handler/class-create.php

@@ -45,8 +45,10 @@ public static function init() {
 	 */
 	public static function handle_create( $activity, $user_id, $activity_object = null ) {
 		// Check if Activity is public or not.
-		if ( ! is_activity_public( $activity ) ) {
-			// @todo maybe send email.
+		if (
+			! is_activity_public( $activity ) ||
+			! is_activity_reply( $activity )
+		) {
 			return;
 		}
 
@@ -67,7 +69,6 @@ public static function handle_create( $activity, $user_id, $activity_object = nu
 		}
 
 		if ( is_self_ping( $activity['object']['id'] ) ) {
-			// @todo maybe send email.
 			return;
 		}
 
@@ -120,7 +121,6 @@ public static function validate_object( $valid, $param, $request ) {
 
 		$required = array(
 			'id',
-			'inReplyTo',
 			'content',
 		);
 

readme.txt

@@ -135,6 +135,7 @@ For reasons of data protection, it is not possible to see the followers of other
 = Unreleased =
 
 * Improved: Reactions block: Remove the `wp-block-editor` dependency for frontend views
+* Fixed: Direct Messages: Don't send notification for received public activities
 
 = 4.5.0 =
 

tests/includes/class-test-mailer.php

@@ -217,6 +217,7 @@ public function test_init() {
 	 */
 	public function test_direct_message() {
 		$user_id = self::$user_id;
+		$mock    = new \MockAction();
 
 		$activity = array(
 			'actor'  => 'https://example.com/author',
@@ -235,6 +236,7 @@ function () {
 				);
 			}
 		);
+		add_filter( 'wp_mail', array( $mock, 'filter' ), 1 );
 
 		// Capture email.
 		add_filter(
@@ -255,14 +257,15 @@ function ( $args ) use ( $user_id ) {
 		$public_activity = array(
 			'actor'  => 'https://example.com/author',
 			'object' => array(
-				'content'   => 'Test public message',
+				'content'   => 'Test public reply',
 				'inReplyTo' => 'https://example.com/post/1',
 			),
 			'to'     => array( 'https://www.w3.org/ns/activitystreams#Public' ),
 		);
 
 		// Reset email capture.
 		remove_all_filters( 'wp_mail' );
+		add_filter( 'wp_mail', array( $mock, 'filter' ), 1 );
 		add_filter(
 			'wp_mail',
 			function ( $args ) {
@@ -273,6 +276,32 @@ function ( $args ) {
 
 		Mailer::direct_message( $public_activity, $user_id );
 
+		// Test public activity (should not send email).
+		$public_activity = array(
+			'actor'  => 'https://example.com/author',
+			'object' => array(
+				'content'   => 'Test public activity',
+				'inReplyTo' => null,
+			),
+			'to'     => array( 'https://www.w3.org/ns/activitystreams#Public' ),
+			'cc'     => array( 'https://example.com/followers' ),
+		);
+
+		// Reset email capture.
+		remove_all_filters( 'wp_mail' );
+		add_filter( 'wp_mail', array( $mock, 'filter' ), 1 );
+		add_filter(
+			'wp_mail',
+			function ( $args ) {
+				$this->fail( 'Email should not be sent for public activity' );
+				return $args;
+			}
+		);
+
+		Mailer::direct_message( $public_activity, $user_id );
+
+		$this->assertEquals( 1, $mock->get_call_count() );
+
 		// Clean up.
 		remove_all_filters( 'pre_get_remote_metadata_by_actor' );
 		remove_all_filters( 'wp_mail' );