kawaiipunk/laipower
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated plugin ActivityPub version 9.1.0

Browse Source
This commit is contained in:
KawaiiPunk
2026-07-28 15:03:10 +00:00
committed by Gitium
parent bf428f0e45
commit ff806e1811
217 changed files with 6098 additions and 3025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
wp-content/plugins/activitypub/includes/class-comment.php
View File

@ -113,7 +113,7 @@ class Comment {
if ( \is_user_logged_in() ) {
$author = \esc_html( $comment->comment_author );
$message = sprintf(
$message = \sprintf(
/* translators: %s: comment author name */
\__( '%s is on the Fediverse. To reply to them, ask your administrator to enable ActivityPub for your account.', 'activitypub' ),
$author
@ -121,7 +121,7 @@ class Comment {
// Add link to users page if current user can edit users.
if ( \current_user_can( 'edit_users' ) ) {
$message = sprintf(
$message = \sprintf(
/* translators: 1: comment author name, 2: URL to the users management page */
\__( '%1$s is on the Fediverse. To reply to them, <a href="%2$s">enable ActivityPub for your account</a>.', 'activitypub' ),
$author,
@ -129,7 +129,7 @@ class Comment {
);
}
$warning = sprintf(
$warning = \sprintf(
'<p class="activitypub-reply-warning"><em>%s</em></p>',
\wp_kses( $message, array( 'a' => array( 'href' => array() ) ) )
);
@ -178,7 +178,7 @@ class Comment {
return true;
}
$current_user = get_current_user_id();
$current_user = \get_current_user_id();
if ( ! $current_user ) {
return false;
@ -299,6 +299,17 @@ class Comment {
return false;
}
/*
* Do not federate brand-new comments on a post that is not federated itself
* (e.g. a private post, a post switched to local visibility, or a non-ActivityPub
* post type). This prevents leaking replies on content the post type's read rules
* would otherwise protect. Comments that were already sent are allowed through so
* their Update and Delete activities can still federate (and tear down remote copies).
*/
if ( ! self::was_sent( $comment ) && ! is_post_federated( $comment->comment_post_ID ) ) {
return false;
}
// It is a comment to the post and can be federated.
if ( empty( $comment->comment_parent ) ) {
return true;
@ -313,20 +324,31 @@ class Comment {
/**
* Examine a comment ID and look up an existing comment it represents.
*
* @param string $id ActivityPub object ID (usually a URL) to check.
* @since 9.1.0 Added the `$args` parameter.
*
* @param string $id ActivityPub object ID (usually a URL) to check.
* @param array $args Optional. Additional WP_Comment_Query arguments. Pass `array( 'status' => 'any' )`
* to also match comments in spam or trash, which the default status excludes.
*
* @return \WP_Comment|false Comment object, or false on failure.
*/
public static function object_id_to_comment( $id ) {
$comment_query = new \WP_Comment_Query(
public static function object_id_to_comment( $id, $args = array() ) {
$args = \wp_parse_args(
$args,
array(
'meta_key' => 'source_id', // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key
'meta_value' => $id, // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_value
'orderby' => 'comment_date',
'order' => 'DESC',
'number' => 1,
'orderby' => 'comment_date',
'order' => 'DESC',
)
);
// Force the lookup key and full comment objects, so callers cannot break the return contract.
$args['fields'] = 'all';
$args['meta_key'] = 'source_id'; // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_key
$args['meta_value'] = $id; // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_value
$comment_query = new \WP_Comment_Query( $args );
if ( ! $comment_query->comments ) {
return false;
}
@ -382,7 +404,7 @@ class Comment {
$query = new \WP_Comment_Query();
$comments = $query->query( $args );
if ( $comments && is_array( $comments ) ) {
if ( $comments && \is_array( $comments ) ) {
return $comments[0]->comment_ID;
}
@ -400,7 +422,7 @@ class Comment {
*/
public static function comment_class( $classes, $css_class, $comment_id ) {
// Check if ActivityPub comment.
if ( 'activitypub' === get_comment_meta( $comment_id, 'protocol', true ) ) {
if ( 'activitypub' === \get_comment_meta( $comment_id, 'protocol', true ) ) {
$classes[] = 'activitypub-comment';
}
@ -431,9 +453,9 @@ class Comment {
$where .= $wpdb->prepare( ' AND comment_type = %s', $comment_type );
} else {
$comment_types = \array_map( 'esc_sql', $comment_types );
$placeholders = implode( ', ', array_fill( 0, count( $comment_types ), '%s' ) );
$placeholders = \implode( ', ', \array_fill( 0, \count( $comment_types ), '%s' ) );
// phpcs:ignore WordPress.DB.PreparedSQLPlaceholders.ReplacementsWrongNumber, WordPress.DB.PreparedSQL.NotPrepared
$where .= $wpdb->prepare( sprintf( ' AND comment_type NOT IN (%s)', $placeholders ), ...$comment_types );
$where .= $wpdb->prepare( \sprintf( ' AND comment_type NOT IN (%s)', $placeholders ), ...$comment_types );
}
return $where;
@ -565,7 +587,7 @@ class Comment {
$comment_types = self::get_comment_types();
foreach ( $comment_types as $comment_type ) {
if ( in_array( $activity_type, $comment_type['activity_types'], true ) ) {
if ( \in_array( $activity_type, $comment_type['activity_types'], true ) ) {
return $comment_type;
}
}
@ -606,13 +628,13 @@ class Comment {
* @return array The registered custom comment type slugs.
*/
public static function get_comment_type_slugs() {
if ( ! did_action( 'init' ) ) {
_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' );
if ( ! \did_action( 'init' ) ) {
\_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' );
return array();
}
return array_keys( self::get_comment_types() );
return \array_keys( self::get_comment_types() );
}
/**
@ -628,14 +650,14 @@ class Comment {
* @return array The comment type.
*/
public static function get_comment_type( $type ) {
$type = strtolower( $type );
$type = sanitize_key( $type );
$type = \strtolower( $type );
$type = \sanitize_key( $type );
$comment_types = self::get_comment_types();
$type_array = array();
// Check array keys.
if ( in_array( $type, array_keys( $comment_types ), true ) ) {
if ( \in_array( $type, \array_keys( $comment_types ), true ) ) {
$type_array = $comment_types[ $type ];
}
@ -644,7 +666,7 @@ class Comment {
*
* @param array $type_array The comment type.
*/
return apply_filters( "activitypub_comment_type_{$type}", $type_array );
return \apply_filters( "activitypub_comment_type_{$type}", $type_array );
}
/**
@ -670,7 +692,7 @@ class Comment {
* @param mixed $value The value of the attribute.
* @param string $type The comment type.
*/
return apply_filters( "activitypub_comment_type_{$attr}", $value, $type );
return \apply_filters( "activitypub_comment_type_{$attr}", $value, $type );
}
/**
@ -680,57 +702,57 @@ class Comment {
register_comment_type(
'repost',
array(
'label' => __( 'Reposts', 'activitypub' ),
'singular' => __( 'Repost', 'activitypub' ),
'label' => \__( 'Reposts', 'activitypub' ),
'singular' => \__( 'Repost', 'activitypub' ),
'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.',
'icon' => '♻️',
'class' => 'p-repost',
'type' => 'repost',
'collection' => 'reposts',
'activity_types' => array( 'announce' ),
'excerpt' => html_entity_decode( \__( '&hellip; reposted this!', 'activitypub' ) ),
'excerpt' => \html_entity_decode( \__( '&hellip; reposted this!', 'activitypub' ) ),
/* translators: %d: Number of reposts */
'count_single' => _x( '%d repost', 'number of reposts', 'activitypub' ),
'count_single' => \_x( '%d repost', 'number of reposts', 'activitypub' ),
/* translators: %d: Number of reposts */
'count_plural' => _x( '%d reposts', 'number of reposts', 'activitypub' ),
'count_plural' => \_x( '%d reposts', 'number of reposts', 'activitypub' ),
)
);
register_comment_type(
'like',
array(
'label' => __( 'Likes', 'activitypub' ),
'singular' => __( 'Like', 'activitypub' ),
'label' => \__( 'Likes', 'activitypub' ),
'singular' => \__( 'Like', 'activitypub' ),
'description' => 'A like is a small positive reaction that shows appreciation for a post without sharing it further.',
'icon' => '👍',
'class' => 'p-like',
'type' => 'like',
'collection' => 'likes',
'activity_types' => array( 'like' ),
'excerpt' => html_entity_decode( \__( '&hellip; liked this!', 'activitypub' ) ),
'excerpt' => \html_entity_decode( \__( '&hellip; liked this!', 'activitypub' ) ),
/* translators: %d: Number of likes */
'count_single' => _x( '%d like', 'number of likes', 'activitypub' ),
'count_single' => \_x( '%d like', 'number of likes', 'activitypub' ),
/* translators: %d: Number of likes */
'count_plural' => _x( '%d likes', 'number of likes', 'activitypub' ),
'count_plural' => \_x( '%d likes', 'number of likes', 'activitypub' ),
)
);
register_comment_type(
'quote',
array(
'label' => __( 'Quotes', 'activitypub' ),
'singular' => __( 'Quote', 'activitypub' ),
'label' => \__( 'Quotes', 'activitypub' ),
'singular' => \__( 'Quote', 'activitypub' ),
'description' => 'A quote is when a post is shared along with an added comment, so the original post appears together with the sharer&#8217;s own words.',
'icon' => '❞',
'class' => 'p-quote',
'type' => 'quote',
'collection' => 'quotes',
'activity_types' => array( 'quote' ),
'excerpt' => html_entity_decode( \__( '&hellip; quoted this!', 'activitypub' ) ),
'excerpt' => \html_entity_decode( \__( '&hellip; quoted this!', 'activitypub' ) ),
/* translators: %d: Number of quotes */
'count_single' => _x( '%d quote', 'number of quotes', 'activitypub' ),
'count_single' => \_x( '%d quote', 'number of quotes', 'activitypub' ),
/* translators: %d: Number of quotes */
'count_plural' => _x( '%d quotes', 'number of quotes', 'activitypub' ),
'count_plural' => \_x( '%d quotes', 'number of quotes', 'activitypub' ),
)
);
}
@ -744,9 +766,9 @@ class Comment {
*/
public static function get_avatar_comment_types( $types ) {
$comment_types = self::get_comment_type_slugs();
$types = array_merge( $types, $comment_types );
$types = \array_merge( $types, $comment_types );
return array_unique( $types );
return \array_unique( $types );
}
/**
@ -764,7 +786,7 @@ class Comment {
}
// Do not exclude likes and reposts on ActivityPub requests.
if ( defined( 'ACTIVITYPUB_REQUEST' ) && ACTIVITYPUB_REQUEST ) {
if ( \defined( 'ACTIVITYPUB_REQUEST' ) && ACTIVITYPUB_REQUEST ) {
return;
}
@ -922,7 +944,7 @@ class Comment {
*/
public static function pre_wp_update_comment_count_now( $new_count, $old_count, $post_id ) {
if ( null === $new_count ) {
$excluded_types = array_filter( self::get_comment_type_slugs(), array( self::class, 'is_comment_type_enabled' ) );
$excluded_types = \array_filter( self::get_comment_type_slugs(), array( self::class, 'is_comment_type_enabled' ) );
if ( ! empty( $excluded_types ) ) {
/*
@ -946,12 +968,12 @@ class Comment {
* @param int $post_id The post ID.
*/
$excluded_types = \apply_filters( 'activitypub_excluded_comment_types', $excluded_types, $post_id );
$excluded_types = array_unique( array_filter( $excluded_types ) );
$excluded_types = \array_unique( \array_filter( $excluded_types ) );
global $wpdb;
// phpcs:ignore WordPress.DB
$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 ) );
$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 ) );
}
}
@ -965,7 +987,7 @@ class Comment {
* @return bool True if the comment type is enabled.
*/
public static function is_comment_type_enabled( $comment_type ) {
return '1' === get_option( "activitypub_allow_{$comment_type}s", '1' );
return '1' === \get_option( "activitypub_allow_{$comment_type}s", '1' );
}
/**