| @@ -7,9 +7,9 @@ | ||
| 7 | 7 | |
| 8 | 8 | namespace Activitypub; |
| 9 | 9 | |
| 10 | 10 | use Activitypub\Collection\Actors; |
| 11 | -use Activitypub\Collection\Remote_Posts; | |
| 11 | +use WP_Comment_Query; | |
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * ActivityPub Comment Class. |
| 15 | 15 | * |
| @@ -22,82 +22,25 @@ | ||
| 22 | 22 | */ |
| 23 | 23 | public static function init() { |
| 24 | 24 | self::register_comment_types(); |
| 25 | 25 | |
| 26 | - \add_filter( 'map_meta_cap', array( self::class, 'map_meta_cap' ), 10, 4 ); | |
| 27 | 26 | \add_filter( 'comment_reply_link', array( self::class, 'comment_reply_link' ), 10, 3 ); |
| 28 | 27 | \add_filter( 'comment_class', array( self::class, 'comment_class' ), 10, 3 ); |
| 29 | - \add_filter( 'comment_feed_where', array( static::class, 'comment_feed_where' ) ); | |
| 30 | 28 | \add_filter( 'get_comment_link', array( self::class, 'remote_comment_link' ), 11, 2 ); |
| 29 | + \add_action( 'wp_enqueue_scripts', array( self::class, 'enqueue_scripts' ) ); | |
| 31 | 30 | \add_action( 'pre_get_comments', array( static::class, 'comment_query' ) ); |
| 32 | - \add_filter( 'pre_comment_approved', array( static::class, 'pre_comment_approved' ), 11, 2 ); | |
| 31 | + \add_filter( 'pre_comment_approved', array( static::class, 'pre_comment_approved' ), 10, 2 ); | |
| 33 | 32 | \add_filter( 'get_avatar_comment_types', array( static::class, 'get_avatar_comment_types' ), 99 ); |
| 34 | 33 | \add_action( 'update_option_activitypub_allow_likes', array( self::class, 'maybe_update_comment_counts' ), 10, 2 ); |
| 35 | 34 | \add_action( 'update_option_activitypub_allow_reposts', array( self::class, 'maybe_update_comment_counts' ), 10, 2 ); |
| 36 | - \add_filter( 'pre_wp_update_comment_count_now', array( static::class, 'pre_wp_update_comment_count_now' ), 5, 3 ); | |
| 37 | - \add_filter( 'get_comment_author', array( static::class, 'render_emoji' ), 10, 2 ); | |
| 38 | - \add_filter( 'comment_author', array( static::class, 'unescape_emoji' ), 20 ); // After esc_html(). | |
| 39 | - \add_filter( 'rest_comment_query', array( static::class, 'rest_comment_query' ) ); | |
| 40 | - \add_filter( 'comment_text', array( static::class, 'render_blocks' ), 5 ); // Before other filters. | |
| 35 | + \add_filter( 'pre_wp_update_comment_count_now', array( static::class, 'pre_wp_update_comment_count_now' ), 10, 3 ); | |
| 41 | 36 | } |
| 42 | 37 | |
| 43 | 38 | /** |
| 44 | - * Render blocks in comment content. | |
| 45 | - * | |
| 46 | - * Comments don't automatically parse blocks like posts do. | |
| 47 | - * This filter applies do_blocks() to render activitypub/emoji | |
| 48 | - * and activitypub/image blocks in comment content. | |
| 49 | - * | |
| 50 | - * @param string $content The comment content. | |
| 51 | - * | |
| 52 | - * @return string The content with blocks rendered. | |
| 53 | - */ | |
| 54 | - public static function render_blocks( $content ) { | |
| 55 | - if ( empty( $content ) || ! \str_contains( $content, '<!-- wp:activitypub/' ) ) { | |
| 56 | - return $content; | |
| 57 | - } | |
| 58 | - | |
| 59 | - $blocks = \parse_blocks( $content ); | |
| 60 | - $output = ''; | |
| 61 | - | |
| 62 | - foreach ( $blocks as $block ) { | |
| 63 | - if ( ! empty( $block['blockName'] ) && \str_starts_with( $block['blockName'], 'activitypub/' ) ) { | |
| 64 | - $output .= \render_block( $block ); | |
| 65 | - } else { | |
| 66 | - $output .= \serialize_block( $block ); | |
| 67 | - } | |
| 68 | - } | |
| 69 | - | |
| 70 | - return $output; | |
| 71 | - } | |
| 72 | - | |
| 73 | - /** | |
| 74 | - * Remove edit capabilities for comments received via ActivityPub. | |
| 75 | - * | |
| 76 | - * @param array $caps Array of capabilities. | |
| 77 | - * @param string $cap Capability name. | |
| 78 | - * @param int $user_id User ID. | |
| 79 | - * @param array $args Array of arguments. | |
| 80 | - * | |
| 81 | - * @return array Modified array of capabilities. | |
| 82 | - */ | |
| 83 | - public static function map_meta_cap( $caps, $cap, $user_id, $args ) { | |
| 84 | - if ( 'edit_comment' === $cap && self::was_received( $args[0] ) ) { | |
| 85 | - if ( ! \is_admin() || ( isset( $GLOBALS['current_screen'] ) && 'comment' === $GLOBALS['current_screen']->id ) ) { | |
| 86 | - $caps[] = 'do_not_allow'; | |
| 87 | - } | |
| 88 | - } | |
| 89 | - | |
| 90 | - return $caps; | |
| 91 | - } | |
| 92 | - | |
| 93 | - /** | |
| 94 | 39 | * Filter the comment reply link. |
| 95 | 40 | * |
| 96 | - * Handles three cases for replies to fediverse comments: | |
| 97 | - * 1. User can federate → show normal reply link | |
| 98 | - * 2. User is logged in but can't federate → show warning (no reply link) | |
| 99 | - * 3. User is not logged in → show remote reply block | |
| 41 | + * We don't want to show the comment reply link for federated comments | |
| 42 | + * if the user is disabled for federation. | |
| 100 | 43 | * |
| 101 | 44 | * @param string $link The HTML markup for the comment reply link. |
| 102 | 45 | * @param array $args An array of arguments overriding the defaults. |
| 103 | 46 | * @param \WP_Comment $comment The object of the comment being replied. |
| @@ -105,65 +48,58 @@ | ||
| 105 | 48 | * @return string The filtered HTML markup for the comment reply link. |
| 106 | 49 | */ |
| 107 | 50 | public static function comment_reply_link( $link, $args, $comment ) { |
| 108 | 51 | if ( self::are_comments_allowed( $comment ) ) { |
| 109 | - return $link; | |
| 110 | - } | |
| 111 | - | |
| 112 | - // Logged-in user without ActivityPub capability - show warning instead of reply link. | |
| 113 | - if ( \is_user_logged_in() ) { | |
| 114 | - $author = \esc_html( $comment->comment_author ); | |
| 115 | - | |
| 116 | - $message = \sprintf( | |
| 117 | - /* translators: %s: comment author name */ | |
| 118 | - \__( '%s is on the Fediverse. To reply to them, ask your administrator to enable ActivityPub for your account.', 'activitypub' ), | |
| 119 | - $author | |
| 120 | - ); | |
| 121 | - | |
| 122 | - // Add link to users page if current user can edit users. | |
| 123 | - if ( \current_user_can( 'edit_users' ) ) { | |
| 124 | - $message = \sprintf( | |
| 125 | - /* translators: 1: comment author name, 2: URL to the users management page */ | |
| 126 | - \__( '%1$s is on the Fediverse. To reply to them, <a href="%2$s">enable ActivityPub for your account</a>.', 'activitypub' ), | |
| 127 | - $author, | |
| 128 | - \esc_url( \admin_url( 'users.php' ) ) | |
| 129 | - ); | |
| 52 | + if ( \current_user_can( 'activitypub' ) && self::was_received( $comment ) ) { | |
| 53 | + return self::create_fediverse_reply_link( $link, $args ); | |
| 130 | 54 | } |
| 131 | 55 | |
| 132 | - $warning = \sprintf( | |
| 133 | - '<p class="activitypub-reply-warning"><em>%s</em></p>', | |
| 134 | - \wp_kses( $message, array( 'a' => array( 'href' => array() ) ) ) | |
| 135 | - ); | |
| 136 | - | |
| 137 | - /** | |
| 138 | - * Filters the warning message shown to logged-in users without ActivityPub capability. | |
| 139 | - * | |
| 140 | - * @param string $warning The warning HTML markup. | |
| 141 | - * @param \WP_Comment $comment The comment being replied to. | |
| 142 | - */ | |
| 143 | - return \apply_filters( 'activitypub_federation_warning', $warning, $comment ); | |
| 56 | + return $link; | |
| 144 | 57 | } |
| 145 | 58 | |
| 146 | - if ( ! \WP_Block_Type_Registry::get_instance()->is_registered( 'activitypub/remote-reply' ) ) { | |
| 147 | - \register_block_type_from_metadata( ACTIVITYPUB_PLUGIN_DIR . 'build/remote-reply' ); | |
| 148 | - } | |
| 149 | - | |
| 150 | - $attributes = array( | |
| 59 | + $attrs = array( | |
| 151 | 60 | 'selectedComment' => self::generate_id( $comment ), |
| 152 | 61 | 'commentId' => $comment->comment_ID, |
| 153 | 62 | ); |
| 154 | 63 | |
| 155 | - $block = \do_blocks( \sprintf( '<!-- wp:activitypub/remote-reply %s /-->', \wp_json_encode( $attributes ) ) ); | |
| 64 | + $div = sprintf( | |
| 65 | + '<div class="reply activitypub-remote-reply" data-attrs="%s"></div>', | |
| 66 | + esc_attr( wp_json_encode( $attrs ) ) | |
| 67 | + ); | |
| 156 | 68 | |
| 157 | 69 | /** |
| 158 | 70 | * Filters the HTML markup for the ActivityPub remote comment reply container. |
| 159 | 71 | * |
| 160 | - * @param string $block The HTML markup for the remote reply container. | |
| 72 | + * @param string $div The HTML markup for the remote reply container. Default is a div | |
| 73 | + * with class 'activitypub-remote-reply' and data attributes for | |
| 74 | + * the selected comment ID and internal comment ID. | |
| 161 | 75 | */ |
| 162 | - return \apply_filters( 'activitypub_comment_reply_link', $block ); | |
| 76 | + return apply_filters( 'activitypub_comment_reply_link', $div ); | |
| 163 | 77 | } |
| 164 | 78 | |
| 165 | 79 | /** |
| 80 | + * Create a link to reply to a federated comment. | |
| 81 | + * | |
| 82 | + * This function adds a title attribute to the reply link to inform the user | |
| 83 | + * that the comment was received from the fediverse and the reply will be sent | |
| 84 | + * to the original author. | |
| 85 | + * | |
| 86 | + * @param string $link The HTML markup for the comment reply link. | |
| 87 | + * @param array $args The args provided by the `comment_reply_link` filter. | |
| 88 | + * | |
| 89 | + * @return string The modified HTML markup for the comment reply link. | |
| 90 | + */ | |
| 91 | + private static function create_fediverse_reply_link( $link, $args ) { | |
| 92 | + $str_to_replace = sprintf( '>%s<', $args['reply_text'] ); | |
| 93 | + $replace_with = sprintf( | |
| 94 | + ' title="%s">%s<', | |
| 95 | + esc_attr__( 'This comment was received from the fediverse and your reply will be sent to the original author', 'activitypub' ), | |
| 96 | + esc_html__( 'Reply with federation', 'activitypub' ) | |
| 97 | + ); | |
| 98 | + return str_replace( $str_to_replace, $replace_with, $link ); | |
| 99 | + } | |
| 100 | + | |
| 101 | + /** | |
| 166 | 102 | * Check if it is allowed to comment to a comment. |
| 167 | 103 | * |
| 168 | 104 | * Checks if the comment is local only or if the user can comment federated comments. |
| 169 | 105 | * |
| @@ -177,20 +113,19 @@ | ||
| 177 | 113 | if ( ! self::was_received( $comment ) ) { |
| 178 | 114 | return true; |
| 179 | 115 | } |
| 180 | 116 | |
| 181 | - $current_user = \get_current_user_id(); | |
| 117 | + $current_user = get_current_user_id(); | |
| 182 | 118 | |
| 183 | 119 | if ( ! $current_user ) { |
| 184 | 120 | return false; |
| 185 | 121 | } |
| 186 | 122 | |
| 187 | - if ( is_single_user() && \user_can( $current_user, 'activitypub' ) ) { | |
| 188 | - // On a single user site, comments by users with the `activitypub` capability will be federated as the blog user. | |
| 123 | + if ( is_single_user() && \user_can( $current_user, 'publish_posts' ) ) { | |
| 124 | + // On a single user site, comments by users with the `publish_posts` capability will be federated as the blog user. | |
| 189 | 125 | $current_user = Actors::BLOG_USER_ID; |
| 190 | 126 | } |
| 191 | 127 | |
| 192 | - // User is not allowed to federate comments. | |
| 193 | 128 | return user_can_activitypub( $current_user ); |
| 194 | 129 | } |
| 195 | 130 | |
| 196 | 131 | /** |
| @@ -289,9 +224,9 @@ | ||
| 289 | 224 | return false; |
| 290 | 225 | } |
| 291 | 226 | |
| 292 | 227 | if ( is_single_user() && \user_can( $user_id, 'activitypub' ) ) { |
| 293 | - // On a single user site, comments by users with the `activitypub` capability will be federated as the blog user. | |
| 228 | + // On a single user site, comments by users with the `publish_posts` capability will be federated as the blog user. | |
| 294 | 229 | $user_id = Actors::BLOG_USER_ID; |
| 295 | 230 | } |
| 296 | 231 | |
| 297 | 232 | // User is not allowed to federate comments. |
| @@ -298,19 +233,8 @@ | ||
| 298 | 233 | if ( ! user_can_activitypub( $user_id ) ) { |
| 299 | 234 | return false; |
| 300 | 235 | } |
| 301 | 236 | |
| 302 | - /* | |
| 303 | - * Do not federate brand-new comments on a post that is not federated itself | |
| 304 | - * (e.g. a private post, a post switched to local visibility, or a non-ActivityPub | |
| 305 | - * post type). This prevents leaking replies on content the post type's read rules | |
| 306 | - * would otherwise protect. Comments that were already sent are allowed through so | |
| 307 | - * their Update and Delete activities can still federate (and tear down remote copies). | |
| 308 | - */ | |
| 309 | - if ( ! self::was_sent( $comment ) && ! is_post_federated( $comment->comment_post_ID ) ) { | |
| 310 | - return false; | |
| 311 | - } | |
| 312 | - | |
| 313 | 237 | // It is a comment to the post and can be federated. |
| 314 | 238 | if ( empty( $comment->comment_parent ) ) { |
| 315 | 239 | return true; |
| 316 | 240 | } |
| @@ -323,33 +247,22 @@ | ||
| 323 | 247 | |
| 324 | 248 | /** |
| 325 | 249 | * Examine a comment ID and look up an existing comment it represents. |
| 326 | 250 | * |
| 327 | - * @since 9.1.0 Added the `$args` parameter. | |
| 251 | + * @param string $id ActivityPub object ID (usually a URL) to check. | |
| 328 | 252 | * |
| 329 | - * @param string $id ActivityPub object ID (usually a URL) to check. | |
| 330 | - * @param array $args Optional. Additional WP_Comment_Query arguments. Pass `array( 'status' => 'any' )` | |
| 331 | - * to also match comments in spam or trash, which the default status excludes. | |
| 332 | - * | |
| 333 | 253 | * @return \WP_Comment|false Comment object, or false on failure. |
| 334 | 254 | */ |
| 335 | - public static function object_id_to_comment( $id, $args = array() ) { | |
| 336 | - $args = \wp_parse_args( | |
| 337 | - $args, | |
| 255 | + public static function object_id_to_comment( $id ) { | |
| 256 | + $comment_query = new WP_Comment_Query( | |
| 338 | 257 | array( |
| 339 | - 'number' => 1, | |
| 340 | - 'orderby' => 'comment_date', | |
| 341 | - 'order' => 'DESC', | |
| 258 | + 'meta_key' => 'source_id', // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key | |
| 259 | + 'meta_value' => $id, // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_value | |
| 260 | + 'orderby' => 'comment_date', | |
| 261 | + 'order' => 'DESC', | |
| 342 | 262 | ) |
| 343 | 263 | ); |
| 344 | 264 | |
| 345 | - // Force the lookup key and full comment objects, so callers cannot break the return contract. | |
| 346 | - $args['fields'] = 'all'; | |
| 347 | - $args['meta_key'] = 'source_id'; // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key | |
| 348 | - $args['meta_value'] = $id; // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_value | |
| 349 | - | |
| 350 | - $comment_query = new \WP_Comment_Query( $args ); | |
| 351 | - | |
| 352 | 265 | if ( ! $comment_query->comments ) { |
| 353 | 266 | return false; |
| 354 | 267 | } |
| 355 | 268 | |
| @@ -364,18 +277,18 @@ | ||
| 364 | 277 | * |
| 365 | 278 | * @return string|null Comment ID or null if not found. |
| 366 | 279 | */ |
| 367 | 280 | public static function url_to_commentid( $url ) { |
| 368 | - if ( ! $url || ! \filter_var( $url, \FILTER_VALIDATE_URL ) ) { | |
| 281 | + if ( ! $url || ! filter_var( $url, \FILTER_VALIDATE_URL ) ) { | |
| 369 | 282 | return null; |
| 370 | 283 | } |
| 371 | 284 | |
| 372 | 285 | // Check for local comment. |
| 373 | - if ( is_same_domain( $url ) ) { | |
| 286 | + if ( \wp_parse_url( \home_url(), \PHP_URL_HOST ) === \wp_parse_url( $url, \PHP_URL_HOST ) ) { | |
| 374 | 287 | $query = \wp_parse_url( $url, \PHP_URL_QUERY ); |
| 375 | 288 | |
| 376 | 289 | if ( $query ) { |
| 377 | - \parse_str( $query, $params ); | |
| 290 | + parse_str( $query, $params ); | |
| 378 | 291 | |
| 379 | 292 | if ( ! empty( $params['c'] ) ) { |
| 380 | 293 | $comment = \get_comment( $params['c'] ); |
| 381 | 294 | |
| @@ -400,12 +313,12 @@ | ||
| 400 | 313 | ), |
| 401 | 314 | ), |
| 402 | 315 | ); |
| 403 | 316 | |
| 404 | - $query = new \WP_Comment_Query(); | |
| 317 | + $query = new WP_Comment_Query(); | |
| 405 | 318 | $comments = $query->query( $args ); |
| 406 | 319 | |
| 407 | - if ( $comments && \is_array( $comments ) ) { | |
| 320 | + if ( $comments && is_array( $comments ) ) { | |
| 408 | 321 | return $comments[0]->comment_ID; |
| 409 | 322 | } |
| 410 | 323 | |
| 411 | 324 | return null; |
| @@ -421,9 +334,9 @@ | ||
| 421 | 334 | * @return string[] An array of classes. |
| 422 | 335 | */ |
| 423 | 336 | public static function comment_class( $classes, $css_class, $comment_id ) { |
| 424 | 337 | // Check if ActivityPub comment. |
| 425 | - if ( 'activitypub' === \get_comment_meta( $comment_id, 'protocol', true ) ) { | |
| 338 | + if ( 'activitypub' === get_comment_meta( $comment_id, 'protocol', true ) ) { | |
| 426 | 339 | $classes[] = 'activitypub-comment'; |
| 427 | 340 | } |
| 428 | 341 | |
| 429 | 342 | return $classes; |
| @@ -429,40 +342,8 @@ | ||
| 429 | 342 | return $classes; |
| 430 | 343 | } |
| 431 | 344 | |
| 432 | 345 | /** |
| 433 | - * Makes the comment feed filterable by comment type. | |
| 434 | - * | |
| 435 | - * Also excludes ActivityPub comment types from the feed when no type is specified. | |
| 436 | - * | |
| 437 | - * @param string $where The `WHERE` clause for the comment feed query. | |
| 438 | - * | |
| 439 | - * @return string The modified `WHERE` clause. | |
| 440 | - */ | |
| 441 | - public static function comment_feed_where( $where ) { | |
| 442 | - global $wpdb; | |
| 443 | - | |
| 444 | - $comment_type = \get_query_var( 'type' ); | |
| 445 | - | |
| 446 | - if ( 'all' === $comment_type ) { | |
| 447 | - return $where; | |
| 448 | - } | |
| 449 | - | |
| 450 | - $comment_types = self::get_comment_type_slugs(); | |
| 451 | - | |
| 452 | - if ( \in_array( $comment_type, $comment_types, true ) ) { | |
| 453 | - $where .= $wpdb->prepare( ' AND comment_type = %s', $comment_type ); | |
| 454 | - } else { | |
| 455 | - $comment_types = \array_map( 'esc_sql', $comment_types ); | |
| 456 | - $placeholders = \implode( ', ', \array_fill( 0, \count( $comment_types ), '%s' ) ); | |
| 457 | - // phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.ReplacementsWrongNumber, WordPress.DB.PreparedSQL.NotPrepared | |
| 458 | - $where .= $wpdb->prepare( \sprintf( ' AND comment_type NOT IN (%s)', $placeholders ), ...$comment_types ); | |
| 459 | - } | |
| 460 | - | |
| 461 | - return $where; | |
| 462 | - } | |
| 463 | - | |
| 464 | - /** | |
| 465 | 346 | * Gets the public comment id via the WordPress comments meta. |
| 466 | 347 | * |
| 467 | 348 | * @param int $wp_comment_id The internal WordPress comment ID. |
| 468 | 349 | * @param bool $fallback Whether the code should fall back to `source_url` if `source_id` is not set. |
| @@ -509,18 +390,15 @@ | ||
| 509 | 390 | * |
| 510 | 391 | * @return string $url |
| 511 | 392 | */ |
| 512 | 393 | public static function remote_comment_link( $comment_link, $comment ) { |
| 513 | - if ( ! $comment || \is_admin() || \is_search() ) { | |
| 394 | + if ( ! $comment || is_admin() ) { | |
| 514 | 395 | return $comment_link; |
| 515 | 396 | } |
| 516 | 397 | |
| 517 | - $remote_comment_link = null; | |
| 518 | - if ( 'comment' === $comment->comment_type ) { | |
| 519 | - $remote_comment_link = self::get_source_url( $comment->comment_ID ); | |
| 520 | - } | |
| 398 | + $public_comment_link = self::get_source_url( $comment->comment_ID ); | |
| 521 | 399 | |
| 522 | - return $remote_comment_link ?? $comment_link; | |
| 400 | + return $public_comment_link ?? $comment_link; | |
| 523 | 401 | } |
| 524 | 402 | |
| 525 | 403 | |
| 526 | 404 | /** |
| @@ -540,9 +418,9 @@ | ||
| 540 | 418 | return $public_comment_link; |
| 541 | 419 | } |
| 542 | 420 | |
| 543 | 421 | // Generate URI based on comment ID. |
| 544 | - return \add_query_arg( 'c', $comment->comment_ID, \home_url( '/' ) ); | |
| 422 | + return \add_query_arg( 'c', $comment->comment_ID, \trailingslashit( \home_url() ) ); | |
| 545 | 423 | } |
| 546 | 424 | |
| 547 | 425 | /** |
| 548 | 426 | * Check if a post has remote comments |
| @@ -574,8 +452,61 @@ | ||
| 574 | 452 | return ! empty( $comments ); |
| 575 | 453 | } |
| 576 | 454 | |
| 577 | 455 | /** |
| 456 | + * Enqueue scripts for remote comments | |
| 457 | + */ | |
| 458 | + public static function enqueue_scripts() { | |
| 459 | + if ( ! \is_singular() || \is_user_logged_in() ) { | |
| 460 | + // Only on single pages, only for logged-out users. | |
| 461 | + return; | |
| 462 | + } | |
| 463 | + | |
| 464 | + if ( ! \post_type_supports( \get_post_type(), 'activitypub' ) ) { | |
| 465 | + // Post type does not support ActivityPub. | |
| 466 | + return; | |
| 467 | + } | |
| 468 | + | |
| 469 | + if ( ! \comments_open() || ! \get_comments_number() ) { | |
| 470 | + // No comments, no need to load the script. | |
| 471 | + return; | |
| 472 | + } | |
| 473 | + | |
| 474 | + if ( ! self::post_has_remote_comments( \get_the_ID() ) ) { | |
| 475 | + // No remote comments, no need to load the script. | |
| 476 | + return; | |
| 477 | + } | |
| 478 | + | |
| 479 | + $handle = 'activitypub-remote-reply'; | |
| 480 | + $data = array( | |
| 481 | + 'namespace' => ACTIVITYPUB_REST_NAMESPACE, | |
| 482 | + 'defaultAvatarUrl' => ACTIVITYPUB_PLUGIN_URL . 'assets/img/mp.jpg', | |
| 483 | + ); | |
| 484 | + $js = sprintf( 'var _activityPubOptions = %s;', wp_json_encode( $data ) ); | |
| 485 | + $asset_file = ACTIVITYPUB_PLUGIN_DIR . 'build/remote-reply/index.asset.php'; | |
| 486 | + | |
| 487 | + if ( \file_exists( $asset_file ) ) { | |
| 488 | + $assets = require_once $asset_file; | |
| 489 | + | |
| 490 | + \wp_enqueue_script( | |
| 491 | + $handle, | |
| 492 | + \plugins_url( 'build/remote-reply/index.js', __DIR__ ), | |
| 493 | + $assets['dependencies'], | |
| 494 | + $assets['version'], | |
| 495 | + true | |
| 496 | + ); | |
| 497 | + \wp_add_inline_script( $handle, $js, 'before' ); | |
| 498 | + | |
| 499 | + \wp_enqueue_style( | |
| 500 | + $handle, | |
| 501 | + \plugins_url( 'build/remote-reply/style-index.css', __DIR__ ), | |
| 502 | + array( 'wp-components' ), | |
| 503 | + $assets['version'] | |
| 504 | + ); | |
| 505 | + } | |
| 506 | + } | |
| 507 | + | |
| 508 | + /** | |
| 578 | 509 | * Get the comment type by activity type. |
| 579 | 510 | * |
| 580 | 511 | * @param string $activity_type The activity type. |
| 581 | 512 | * |
| @@ -586,9 +517,9 @@ | ||
| 586 | 517 | $activity_type = \sanitize_key( $activity_type ); |
| 587 | 518 | $comment_types = self::get_comment_types(); |
| 588 | 519 | |
| 589 | 520 | foreach ( $comment_types as $comment_type ) { |
| 590 | - if ( \in_array( $activity_type, $comment_type['activity_types'], true ) ) { | |
| 521 | + if ( in_array( $activity_type, $comment_type['activity_types'], true ) ) { | |
| 591 | 522 | return $comment_type; |
| 592 | 523 | } |
| 593 | 524 | } |
| 594 | 525 | |
| @@ -602,9 +533,9 @@ | ||
| 602 | 533 | */ |
| 603 | 534 | public static function get_comment_types() { |
| 604 | 535 | global $activitypub_comment_types; |
| 605 | 536 | |
| 606 | - return (array) $activitypub_comment_types; | |
| 537 | + return $activitypub_comment_types; | |
| 607 | 538 | } |
| 608 | 539 | |
| 609 | 540 | /** |
| 610 | 541 | * Is this a registered comment type. |
| @@ -627,15 +558,22 @@ | ||
| 627 | 558 | * |
| 628 | 559 | * @return array The registered custom comment type slugs. |
| 629 | 560 | */ |
| 630 | 561 | public static function get_comment_type_slugs() { |
| 631 | - if ( ! \did_action( 'init' ) ) { | |
| 632 | - \_doing_it_wrong( __METHOD__, 'This function should not be called before the init action has run. Comment types are only available after init.', '7.5.0' ); | |
| 562 | + return array_keys( self::get_comment_types() ); | |
| 563 | + } | |
| 633 | 564 | |
| 634 | - return array(); | |
| 635 | - } | |
| 565 | + /** | |
| 566 | + * Return the registered custom comment type slugs. | |
| 567 | + * | |
| 568 | + * @deprecated 4.5.0 Use get_comment_type_slugs instead. | |
| 569 | + * | |
| 570 | + * @return array The registered custom comment type slugs. | |
| 571 | + */ | |
| 572 | + public static function get_comment_type_names() { | |
| 573 | + _deprecated_function( __METHOD__, '4.5.0', 'get_comment_type_slugs' ); | |
| 636 | 574 | |
| 637 | - return \array_keys( self::get_comment_types() ); | |
| 575 | + return self::get_comment_type_slugs(); | |
| 638 | 576 | } |
| 639 | 577 | |
| 640 | 578 | /** |
| 641 | 579 | * Get the custom comment type. |
| @@ -649,16 +587,16 @@ | ||
| 649 | 587 | * |
| 650 | 588 | * @return array The comment type. |
| 651 | 589 | */ |
| 652 | 590 | public static function get_comment_type( $type ) { |
| 653 | - $type = \strtolower( $type ); | |
| 654 | - $type = \sanitize_key( $type ); | |
| 591 | + $type = strtolower( $type ); | |
| 592 | + $type = sanitize_key( $type ); | |
| 655 | 593 | |
| 656 | 594 | $comment_types = self::get_comment_types(); |
| 657 | 595 | $type_array = array(); |
| 658 | 596 | |
| 659 | 597 | // Check array keys. |
| 660 | - if ( \in_array( $type, \array_keys( $comment_types ), true ) ) { | |
| 598 | + if ( in_array( $type, array_keys( $comment_types ), true ) ) { | |
| 661 | 599 | $type_array = $comment_types[ $type ]; |
| 662 | 600 | } |
| 663 | 601 | |
| 664 | 602 | /** |
| @@ -665,9 +603,9 @@ | ||
| 665 | 603 | * Filter the comment type. |
| 666 | 604 | * |
| 667 | 605 | * @param array $type_array The comment type. |
| 668 | 606 | */ |
| 669 | - return \apply_filters( "activitypub_comment_type_{$type}", $type_array ); | |
| 607 | + return apply_filters( "activitypub_comment_type_{$type}", $type_array ); | |
| 670 | 608 | } |
| 671 | 609 | |
| 672 | 610 | /** |
| 673 | 611 | * Get a comment type attribute. |
| @@ -691,9 +629,9 @@ | ||
| 691 | 629 | * |
| 692 | 630 | * @param mixed $value The value of the attribute. |
| 693 | 631 | * @param string $type The comment type. |
| 694 | 632 | */ |
| 695 | - return \apply_filters( "activitypub_comment_type_{$attr}", $value, $type ); | |
| 633 | + return apply_filters( "activitypub_comment_type_{$attr}", $value, $type ); | |
| 696 | 634 | } |
| 697 | 635 | |
| 698 | 636 | /** |
| 699 | 637 | * Register the comment types used by the ActivityPub plugin. |
| @@ -701,21 +639,21 @@ | ||
| 701 | 639 | public static function register_comment_types() { |
| 702 | 640 | register_comment_type( |
| 703 | 641 | 'repost', |
| 704 | 642 | array( |
| 705 | - 'label' => \__( 'Reposts', 'activitypub' ), | |
| 706 | - 'singular' => \__( 'Repost', 'activitypub' ), | |
| 707 | - 'description' => 'A repost (or Announce) is when a post appears in the timeline because someone else shared it, while still showing the original author as the source.', | |
| 643 | + 'label' => __( 'Reposts', 'activitypub' ), | |
| 644 | + 'singular' => __( 'Repost', 'activitypub' ), | |
| 645 | + 'description' => __( 'A repost on the indieweb is a post that is purely a 100% re-publication of another (typically someone else\'s) post.', 'activitypub' ), | |
| 708 | 646 | 'icon' => '♻️', |
| 709 | 647 | 'class' => 'p-repost', |
| 710 | 648 | 'type' => 'repost', |
| 711 | 649 | 'collection' => 'reposts', |
| 712 | 650 | 'activity_types' => array( 'announce' ), |
| 713 | - 'excerpt' => \html_entity_decode( \__( '… reposted this!', 'activitypub' ) ), | |
| 651 | + 'excerpt' => html_entity_decode( \__( '… reposted this!', 'activitypub' ) ), | |
| 714 | 652 | /* translators: %d: Number of reposts */ |
| 715 | - 'count_single' => \_x( '%d repost', 'number of reposts', 'activitypub' ), | |
| 653 | + 'count_single' => _x( '%d repost', 'number of reposts', 'activitypub' ), | |
| 716 | 654 | /* translators: %d: Number of reposts */ |
| 717 | - 'count_plural' => \_x( '%d reposts', 'number of reposts', 'activitypub' ), | |
| 655 | + 'count_plural' => _x( '%d reposts', 'number of reposts', 'activitypub' ), | |
| 718 | 656 | ) |
| 719 | 657 | ); |
| 720 | 658 | |
| 721 | 659 | register_comment_type( |
| @@ -720,42 +658,23 @@ | ||
| 720 | 658 | |
| 721 | 659 | register_comment_type( |
| 722 | 660 | 'like', |
| 723 | 661 | array( |
| 724 | - 'label' => \__( 'Likes', 'activitypub' ), | |
| 725 | - 'singular' => \__( 'Like', 'activitypub' ), | |
| 726 | - 'description' => 'A like is a small positive reaction that shows appreciation for a post without sharing it further.', | |
| 662 | + 'label' => __( 'Likes', 'activitypub' ), | |
| 663 | + 'singular' => __( 'Like', 'activitypub' ), | |
| 664 | + 'description' => __( 'A like is a popular webaction button and in some cases post type on various silos such as Facebook and Instagram.', 'activitypub' ), | |
| 727 | 665 | 'icon' => '👍', |
| 728 | 666 | 'class' => 'p-like', |
| 729 | 667 | 'type' => 'like', |
| 730 | 668 | 'collection' => 'likes', |
| 731 | 669 | 'activity_types' => array( 'like' ), |
| 732 | - 'excerpt' => \html_entity_decode( \__( '… liked this!', 'activitypub' ) ), | |
| 670 | + 'excerpt' => html_entity_decode( \__( '… liked this!', 'activitypub' ) ), | |
| 733 | 671 | /* translators: %d: Number of likes */ |
| 734 | - 'count_single' => \_x( '%d like', 'number of likes', 'activitypub' ), | |
| 672 | + 'count_single' => _x( '%d like', 'number of likes', 'activitypub' ), | |
| 735 | 673 | /* translators: %d: Number of likes */ |
| 736 | - 'count_plural' => \_x( '%d likes', 'number of likes', 'activitypub' ), | |
| 674 | + 'count_plural' => _x( '%d likes', 'number of likes', 'activitypub' ), | |
| 737 | 675 | ) |
| 738 | 676 | ); |
| 739 | - | |
| 740 | - register_comment_type( | |
| 741 | - 'quote', | |
| 742 | - array( | |
| 743 | - 'label' => \__( 'Quotes', 'activitypub' ), | |
| 744 | - 'singular' => \__( 'Quote', 'activitypub' ), | |
| 745 | - 'description' => 'A quote is when a post is shared along with an added comment, so the original post appears together with the sharer’s own words.', | |
| 746 | - 'icon' => '❞', | |
| 747 | - 'class' => 'p-quote', | |
| 748 | - 'type' => 'quote', | |
| 749 | - 'collection' => 'quotes', | |
| 750 | - 'activity_types' => array( 'quote' ), | |
| 751 | - 'excerpt' => \html_entity_decode( \__( '… quoted this!', 'activitypub' ) ), | |
| 752 | - /* translators: %d: Number of quotes */ | |
| 753 | - 'count_single' => \_x( '%d quote', 'number of quotes', 'activitypub' ), | |
| 754 | - /* translators: %d: Number of quotes */ | |
| 755 | - 'count_plural' => \_x( '%d quotes', 'number of quotes', 'activitypub' ), | |
| 756 | - ) | |
| 757 | - ); | |
| 758 | 677 | } |
| 759 | 678 | |
| 760 | 679 | /** |
| 761 | 680 | * Show avatars on Activities if set. |
| @@ -765,11 +684,11 @@ | ||
| 765 | 684 | * @return array show avatars on Activities |
| 766 | 685 | */ |
| 767 | 686 | public static function get_avatar_comment_types( $types ) { |
| 768 | 687 | $comment_types = self::get_comment_type_slugs(); |
| 769 | - $types = \array_merge( $types, $comment_types ); | |
| 688 | + $types = array_merge( $types, $comment_types ); | |
| 770 | 689 | |
| 771 | - return \array_unique( $types ); | |
| 690 | + return array_unique( $types ); | |
| 772 | 691 | } |
| 773 | 692 | |
| 774 | 693 | /** |
| 775 | 694 | * Excludes likes and reposts from comment queries. |
| @@ -777,131 +696,59 @@ | ||
| 777 | 696 | * @author Jan Boddez |
| 778 | 697 | * |
| 779 | 698 | * @see https://github.com/janboddez/indieblocks/blob/a2d59de358031056a649ee47a1332ce9e39d4ce2/includes/functions.php#L423-L432 |
| 780 | 699 | * |
| 781 | - * @param \WP_Comment_Query $query Comment count. | |
| 700 | + * @param WP_Comment_Query $query Comment count. | |
| 782 | 701 | */ |
| 783 | 702 | public static function comment_query( $query ) { |
| 784 | - if ( ! $query instanceof \WP_Comment_Query ) { | |
| 703 | + if ( ! $query instanceof WP_Comment_Query ) { | |
| 785 | 704 | return; |
| 786 | 705 | } |
| 787 | 706 | |
| 788 | 707 | // Do not exclude likes and reposts on ActivityPub requests. |
| 789 | - if ( \defined( 'ACTIVITYPUB_REQUEST' ) && ACTIVITYPUB_REQUEST ) { | |
| 708 | + if ( defined( 'ACTIVITYPUB_REQUEST' ) && ACTIVITYPUB_REQUEST ) { | |
| 790 | 709 | return; |
| 791 | 710 | } |
| 792 | 711 | |
| 793 | - // Do not exclude likes and reposts on REST requests (handled by rest_comment_query). | |
| 712 | + // Do not exclude likes and reposts on REST requests. | |
| 794 | 713 | if ( \wp_is_serving_rest_request() ) { |
| 795 | 714 | return; |
| 796 | 715 | } |
| 797 | 716 | |
| 798 | - // Filter post types for admin requests. | |
| 799 | - if ( \is_admin() ) { | |
| 800 | - $query->query_vars['post_type'] = self::get_allowed_comment_post_types(); | |
| 717 | + // Do not exclude likes and reposts on admin pages or on non-singular pages. | |
| 718 | + if ( is_admin() || ! is_singular() ) { | |
| 801 | 719 | return; |
| 802 | 720 | } |
| 803 | 721 | |
| 804 | - // Do not exclude likes and reposts on non-singular pages. | |
| 805 | - if ( ! \is_singular() ) { | |
| 806 | - return; | |
| 807 | - } | |
| 808 | - | |
| 809 | - // Do not exclude likes and reposts if the query is for specific types. | |
| 722 | + // Do not exclude likes and reposts if the query is for comments. | |
| 810 | 723 | if ( ! empty( $query->query_vars['type__in'] ) || ! empty( $query->query_vars['type'] ) ) { |
| 811 | 724 | return; |
| 812 | 725 | } |
| 813 | 726 | |
| 814 | - // Do not exclude likes and reposts if the query is already excluding other comment types. | |
| 815 | - if ( ! empty( $query->query_vars['type__not_in'] ) ) { | |
| 816 | - return; | |
| 817 | - } | |
| 818 | - | |
| 819 | 727 | // Exclude likes and reposts by the ActivityPub plugin. |
| 820 | 728 | $query->query_vars['type__not_in'] = self::get_comment_type_slugs(); |
| 821 | 729 | } |
| 822 | 730 | |
| 823 | 731 | /** |
| 824 | - * Filters comments in REST API requests. | |
| 825 | - * | |
| 826 | - * Excludes comments on ActivityPub post types and ActivityPub comment | |
| 827 | - * types (likes, reposts) from the REST API. | |
| 828 | - * | |
| 829 | - * @param array $prepared_args Array of arguments for WP_Comment_Query. | |
| 830 | - * | |
| 831 | - * @return array Modified array of arguments. | |
| 832 | - */ | |
| 833 | - public static function rest_comment_query( $prepared_args ) { | |
| 834 | - // Exclude comments on ActivityPub post types. | |
| 835 | - $prepared_args['post_type'] = self::get_allowed_comment_post_types(); | |
| 836 | - | |
| 837 | - // Exclude ActivityPub comment types (likes, reposts) unless explicitly requested. | |
| 838 | - if ( empty( $prepared_args['type'] ) && empty( $prepared_args['type__in'] ) ) { | |
| 839 | - $prepared_args['type__not_in'] = self::get_comment_type_slugs(); | |
| 840 | - } | |
| 841 | - | |
| 842 | - return $prepared_args; | |
| 843 | - } | |
| 844 | - | |
| 845 | - /** | |
| 846 | - * Returns post types that should show comments (excluding hidden post types). | |
| 847 | - * | |
| 848 | - * @return array Array of post type names. | |
| 849 | - */ | |
| 850 | - private static function get_allowed_comment_post_types() { | |
| 851 | - $hide_for = self::hide_for(); | |
| 852 | - | |
| 853 | - if ( empty( $hide_for ) ) { | |
| 854 | - return \get_post_types_by_support( 'comments' ); | |
| 855 | - } | |
| 856 | - | |
| 857 | - return \array_diff( \get_post_types_by_support( 'comments' ), $hide_for ); | |
| 858 | - } | |
| 859 | - | |
| 860 | - /** | |
| 861 | 732 | * Filter the comment status before it is set. |
| 862 | 733 | * |
| 863 | - * @param int|string|\WP_Error $approved The approved comment status. | |
| 864 | - * @param array $comment_data The comment data. | |
| 734 | + * @param string $approved The approved comment status. | |
| 735 | + * @param array $commentdata The comment data. | |
| 865 | 736 | * |
| 866 | - * @return int|string|\WP_Error The approval status. 1, 0, 'spam', 'trash', or WP_Error. | |
| 737 | + * @return boolean `true` if the comment is approved, `false` otherwise. | |
| 867 | 738 | */ |
| 868 | - public static function pre_comment_approved( $approved, $comment_data ) { | |
| 869 | - /* | |
| 870 | - * Only return early for already-approved comments, trash, or errors. | |
| 871 | - * Don't short-circuit on 'spam' - we may want to override Akismet. | |
| 872 | - * Respect 'trash' since it comes from the WordPress disallowed list. | |
| 873 | - */ | |
| 874 | - if ( 1 === $approved || '1' === $approved || 'trash' === $approved || \is_wp_error( $approved ) ) { | |
| 739 | + public static function pre_comment_approved( $approved, $commentdata ) { | |
| 740 | + if ( $approved || \is_wp_error( $approved ) ) { | |
| 875 | 741 | return $approved; |
| 876 | 742 | } |
| 877 | 743 | |
| 878 | - // Maybe auto-approve likes and reposts. | |
| 879 | - if ( | |
| 880 | - \in_array( $comment_data['comment_type'], self::get_comment_type_slugs(), true ) && | |
| 881 | - '1' === \get_option( 'activitypub_auto_approve_reactions' ) | |
| 882 | - ) { | |
| 883 | - return 1; | |
| 884 | - } | |
| 885 | - | |
| 886 | - /* | |
| 887 | - * Always auto-approve comments on remote posts (ap_post) since | |
| 888 | - * they are not visible in the WP admin comment moderation screen. | |
| 889 | - */ | |
| 890 | - $post_id = $comment_data['comment_post_ID']; | |
| 891 | - $post = \get_post( $post_id ); | |
| 892 | - | |
| 893 | - if ( $post && \in_array( $post->post_type, self::hide_for(), true ) ) { | |
| 894 | - return 1; | |
| 895 | - } | |
| 896 | - | |
| 897 | 744 | if ( '1' !== \get_option( 'comment_previously_approved' ) ) { |
| 898 | 745 | return $approved; |
| 899 | 746 | } |
| 900 | 747 | |
| 901 | 748 | if ( |
| 902 | - empty( $comment_data['comment_meta']['protocol'] ) || | |
| 903 | - 'activitypub' !== $comment_data['comment_meta']['protocol'] | |
| 749 | + empty( $commentdata['comment_meta']['protocol'] ) || | |
| 750 | + 'activitypub' !== $commentdata['comment_meta']['protocol'] | |
| 904 | 751 | ) { |
| 905 | 752 | return $approved; |
| 906 | 753 | } |
| 907 | 754 | |
| @@ -906,10 +753,10 @@ | ||
| 906 | 753 | } |
| 907 | 754 | |
| 908 | 755 | global $wpdb; |
| 909 | 756 | |
| 910 | - $author = $comment_data['comment_author']; | |
| 911 | - $author_url = $comment_data['comment_author_url']; | |
| 757 | + $author = $commentdata['comment_author']; | |
| 758 | + $author_url = $commentdata['comment_author_url']; | |
| 912 | 759 | // phpcs:ignore |
| 913 | 760 | $ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE comment_author = %s AND comment_author_url = %s and comment_approved = '1' LIMIT 1", $author, $author_url ) ); |
| 914 | 761 | |
| 915 | 762 | if ( 1 === (int) $ok_to_comment ) { |
| @@ -943,38 +790,15 @@ | ||
| 943 | 790 | * @return int|null The updated comment count, or null to use the default query. |
| 944 | 791 | */ |
| 945 | 792 | public static function pre_wp_update_comment_count_now( $new_count, $old_count, $post_id ) { |
| 946 | 793 | if ( null === $new_count ) { |
| 947 | - $excluded_types = \array_filter( self::get_comment_type_slugs(), array( self::class, 'is_comment_type_enabled' ) ); | |
| 794 | + $excluded_types = array_filter( self::get_comment_type_slugs(), array( self::class, 'is_comment_type_enabled' ) ); | |
| 948 | 795 | |
| 949 | 796 | if ( ! empty( $excluded_types ) ) { |
| 950 | - /* | |
| 951 | - * Include 'note' type when Gutenberg's filter is registered, so a | |
| 952 | - * single query excludes both ActivityPub and Gutenberg types. | |
| 953 | - */ | |
| 954 | - if ( \has_filter( 'pre_wp_update_comment_count_now', 'gutenberg_exclude_notes_from_comment_count' ) ) { | |
| 955 | - $excluded_types[] = 'note'; | |
| 956 | - } | |
| 957 | - | |
| 958 | - /** | |
| 959 | - * Filters the comment types excluded from the comment count. | |
| 960 | - * | |
| 961 | - * Runs at priority 5 on `pre_wp_update_comment_count_now` so that | |
| 962 | - * a single query can exclude types from multiple plugins. Other | |
| 963 | - * plugins can hook here to add their own comment types. | |
| 964 | - * | |
| 965 | - * @since 8.0.0 | |
| 966 | - * | |
| 967 | - * @param string[] $excluded_types The comment type slugs to exclude. | |
| 968 | - * @param int $post_id The post ID. | |
| 969 | - */ | |
| 970 | - $excluded_types = \apply_filters( 'activitypub_excluded_comment_types', $excluded_types, $post_id ); | |
| 971 | - $excluded_types = \array_unique( \array_filter( $excluded_types ) ); | |
| 972 | - | |
| 973 | 797 | global $wpdb; |
| 974 | 798 | |
| 975 | 799 | // phpcs:ignore WordPress.DB |
| 976 | - $new_count = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1' AND comment_type NOT IN ('" . \implode( "','", $excluded_types ) . "')", $post_id ) ); | |
| 800 | + $new_count = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1' AND comment_type NOT IN ('" . implode( "','", $excluded_types ) . "')", $post_id ) ); | |
| 977 | 801 | } |
| 978 | 802 | } |
| 979 | 803 | |
| 980 | 804 | return $new_count; |
| @@ -986,75 +810,7 @@ | ||
| 986 | 810 | * @param string $comment_type The comment type. |
| 987 | 811 | * @return bool True if the comment type is enabled. |
| 988 | 812 | */ |
| 989 | 813 | public static function is_comment_type_enabled( $comment_type ) { |
| 990 | - return '1' === \get_option( "activitypub_allow_{$comment_type}s", '1' ); | |
| 991 | - } | |
| 992 | - | |
| 993 | - /** | |
| 994 | - * Get post types to hide comments for in admin. | |
| 995 | - * | |
| 996 | - * These are non-public post types whose comments should not appear | |
| 997 | - * in the main comments list in the WordPress admin. | |
| 998 | - * | |
| 999 | - * @return string[] Array of post type names to hide comments for. | |
| 1000 | - */ | |
| 1001 | - public static function hide_for() { | |
| 1002 | - $post_types = array( Remote_Posts::POST_TYPE ); | |
| 1003 | - | |
| 1004 | - /** | |
| 1005 | - * Filters the list of post types to hide comments for. | |
| 1006 | - * | |
| 1007 | - * @param string[] $post_types Array of post type names to hide comments for. | |
| 1008 | - */ | |
| 1009 | - return \apply_filters( 'activitypub_hide_comments_for', $post_types ); | |
| 1010 | - } | |
| 1011 | - | |
| 1012 | - /** | |
| 1013 | - * Render emoji in comment author name. | |
| 1014 | - * | |
| 1015 | - * Replaces emoji shortcodes with img tags on the get_comment_author filter. | |
| 1016 | - * Emoji data is retrieved from the linked remote actor. | |
| 1017 | - * | |
| 1018 | - * @param string $author The comment author name. | |
| 1019 | - * @param string $comment_id The comment ID as a numeric string. | |
| 1020 | - * | |
| 1021 | - * @return string The comment author name with rendered emoji. | |
| 1022 | - */ | |
| 1023 | - public static function render_emoji( $author, $comment_id ) { | |
| 1024 | - $remote_actor_id = \get_comment_meta( $comment_id, '_activitypub_remote_actor_id', true ); | |
| 1025 | - | |
| 1026 | - if ( empty( $remote_actor_id ) ) { | |
| 1027 | - return $author; | |
| 1028 | - } | |
| 1029 | - | |
| 1030 | - $emoji_data = \get_post_meta( $remote_actor_id, '_activitypub_emoji', true ); | |
| 1031 | - | |
| 1032 | - if ( empty( $emoji_data ) ) { | |
| 1033 | - return $author; | |
| 1034 | - } | |
| 1035 | - | |
| 1036 | - return Emoji::replace_from_json( $author, $emoji_data ); | |
| 1037 | - } | |
| 1038 | - | |
| 1039 | - /** | |
| 1040 | - * Selectively unescape emoji images in comment author. | |
| 1041 | - * | |
| 1042 | - * This runs at priority 20 after WordPress's esc_html() filter on comment_author. | |
| 1043 | - * | |
| 1044 | - * @param string $author The comment author name (already escaped by WordPress). | |
| 1045 | - * | |
| 1046 | - * @return string The comment author name with emoji images unescaped. | |
| 1047 | - */ | |
| 1048 | - public static function unescape_emoji( $author ) { | |
| 1049 | - // Only attempt to unescape if there are emoji images present in the escaped string. | |
| 1050 | - if ( false === \strpos( $author, 'class="emoji"' ) ) { | |
| 1051 | - return $author; | |
| 1052 | - } | |
| 1053 | - | |
| 1054 | - // Decode entities so we can selectively restore emoji <img> tags. | |
| 1055 | - $decoded = \html_entity_decode( $author, ENT_QUOTES | ENT_HTML5, 'UTF-8' ); | |
| 1056 | - | |
| 1057 | - // Use strict KSES validation to only allow valid emoji img tags. | |
| 1058 | - return \wp_kses( $decoded, Emoji::get_kses_allowed_html() ); | |
| 814 | + return '1' === get_option( "activitypub_allow_{$comment_type}s", '1' ); | |
| 1059 | 815 | } |
| 1060 | 816 | } |
