From c52983f908b085b21d3244efe05f4a356942daa8 Mon Sep 17 00:00:00 2001 From: Matthias Pfefferle Date: Wed, 11 Oct 2023 17:10:37 +0200 Subject: [PATCH] search for followers and order the output list --- includes/model/class-follower.php | 2 +- includes/table/class-followers.php | 63 ++++++++++++++++++-------- templates/blog-user-followers-list.php | 1 + templates/user-followers-list.php | 1 + 4 files changed, 47 insertions(+), 20 deletions(-) diff --git a/includes/model/class-follower.php b/includes/model/class-follower.php index 7cf6dd4..b2833e9 100644 --- a/includes/model/class-follower.php +++ b/includes/model/class-follower.php @@ -315,7 +315,7 @@ class Follower extends Actor { $object->set_id( $post->guid ); $object->set_name( $post->post_title ); $object->set_summary( $post->post_excerpt ); - $object->set_published( gmdate( 'Y-m-d H:i:s', strtotime( $post->post_published ) ) ); + $object->set_published( gmdate( 'Y-m-d H:i:s', strtotime( $post->post_date ) ) ); $object->set_updated( gmdate( 'Y-m-d H:i:s', strtotime( $post->post_modified ) ) ); return $object; diff --git a/includes/table/class-followers.php b/includes/table/class-followers.php index 289a194..60b7adf 100644 --- a/includes/table/class-followers.php +++ b/includes/table/class-followers.php @@ -30,19 +30,24 @@ class Followers extends WP_List_Table { public function get_columns() { return array( - 'cb' => '', - 'avatar' => \__( 'Avatar', 'activitypub' ), - 'name' => \__( 'Name', 'activitypub' ), - 'username' => \__( 'Username', 'activitypub' ), - 'url' => \__( 'URL', 'activitypub' ), - 'updated' => \__( 'Last updated', 'activitypub' ), - //'errors' => \__( 'Errors', 'activitypub' ), - //'latest-error' => \__( 'Latest Error Message', 'activitypub' ), + 'cb' => '', + 'avatar' => \__( 'Avatar', 'activitypub' ), + 'post_title' => \__( 'Name', 'activitypub' ), + 'username' => \__( 'Username', 'activitypub' ), + 'url' => \__( 'URL', 'activitypub' ), + 'published' => \__( 'Followed', 'activitypub' ), + 'modified' => \__( 'Last updated', 'activitypub' ), ); } public function get_sortable_columns() { - return array(); + $sortable_columns = array( + 'post_title' => array( 'post_title', true ), + 'modified' => array( 'modified', false ), + 'published' => array( 'published', false ), + ); + + return $sortable_columns; } public function prepare_items() { @@ -55,8 +60,29 @@ class Followers extends WP_List_Table { $page_num = $this->get_pagenum(); $per_page = 20; - $followers = FollowerCollection::get_followers( $this->user_id, $per_page, $page_num ); - $counter = FollowerCollection::count_followers( $this->user_id ); + $args = array(); + + // phpcs:ignore WordPress.Security.NonceVerification.Recommended + if ( isset( $_GET['orderby'] ) ) { + // phpcs:ignore WordPress.Security.NonceVerification.Recommended + $args['orderby'] = sanitize_text_field( wp_unslash( $_GET['orderby'] ) ); + } + + // phpcs:ignore WordPress.Security.NonceVerification.Recommended + if ( isset( $_GET['order'] ) ) { + // phpcs:ignore WordPress.Security.NonceVerification.Recommended + $args['order'] = sanitize_text_field( wp_unslash( $_GET['order'] ) ); + } + + // phpcs:ignore WordPress.Security.NonceVerification.Recommended + if ( isset( $_GET['s'] ) ) { + // phpcs:ignore WordPress.Security.NonceVerification.Recommended + $args['s'] = sanitize_text_field( wp_unslash( $_GET['s'] ) ); + } + + $followers_with_count = FollowerCollection::get_followers_with_count( $this->user_id, $per_page, $page_num, $args ); + $followers = $followers_with_count['followers']; + $counter = $followers_with_count['total']; $this->items = array(); $this->set_pagination_args( @@ -69,14 +95,13 @@ class Followers extends WP_List_Table { foreach ( $followers as $follower ) { $item = array( - 'icon' => esc_attr( $follower->get_icon_url() ), - 'name' => esc_attr( $follower->get_name() ), - 'username' => esc_attr( $follower->get_preferred_username() ), - 'url' => esc_attr( $follower->get_url() ), - 'identifier' => esc_attr( $follower->get_id() ), - 'updated' => esc_attr( $follower->get_updated() ), - 'errors' => $follower->count_errors(), - 'latest-error' => $follower->get_latest_error_message(), + 'icon' => esc_attr( $follower->get_icon_url() ), + 'post_title' => esc_attr( $follower->get_name() ), + 'username' => esc_attr( $follower->get_preferred_username() ), + 'url' => esc_attr( $follower->get_url() ), + 'identifier' => esc_attr( $follower->get_id() ), + 'published' => esc_attr( $follower->get_published() ), + 'modified' => esc_attr( $follower->get_updated() ), ); $this->items[] = $item; diff --git a/templates/blog-user-followers-list.php b/templates/blog-user-followers-list.php index 42d1b8b..9f3b0e5 100644 --- a/templates/blog-user-followers-list.php +++ b/templates/blog-user-followers-list.php @@ -21,6 +21,7 @@ $followers_template = _n( 'Your blog profile currently has %s follower.', 'Your prepare_items(); + $table->search_box( 'Search', 'search' ); $table->display(); ?> diff --git a/templates/user-followers-list.php b/templates/user-followers-list.php index ec19be9..459097e 100644 --- a/templates/user-followers-list.php +++ b/templates/user-followers-list.php @@ -14,6 +14,7 @@ $followers_template = _n( 'Your author profile currently has %s follower.', 'You prepare_items(); + $table->search_box( 'Search', 'search' ); $table->display(); ?>