Improve Interactions moderation (#1065)

Author: pfefferle

CHANGELOG.md

@@ -5,6 +5,13 @@ 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]
+
+### Improved
+
+* Improve Interactions moderation
+* Compatibility with Akismet
+
 ## [4.4.0] - 2024-12-09
 
 ### Added

includes/class-admin.php

@@ -36,6 +36,7 @@ public static function init() {
 		\add_filter( 'comment_row_actions', array( self::class, 'comment_row_actions' ), 10, 2 );
 		\add_filter( 'manage_edit-comments_columns', array( static::class, 'manage_comment_columns' ) );
 		\add_action( 'manage_comments_custom_column', array( static::class, 'manage_comments_custom_column' ), 9, 2 );
+		\add_action( 'admin_comment_types_dropdown', array( static::class, 'comment_types_dropdown' ) );
 
 		\add_filter( 'manage_posts_columns', array( static::class, 'manage_post_columns' ), 10, 2 );
 		\add_action( 'manage_posts_custom_column', array( self::class, 'manage_posts_custom_column' ), 10, 2 );
@@ -599,6 +600,10 @@ public static function comment_row_actions( $actions, $comment ) {
 			unset( $actions['quickedit'] );
 		}
 
+		if ( in_array( get_comment_type( $comment ), Comment::get_comment_type_names(), true ) ) {
+			unset( $actions['reply'] );
+		}
+
 		return $actions;
 	}
 
@@ -668,6 +673,21 @@ public static function manage_comments_custom_column( $column, $comment_id ) {
 		}
 	}
 
+	/**
+	 * Add the new ActivityPub comment types to the comment types dropdown.
+	 *
+	 * @param array $types The existing comment types.
+	 *
+	 * @return array The extended comment types.
+	 */
+	public static function comment_types_dropdown( $types ) {
+		foreach ( Comment::get_comment_types() as $comment_type ) {
+			$types[ $comment_type['type'] ] = esc_html( $comment_type['label'] );
+		}
+
+		return $types;
+	}
+
 	/**
 	 * Return the results for the activitypub column.
 	 *

integration/class-akismet.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Akismet integration.
+ *
+ * @package Activitypub
+ */
+
+namespace Activitypub\Integration;
+
+use function Activitypub\was_comment_received;
+
+/**
+ * Compatibility with the Akismet plugin.
+ *
+ * @see https://wordpress.org/plugins/akismet/
+ */
+class Akismet {
+	/**
+	 * Initialize the class, registering WordPress hooks.
+	 */
+	public static function init() {
+		\add_filter( 'comment_row_actions', array( self::class, 'comment_row_actions' ), 10, 2 );
+	}
+
+	/**
+	 * Remove the "history" action from the comment row actions.
+	 *
+	 * @param array           $actions The existing actions.
+	 * @param int|\WP_Comment $comment The comment object or ID.
+	 *
+	 * @return array The modified actions.
+	 */
+	public static function comment_row_actions( $actions, $comment ) {
+		if ( was_comment_received( $comment ) ) {
+			unset( $actions['history'] );
+		}
+
+		return $actions;
+	}
+}

integration/load.php

@@ -66,6 +66,17 @@ function plugin_init() {
 		Jetpack::init();
 	}
 
+	/**
+	 * Adds Akismet support.
+	 *
+	 * This class handles the compatibility with the Akismet plugin.
+	 *
+	 * @see https://wordpress.org/plugins/akismet/
+	 */
+	if ( \defined( 'AKISMET_VERSION' ) ) {
+		Akismet::init();
+	}
+
 	/**
 	 * Adds Seriously Simple Podcasting support.
 	 *

readme.txt

@@ -132,6 +132,11 @@ For reasons of data protection, it is not possible to see the followers of other
 
 == Changelog ==
 
+= Unreleased =
+
+* Improved: Interactions moderation
+* Improved: Compatibility with Akismet
+
 = 4.4.0 =
 
 * Added: Setting to enable/disable Authorized-Fetch

tests/integration/class-test-akismet.php

@@ -0,0 +1,96 @@
+<?php
+/**
+ * Test Akismet Integration.
+ *
+ * @package ActivityPub
+ */
+
+namespace Activitypub\Tests\Integration;
+
+use Activitypub\Integration\Akismet;
+use WP_UnitTestCase;
+
+/**
+ * Test Akismet Integration class.
+ *
+ * @coversDefaultClass \Activitypub\Integration\Akismet
+ */
+class Test_Akismet extends WP_UnitTestCase {
+	/**
+	 * A test post.
+	 *
+	 * @var int
+	 */
+	protected static $post_id;
+
+	/**
+	 * Create fake data before tests run.
+	 *
+	 * @param WP_UnitTest_Factory $factory Helper that creates fake data.
+	 */
+	public static function wpSetUpBeforeClass( $factory ) {
+		self::$post_id = $factory->post->create();
+	}
+
+	/**
+	 * Clean up after tests.
+	 */
+	public static function wpTearDownAfterClass() {
+		wp_delete_post( self::$post_id, true );
+	}
+
+	/**
+	 * Test comment_row_actions method.
+	 *
+	 * @covers ::comment_row_actions
+	 */
+	public function test_comment_row_actions() {
+		// Create a normal comment.
+		$normal_comment_id = $this->factory->comment->create(
+			array(
+				'comment_post_ID' => self::$post_id,
+				'comment_content' => 'Normal comment',
+			)
+		);
+
+		// Create an ActivityPub comment.
+		$ap_comment_id = $this->factory->comment->create(
+			array(
+				'comment_post_ID' => self::$post_id,
+				'comment_content' => 'ActivityPub comment',
+			)
+		);
+		add_comment_meta( $ap_comment_id, 'protocol', 'activitypub' );
+
+		// Test actions for normal comment.
+		$actions = array(
+			'approve' => 'Approve',
+			'spam'    => 'Spam',
+			'history' => 'History',
+		);
+
+		$filtered_actions = Akismet::comment_row_actions( $actions, get_comment( $normal_comment_id ) );
+		$this->assertArrayHasKey( 'history', $filtered_actions, 'History action should remain for normal comments' );
+
+		// Test actions for ActivityPub comment.
+		$filtered_actions = Akismet::comment_row_actions( $actions, get_comment( $ap_comment_id ) );
+		$this->assertArrayNotHasKey( 'history', $filtered_actions, 'History action should be removed for ActivityPub comments' );
+		$this->assertArrayHasKey( 'approve', $filtered_actions, 'Other actions should remain untouched' );
+		$this->assertArrayHasKey( 'spam', $filtered_actions, 'Other actions should remain untouched' );
+
+		// Clean up.
+		wp_delete_comment( $normal_comment_id, true );
+		wp_delete_comment( $ap_comment_id, true );
+	}
+
+	/**
+	 * Test init method.
+	 *
+	 * @covers ::init
+	 */
+	public function test_init() {
+		Akismet::init();
+
+		$this->assertEquals( 10, has_filter( 'comment_row_actions', array( Akismet::class, 'comment_row_actions' ) ) );
+	}
+}