Tables: Combine actor search term sanitization (#1939)

Author: obenland

includes/table/class-followers.php

@@ -23,6 +23,8 @@
  * Followers Table-Class.
  */
 class Followers extends \WP_List_Table {
+	use Actor_List_Table;
+
 	/**
 	 * User ID.
 	 *
@@ -180,15 +182,7 @@ public function prepare_items() {
 		}
 
 		if ( ! empty( $_GET['s'] ) ) {
-			$search = \sanitize_text_field( \wp_unslash( $_GET['s'] ) );
-			$search = \str_replace( 'acct:', '', $search );
-			$search = \str_replace( '@', ' ', $search );
-			$search = \str_replace( 'http://', '', $search );
-			$search = \str_replace( 'https://', '', $search );
-			$search = \str_replace( 'www.', '', $search );
-			$search = \trim( $search );
-
-			$args['s'] = $search;
+			$args['s'] = self::normalize_search_term( \wp_unslash( $_GET['s'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 		}
 
 		$followers_with_count = Follower_Collection::get_followers_with_count( $this->user_id, $per_page, $page_num, $args );

includes/table/class-following.php

@@ -22,6 +22,8 @@
  * Following Table-Class.
  */
 class Following extends \WP_List_Table {
+	use Actor_List_Table;
+
 	/**
 	 * User ID.
 	 *
@@ -199,15 +201,7 @@ public function prepare_items() {
 		}
 
 		if ( isset( $_GET['s'] ) ) {
-			$search = \sanitize_text_field( \wp_unslash( $_GET['s'] ) );
-			$search = \str_replace( 'acct:', '', $search );
-			$search = \str_replace( '@', ' ', $search );
-			$search = \str_replace( 'http://', '', $search );
-			$search = \str_replace( 'https://', '', $search );
-			$search = \str_replace( 'www.', '', $search );
-			$search = \trim( $search );
-
-			$args['s'] = $search;
+			$args['s'] = self::normalize_search_term( \wp_unslash( $_GET['s'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 		}
 
 		if ( isset( $_GET['status'] ) ) {

includes/table/trait-actor-list-table.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Actor Table Trait file.
+ *
+ * @package Activitypub
+ */
+
+namespace Activitypub\Table;
+
+/**
+ * Actor Table Trait.
+ */
+trait Actor_List_Table {
+
+	/**
+	 * Sanitizes and normalizes an actor search term.
+	 *
+	 * @param string $search The search term.
+	 * @return string The normalized search term.
+	 */
+	public static function normalize_search_term( $search ) {
+		$search = \sanitize_text_field( $search );
+		$search = \str_replace( array( 'acct:', 'http://', 'https://', 'www.' ), '', $search );
+		$search = \str_replace( '@', ' ', $search );
+
+		return \trim( $search );
+	}
+}