Merge remote-tracking branch 'origin/master' into add/extendable-transformers

also does c35ddf1935

README.md

@@ -3,7 +3,7 @@
 **Tags:** OStatus, fediverse, activitypub, activitystream  
 **Requires at least:** 4.7  
 **Tested up to:** 6.4  
-**Stable tag:** 1.1.0  
+**Stable tag:** 1.2.0  
 **Requires PHP:** 5.6  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
@@ -105,6 +105,15 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
 
 Project maintained on GitHub at [automattic/wordpress-activitypub](https://github.com/automattic/wordpress-activitypub).
 
+### 1.2.0 ###
+
+* Add: Search and order followerer lists
+* Add: Have a filter to defer signature verification
+* Improved: "Follow Me" styles for dark themes
+* Improved: Allow `p` and `br` tags only for AP comments
+* Fixed: Deduplicate attachments earlier to prevent incorrect max_media
+
+
 ### 1.1.0 ###
 
 * Improved: audio and video attachments are now supported!

activitypub.php

@@ -3,7 +3,7 @@
  * Plugin Name: ActivityPub
  * Plugin URI: https://github.com/pfefferle/wordpress-activitypub/
  * Description: The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.
- * Version: 1.1.0
+ * Version: 1.2.0
  * Author: Matthias Pfefferle & Automattic
  * Author URI: https://automattic.com/
  * License: MIT

includes/class-transformer-base.php

@@ -247,7 +247,6 @@ abstract class Transformer_Base {
 			$blocks = \parse_blocks( $this->wp_post->post_content );
 			$media_ids = self::get_media_ids_from_blocks( $blocks, $media_ids, $max_media );
 		}
-		$media_ids = \array_unique( $media_ids );
 
 		return \array_filter( \array_map( array( self::class, 'wp_attachment_to_activity_attachment' ), $media_ids ) );
 	}
@@ -341,6 +340,9 @@ abstract class Transformer_Base {
 					break;
 			}
 
+			// depupe
+			$media_ids = \array_unique( $media_ids );
+
 			// stop doing unneeded work
 			if ( count( $media_ids ) >= $max_media ) {
 				break;

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;

includes/table/class-followers.php

@@ -30,19 +30,24 @@ class Followers extends WP_List_Table {
 
 	public function get_columns() {
 		return array(
-			'cb'           => '<input type="checkbox" />',
-			'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'         => '<input type="checkbox" />',
+			'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,32 @@ 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'] ) && isset( $_REQUEST['_wpnonce'] ) ) {
+			$nonce = sanitize_text_field( wp_unslash( $_REQUEST['_wpnonce'] ) );
+			if ( wp_verify_nonce( $nonce, 'bulk-' . $this->_args['plural'] ) ) {
+				// 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 +98,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;
@@ -116,11 +144,11 @@ class Followers extends WP_List_Table {
 	}
 
 	public function process_action() {
-		if ( ! isset( $_REQUEST['followers'] ) || ! isset( $_REQUEST['_apnonce'] ) ) {
+		if ( ! isset( $_REQUEST['followers'] ) || ! isset( $_REQUEST['_wpnonce'] ) ) {
 			return false;
 		}
-		$nonce = sanitize_text_field( wp_unslash( $_REQUEST['_apnonce'] ) );
-		if ( ! wp_verify_nonce( $nonce, 'activitypub-followers-list' ) ) {
+		$nonce = sanitize_text_field( wp_unslash( $_REQUEST['_wpnonce'] ) );
+		if ( ! wp_verify_nonce( $nonce, 'bulk-' . $this->_args['plural'] ) ) {
 			return false;
 		}
 

readme.txt

@@ -3,7 +3,7 @@ Contributors: automattic, pfefferle, mediaformat, mattwiebe, akirk, jeherve, nur
 Tags: OStatus, fediverse, activitypub, activitystream
 Requires at least: 4.7
 Tested up to: 6.4
-Stable tag: 1.1.0
+Stable tag: 1.2.0
 Requires PHP: 5.6
 License: MIT
 License URI: http://opensource.org/licenses/MIT
@@ -105,6 +105,15 @@ Where 'blog' is the path to the subdirectory at which your blog resides.
 
 Project maintained on GitHub at [automattic/wordpress-activitypub](https://github.com/automattic/wordpress-activitypub).
 
+= 1.2.0 =
+
+* Add: Search and order followerer lists
+* Add: Have a filter to defer signature verification
+* Improved: "Follow Me" styles for dark themes
+* Improved: Allow `p` and `br` tags only for AP comments
+* Fixed: Deduplicate attachments earlier to prevent incorrect max_media
+
+
 = 1.1.0 =
 
 * Improved: audio and video attachments are now supported!

templates/blog-user-followers-list.php

@@ -21,8 +21,8 @@ $followers_template = _n( 'Your blog profile currently has %s follower.', 'Your
 		<input type="hidden" name="tab" value="followers" />
 		<?php
 		$table->prepare_items();
+		$table->search_box( 'Search', 'search' );
 		$table->display();
 		?>
-		<?php wp_nonce_field( 'activitypub-followers-list', '_apnonce' ); ?>
 		</form>
 </div>

templates/user-followers-list.php

@@ -14,8 +14,8 @@ $followers_template = _n( 'Your author profile currently has %s follower.', 'You
 		<input type="hidden" name="page" value="activitypub-followers-list" />
 		<?php
 		$table->prepare_items();
+		$table->search_box( 'Search', 'search' );
 		$table->display();
 		?>
-		<?php wp_nonce_field( 'activitypub-followers-list', '_apnonce' ); ?>
 		</form>
 </div>