updated plugin ActivityPub version 2.3.0

wp-content/plugins/activitypub/includes/class-admin.php

@@ -24,7 +24,15 @@ class Admin {
 		\add_action( 'personal_options_update', array( self::class, 'save_user_description' ) );
 		\add_action( 'admin_enqueue_scripts', array( self::class, 'enqueue_scripts' ) );
 		\add_action( 'admin_notices', array( self::class, 'admin_notices' ) );
+
 		\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_filter( 'manage_comments_custom_column', array( static::class, 'manage_comments_custom_column' ), 9, 2 );
+
+		\add_filter( 'manage_users_columns', array( self::class, 'manage_users_columns' ), 10, 1 );
+		\add_filter( 'manage_users_custom_column', array( self::class, 'manage_users_custom_column' ), 10, 3 );
+		\add_filter( 'bulk_actions-users', array( self::class, 'user_bulk_options' ) );
+		\add_filter( 'handle_bulk_actions-users', array( self::class, 'handle_bulk_request' ), 10, 3 );
 
 		if ( ! is_user_disabled( get_current_user_id() ) ) {
 			\add_action( 'show_user_profile', array( self::class, 'add_profile' ) );
@@ -61,7 +69,7 @@ class Admin {
 	public static function admin_notices() {
 		$permalink_structure = \get_option( 'permalink_structure' );
 		if ( empty( $permalink_structure ) ) {
-			$admin_notice = \__( 'You are using the ActivityPub plugin without setting a permalink structure. This will prevent ActivityPub from working.  Please set a permalink structure.', 'activitypub' );
+			$admin_notice = \__( 'You are using the ActivityPub plugin with a permalink structure of "plain". This will prevent ActivityPub from working.  Please go to "Settings" / "Permalinks" and choose a permalink structure other than "plain".', 'activitypub' );
 			self::show_admin_notice( $admin_notice, 'error' );
 		}
 	}
@@ -175,7 +183,6 @@ class Admin {
 					'schema' => array(
 						'enum' => array(
 							'note',
-							'article',
 							'wordpress-post-format',
 						),
 					),
@@ -346,4 +353,120 @@ class Admin {
 
 		return $actions;
 	}
+
+	/**
+	 * Add a column "activitypub"
+	 *
+	 * This column shows if the user has the capability to use ActivityPub.
+	 *
+	 * @param array $columns The columns.
+	 *
+	 * @return array The columns extended by the activitypub.
+	 */
+	public static function manage_users_columns( $columns ) {
+		$columns['activitypub'] = __( 'ActivityPub', 'activitypub' );
+		return $columns;
+	}
+
+	/**
+	 * Add "comment-type" and "protocol" as column in WP-Admin
+	 *
+	 * @param array $columns the list of column names
+	 */
+	public static function manage_comment_columns( $columns ) {
+		$columns['comment_type'] = esc_attr__( 'Comment-Type', 'activitypub' );
+		$columns['comment_protocol'] = esc_attr__( 'Protocol', 'activitypub' );
+
+		return $columns;
+	}
+
+	/**
+	 * Add "comment-type" and "protocol" as column in WP-Admin
+	 *
+	 * @param array $column     The column to implement
+	 * @param int   $comment_id The comment id
+	 */
+	public static function manage_comments_custom_column( $column, $comment_id ) {
+		if ( 'comment_type' === $column && ! defined( 'WEBMENTION_PLUGIN_DIR' ) ) {
+			echo esc_attr( ucfirst( get_comment_type( $comment_id ) ) );
+		} elseif ( 'comment_protocol' === $column ) {
+			$protocol = get_comment_meta( $comment_id, 'protocol', true );
+
+			if ( $protocol ) {
+				echo esc_attr( ucfirst( str_replace( 'activitypub', 'ActivityPub', $protocol ) ) );
+			} else {
+				esc_attr_e( 'Local', 'activitypub' );
+			}
+		}
+	}
+
+	/**
+	 * Return the results for the activitypub column.
+	 *
+	 * @param string $output      Custom column output. Default empty.
+	 * @param string $column_name Column name.
+	 * @param int    $user_id     ID of the currently-listed user.
+	 *
+	 * @return string The column contents.
+	 */
+	public static function manage_users_custom_column( $output, $column_name, $user_id ) {
+		if ( 'activitypub' !== $column_name ) {
+			return $output;
+		}
+
+		if ( \user_can( $user_id, 'activitypub' ) ) {
+			return '✓';
+		} else {
+			return '✗';
+		}
+	}
+
+	/**
+	 * Add options to the Bulk dropdown on the users page
+	 *
+	 * @param array $actions The existing bulk options.
+	 *
+	 * @return array The extended bulk options.
+	 */
+	public static function user_bulk_options( $actions ) {
+		$actions['add_activitypub_cap'] = __( 'Enable for ActivityPub', 'activitypub' );
+		$actions['remove_activitypub_cap'] = __( 'Disable for ActivityPub', 'activitypub' );
+
+		return $actions;
+	}
+
+	/**
+	 * Handle bulk activitypub requests
+	 *
+	 * * `add_activitypub_cap` - Add the activitypub capability to the selected users.
+	 * * `remove_activitypub_cap` - Remove the activitypub capability from the selected users.
+	 *
+	 * @param string $sendback The URL to send the user back to.
+	 * @param string $action   The requested action.
+	 * @param array  $users    The selected users.
+	 *
+	 * @return string The URL to send the user back to.
+	 */
+	public static function handle_bulk_request( $sendback, $action, $users ) {
+		if (
+			'remove_activitypub_cap' !== $action &&
+			'add_activitypub_cap' !== $action
+		) {
+			return $sendback;
+		}
+
+		foreach ( $users as $user_id ) {
+			$user = new \WP_User( $user_id );
+			if (
+				'add_activitypub_cap' === $action &&
+				user_can( $user_id, 'publish_posts' )
+			) {
+				$user->add_cap( 'activitypub' );
+			} elseif ( 'remove_activitypub_cap' === $action ) {
+				$user->remove_cap( 'activitypub' );
+			}
+		}
+
+		return $sendback;
+	}
 }