updated plugin ActivityPub version 2.0.1

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

@@ -7,6 +7,8 @@ use Activitypub\Collection\Users;
 use Activitypub\Collection\Followers;
 
 use function Activitypub\sanitize_url;
+use function Activitypub\is_comment;
+use function Activitypub\is_activitypub_request;
 
 /**
  * ActivityPub Class
@@ -19,6 +21,7 @@ class Activitypub {
 	 */
 	public static function init() {
 		\add_filter( 'template_include', array( self::class, 'render_json_template' ), 99 );
+		\add_action( 'template_redirect', array( self::class, 'template_redirect' ) );
 		\add_filter( 'query_vars', array( self::class, 'add_query_vars' ) );
 		\add_filter( 'pre_get_avatar_data', array( self::class, 'pre_get_avatar_data' ), 11, 2 );
 		\add_filter( 'get_comment_link', array( self::class, 'remote_comment_link' ), 11, 3 );
@@ -39,6 +42,8 @@ class Activitypub {
 
 		\add_action( 'in_plugin_update_message-' . ACTIVITYPUB_PLUGIN_BASENAME, array( self::class, 'plugin_update_message' ) );
 
+		\add_filter( 'comment_class', array( self::class, 'comment_class' ), 10, 3 );
+
 		// register several post_types
 		self::register_post_types();
 	}
@@ -50,7 +55,6 @@ class Activitypub {
 	 */
 	public static function activate() {
 		self::flush_rewrite_rules();
-
 		Scheduler::register_schedules();
 	}
 
@@ -98,6 +102,8 @@ class Activitypub {
 
 		if ( \is_author() ) {
 			$json_template = ACTIVITYPUB_PLUGIN_DIR . '/templates/author-json.php';
+		} elseif ( is_comment() ) {
+			$json_template = ACTIVITYPUB_PLUGIN_DIR . '/templates/comment-json.php';
 		} elseif ( \is_singular() ) {
 			$json_template = ACTIVITYPUB_PLUGIN_DIR . '/templates/post-json.php';
 		} elseif ( \is_home() ) {
@@ -115,11 +121,44 @@ class Activitypub {
 		return $json_template;
 	}
 
+	/**
+	 * Custom redirects for ActivityPub requests.
+	 *
+	 * @return void
+	 */
+	public static function template_redirect() {
+		$comment_id = get_query_var( 'c', null );
+
+		// check if it seems to be a comment
+		if ( ! $comment_id ) {
+			return;
+		}
+
+		$comment = get_comment( $comment_id );
+
+		// load a 404 page if `c` is set but not valid
+		if ( ! $comment ) {
+			global $wp_query;
+			$wp_query->set_404();
+			return;
+		}
+
+		// stop if it's not an ActivityPub comment
+		if ( is_activitypub_request() && $comment->user_id ) {
+			return;
+		}
+
+		wp_safe_redirect( get_comment_link( $comment ) );
+		exit;
+	}
+
 	/**
 	 * Add the 'activitypub' query variable so WordPress won't mangle it.
 	 */
 	public static function add_query_vars( $vars ) {
 		$vars[] = 'activitypub';
+		$vars[] = 'c';
+		$vars[] = 'p';
 
 		return $vars;
 	}
@@ -195,10 +234,18 @@ class Activitypub {
 	 * @return string $url
 	 */
 	public static function remote_comment_link( $comment_link, $comment ) {
-		$remote_comment_link = get_comment_meta( $comment->comment_ID, 'source_url', true );
-		if ( $remote_comment_link ) {
-			$comment_link = esc_url( $remote_comment_link );
+		if ( ! $comment || is_admin() ) {
+			return $comment_link;
 		}
+
+		$comment_meta = \get_comment_meta( $comment->comment_ID );
+
+		if ( ! empty( $comment_meta['source_url'][0] ) ) {
+			return $comment_meta['source_url'][0];
+		} elseif ( ! empty( $comment_meta['source_id'][0] ) ) {
+			return $comment_meta['source_id'][0];
+		}
+
 		return $comment_link;
 	}
 
@@ -341,7 +388,7 @@ class Activitypub {
 	 * @return void
 	 */
 	private static function register_post_types() {
-		register_post_type(
+		\register_post_type(
 			Followers::POST_TYPE,
 			array(
 				'labels'           => array(
@@ -358,7 +405,7 @@ class Activitypub {
 			)
 		);
 
-		register_post_meta(
+		\register_post_meta(
 			Followers::POST_TYPE,
 			'activitypub_inbox',
 			array(
@@ -368,13 +415,13 @@ class Activitypub {
 			)
 		);
 
-		register_post_meta(
+		\register_post_meta(
 			Followers::POST_TYPE,
 			'activitypub_errors',
 			array(
 				'type'              => 'string',
 				'single'            => false,
-				'sanitize_callback' => function( $value ) {
+				'sanitize_callback' => function ( $value ) {
 					if ( ! is_string( $value ) ) {
 						throw new Exception( 'Error message is no valid string' );
 					}
@@ -384,30 +431,48 @@ class Activitypub {
 			)
 		);
 
-		register_post_meta(
+		\register_post_meta(
 			Followers::POST_TYPE,
 			'activitypub_user_id',
 			array(
 				'type'              => 'string',
 				'single'            => false,
-				'sanitize_callback' => function( $value ) {
+				'sanitize_callback' => function ( $value ) {
 					return esc_sql( $value );
 				},
 			)
 		);
 
-		register_post_meta(
+		\register_post_meta(
 			Followers::POST_TYPE,
 			'activitypub_actor_json',
 			array(
 				'type'              => 'string',
 				'single'            => true,
-				'sanitize_callback' => function( $value ) {
+				'sanitize_callback' => function ( $value ) {
 					return sanitize_text_field( $value );
 				},
 			)
 		);
 
-		do_action( 'activitypub_after_register_post_type' );
+		\do_action( 'activitypub_after_register_post_type' );
+	}
+
+	/**
+	 * Filters the CSS classes to add an ActivityPub class.
+	 *
+	 * @param string[] $classes    An array of comment classes.
+	 * @param string[] $css_class  An array of additional classes added to the list.
+	 * @param string   $comment_id The comment ID as a numeric string.
+	 *
+	 * @return string[] An array of classes.
+	 */
+	public static function comment_class( $classes, $css_class, $comment_id ) {
+		// check if ActivityPub comment
+		if ( 'activitypub' === get_comment_meta( $comment_id, 'protocol', true ) ) {
+			$classes[] = 'activitypub-comment';
+		}
+
+		return $classes;
 	}
 }