updated plugin ActivityPub
version 5.8.0
This commit is contained in:
@ -7,9 +7,9 @@
|
||||
|
||||
namespace Activitypub\Collection;
|
||||
|
||||
use Activitypub\Model\Follower;
|
||||
use WP_Error;
|
||||
use WP_Query;
|
||||
use Activitypub\Model\Follower;
|
||||
|
||||
use function Activitypub\is_tombstone;
|
||||
use function Activitypub\get_remote_metadata_by_actor;
|
||||
@ -52,11 +52,11 @@ class Followers {
|
||||
return $id;
|
||||
}
|
||||
|
||||
$post_meta = get_post_meta( $id, 'activitypub_user_id', false );
|
||||
$post_meta = get_post_meta( $id, '_activitypub_user_id', false );
|
||||
|
||||
// phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict
|
||||
if ( is_array( $post_meta ) && ! in_array( $user_id, $post_meta ) ) {
|
||||
add_post_meta( $id, 'activitypub_user_id', $user_id );
|
||||
add_post_meta( $id, '_activitypub_user_id', $user_id );
|
||||
wp_cache_delete( sprintf( self::CACHE_KEY_INBOXES, $user_id ), 'activitypub' );
|
||||
}
|
||||
|
||||
@ -80,7 +80,16 @@ class Followers {
|
||||
return false;
|
||||
}
|
||||
|
||||
return delete_post_meta( $follower->get__id(), 'activitypub_user_id', $user_id );
|
||||
/**
|
||||
* Fires before a Follower is removed.
|
||||
*
|
||||
* @param Follower $follower The Follower object.
|
||||
* @param int $user_id The ID of the WordPress User.
|
||||
* @param string $actor The Actor URL.
|
||||
*/
|
||||
do_action( 'activitypub_followers_pre_remove_follower', $follower, $user_id, $actor );
|
||||
|
||||
return delete_post_meta( $follower->get__id(), '_activitypub_user_id', $user_id );
|
||||
}
|
||||
|
||||
/**
|
||||
@ -89,7 +98,7 @@ class Followers {
|
||||
* @param int $user_id The ID of the WordPress User.
|
||||
* @param string $actor The Actor URL.
|
||||
*
|
||||
* @return Follower|null The Follower object or null
|
||||
* @return Follower|false|null The Follower object or null
|
||||
*/
|
||||
public static function get_follower( $user_id, $actor ) {
|
||||
global $wpdb;
|
||||
@ -97,7 +106,7 @@ class Followers {
|
||||
// phpcs:ignore WordPress.DB.DirectDatabaseQuery
|
||||
$post_id = $wpdb->get_var(
|
||||
$wpdb->prepare(
|
||||
"SELECT DISTINCT p.ID FROM $wpdb->posts p INNER JOIN $wpdb->postmeta pm ON p.ID = pm.post_id WHERE p.post_type = %s AND pm.meta_key = 'activitypub_user_id' AND pm.meta_value = %d AND p.guid = %s",
|
||||
"SELECT DISTINCT p.ID FROM $wpdb->posts p INNER JOIN $wpdb->postmeta pm ON p.ID = pm.post_id WHERE p.post_type = %s AND pm.meta_key = '_activitypub_user_id' AND pm.meta_value = %d AND p.guid = %s",
|
||||
array(
|
||||
esc_sql( self::POST_TYPE ),
|
||||
esc_sql( $user_id ),
|
||||
@ -119,7 +128,7 @@ class Followers {
|
||||
*
|
||||
* @param string $actor The Actor URL.
|
||||
*
|
||||
* @return \Activitypub\Activity\Base_Object|WP_Error|null
|
||||
* @return Follower|false|null The Follower object or false on failure.
|
||||
*/
|
||||
public static function get_follower_by_actor( $actor ) {
|
||||
global $wpdb;
|
||||
@ -147,7 +156,7 @@ class Followers {
|
||||
* @param int $number Maximum number of results to return.
|
||||
* @param int $page Page number.
|
||||
* @param array $args The WP_Query arguments.
|
||||
* @return array List of `Follower` objects.
|
||||
* @return Follower[] List of `Follower` objects.
|
||||
*/
|
||||
public static function get_followers( $user_id, $number = -1, $page = null, $args = array() ) {
|
||||
$data = self::get_followers_with_count( $user_id, $number, $page, $args );
|
||||
@ -165,8 +174,8 @@ class Followers {
|
||||
* @return array {
|
||||
* Data about the followers.
|
||||
*
|
||||
* @type array $followers List of `Follower` objects.
|
||||
* @type int $total Total number of followers.
|
||||
* @type Follower[] $followers List of `Follower` objects.
|
||||
* @type int $total Total number of followers.
|
||||
* }
|
||||
*/
|
||||
public static function get_followers_with_count( $user_id, $number = -1, $page = null, $args = array() ) {
|
||||
@ -179,7 +188,7 @@ class Followers {
|
||||
// phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
|
||||
'meta_query' => array(
|
||||
array(
|
||||
'key' => 'activitypub_user_id',
|
||||
'key' => '_activitypub_user_id',
|
||||
'value' => $user_id,
|
||||
),
|
||||
),
|
||||
@ -188,12 +197,8 @@ class Followers {
|
||||
$args = wp_parse_args( $args, $defaults );
|
||||
$query = new WP_Query( $args );
|
||||
$total = $query->found_posts;
|
||||
$followers = array_map(
|
||||
function ( $post ) {
|
||||
return Follower::init_from_cpt( $post );
|
||||
},
|
||||
$query->get_posts()
|
||||
);
|
||||
$followers = array_map( array( Follower::class, 'init_from_cpt' ), $query->get_posts() );
|
||||
$followers = array_filter( $followers );
|
||||
|
||||
return compact( 'followers', 'total' );
|
||||
}
|
||||
@ -201,7 +206,7 @@ class Followers {
|
||||
/**
|
||||
* Get all Followers.
|
||||
*
|
||||
* @return array The Term list of Followers.
|
||||
* @return Follower[] The Term list of Followers.
|
||||
*/
|
||||
public static function get_all_followers() {
|
||||
$args = array(
|
||||
@ -210,11 +215,11 @@ class Followers {
|
||||
'meta_query' => array(
|
||||
'relation' => 'AND',
|
||||
array(
|
||||
'key' => 'activitypub_inbox',
|
||||
'key' => '_activitypub_inbox',
|
||||
'compare' => 'EXISTS',
|
||||
),
|
||||
array(
|
||||
'key' => 'activitypub_actor_json',
|
||||
'key' => '_activitypub_actor_json',
|
||||
'compare' => 'EXISTS',
|
||||
),
|
||||
),
|
||||
@ -238,15 +243,15 @@ class Followers {
|
||||
'meta_query' => array(
|
||||
'relation' => 'AND',
|
||||
array(
|
||||
'key' => 'activitypub_user_id',
|
||||
'key' => '_activitypub_user_id',
|
||||
'value' => $user_id,
|
||||
),
|
||||
array(
|
||||
'key' => 'activitypub_inbox',
|
||||
'key' => '_activitypub_inbox',
|
||||
'compare' => 'EXISTS',
|
||||
),
|
||||
array(
|
||||
'key' => 'activitypub_actor_json',
|
||||
'key' => '_activitypub_actor_json',
|
||||
'compare' => 'EXISTS',
|
||||
),
|
||||
),
|
||||
@ -257,7 +262,7 @@ class Followers {
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns all Inboxes for a Users Followers.
|
||||
* Returns all Inboxes for an Actor's Followers.
|
||||
*
|
||||
* @param int $user_id The ID of the WordPress User.
|
||||
*
|
||||
@ -271,7 +276,7 @@ class Followers {
|
||||
return $inboxes;
|
||||
}
|
||||
|
||||
// Get all Followers of a ID of the WordPress User.
|
||||
// Get all Followers of an ID of the WordPress User.
|
||||
$posts = new WP_Query(
|
||||
array(
|
||||
'nopaging' => true,
|
||||
@ -281,15 +286,15 @@ class Followers {
|
||||
'meta_query' => array(
|
||||
'relation' => 'AND',
|
||||
array(
|
||||
'key' => 'activitypub_inbox',
|
||||
'key' => '_activitypub_inbox',
|
||||
'compare' => 'EXISTS',
|
||||
),
|
||||
array(
|
||||
'key' => 'activitypub_user_id',
|
||||
'key' => '_activitypub_user_id',
|
||||
'value' => $user_id,
|
||||
),
|
||||
array(
|
||||
'key' => 'activitypub_inbox',
|
||||
'key' => '_activitypub_inbox',
|
||||
'value' => '',
|
||||
'compare' => '!=',
|
||||
),
|
||||
@ -309,7 +314,7 @@ class Followers {
|
||||
$wpdb->prepare(
|
||||
"SELECT DISTINCT meta_value FROM {$wpdb->postmeta}
|
||||
WHERE post_id IN (" . implode( ', ', array_fill( 0, count( $posts ), '%d' ) ) . ")
|
||||
AND meta_key = 'activitypub_inbox'
|
||||
AND meta_key = '_activitypub_inbox'
|
||||
AND meta_value IS NOT NULL",
|
||||
$posts
|
||||
)
|
||||
@ -321,13 +326,63 @@ class Followers {
|
||||
return $inboxes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all Inboxes for a given Activity.
|
||||
*
|
||||
* @param string $json The ActivityPub Activity JSON.
|
||||
* @param int $actor_id The WordPress Actor ID.
|
||||
* @param int $batch_size Optional. The batch size. Default 50.
|
||||
* @param int $offset Optional. The offset. Default 0.
|
||||
*
|
||||
* @return array The list of Inboxes.
|
||||
*/
|
||||
public static function get_inboxes_for_activity( $json, $actor_id, $batch_size = 50, $offset = 0 ) {
|
||||
$inboxes = self::get_inboxes( $actor_id );
|
||||
|
||||
if ( self::maybe_add_inboxes_of_blog_user( $json, $actor_id ) ) {
|
||||
$inboxes = array_fill_keys( $inboxes, 1 );
|
||||
foreach ( self::get_inboxes( Actors::BLOG_USER_ID ) as $inbox ) {
|
||||
$inboxes[ $inbox ] = 1;
|
||||
}
|
||||
$inboxes = array_keys( $inboxes );
|
||||
}
|
||||
|
||||
return array_slice( $inboxes, $offset, $batch_size );
|
||||
}
|
||||
|
||||
/**
|
||||
* Maybe add Inboxes of the Blog User.
|
||||
*
|
||||
* @param string $json The ActivityPub Activity JSON.
|
||||
* @param int $actor_id The WordPress Actor ID.
|
||||
* @return bool True if the Inboxes of the Blog User should be added, false otherwise.
|
||||
*/
|
||||
public static function maybe_add_inboxes_of_blog_user( $json, $actor_id ) {
|
||||
// Only if we're in both Blog and User modes.
|
||||
if ( ACTIVITYPUB_ACTOR_AND_BLOG_MODE !== \get_option( 'activitypub_actor_mode', ACTIVITYPUB_ACTOR_MODE ) ) {
|
||||
return false;
|
||||
}
|
||||
// Only if this isn't the Blog Actor.
|
||||
if ( Actors::BLOG_USER_ID === $actor_id ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$activity = json_decode( $json, true );
|
||||
// Only if this is an Update or Delete. Create handles its own "Announce" in dual user mode.
|
||||
if ( ! in_array( $activity['type'] ?? null, array( 'Update', 'Delete' ), true ) ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all Followers that have not been updated for a given time.
|
||||
*
|
||||
* @param int $number Optional. Limits the result. Default 50.
|
||||
* @param int $older_than Optional. The time in seconds. Default 86400 (1 day).
|
||||
*
|
||||
* @return array The Term list of Followers.
|
||||
* @return Follower[] The Term list of Followers.
|
||||
*/
|
||||
public static function get_outdated_followers( $number = 50, $older_than = 86400 ) {
|
||||
$args = array(
|
||||
@ -345,13 +400,9 @@ class Followers {
|
||||
);
|
||||
|
||||
$posts = new WP_Query( $args );
|
||||
$items = array();
|
||||
$items = array_map( array( Follower::class, 'init_from_cpt' ), $posts->get_posts() );
|
||||
|
||||
foreach ( $posts->get_posts() as $follower ) {
|
||||
$items[] = Follower::init_from_cpt( $follower );
|
||||
}
|
||||
|
||||
return $items;
|
||||
return array_filter( $items );
|
||||
}
|
||||
|
||||
/**
|
||||
@ -359,7 +410,7 @@ class Followers {
|
||||
*
|
||||
* @param int $number Optional. The number of Followers to return. Default 20.
|
||||
*
|
||||
* @return array The Term list of Followers.
|
||||
* @return Follower[] The Term list of Followers.
|
||||
*/
|
||||
public static function get_faulty_followers( $number = 20 ) {
|
||||
$args = array(
|
||||
@ -369,24 +420,24 @@ class Followers {
|
||||
'meta_query' => array(
|
||||
'relation' => 'OR',
|
||||
array(
|
||||
'key' => 'activitypub_errors',
|
||||
'key' => '_activitypub_errors',
|
||||
'compare' => 'EXISTS',
|
||||
),
|
||||
array(
|
||||
'key' => 'activitypub_inbox',
|
||||
'key' => '_activitypub_inbox',
|
||||
'compare' => 'NOT EXISTS',
|
||||
),
|
||||
array(
|
||||
'key' => 'activitypub_actor_json',
|
||||
'key' => '_activitypub_actor_json',
|
||||
'compare' => 'NOT EXISTS',
|
||||
),
|
||||
array(
|
||||
'key' => 'activitypub_inbox',
|
||||
'key' => '_activitypub_inbox',
|
||||
'value' => '',
|
||||
'compare' => '=',
|
||||
),
|
||||
array(
|
||||
'key' => 'activitypub_actor_json',
|
||||
'key' => '_activitypub_actor_json',
|
||||
'value' => '',
|
||||
'compare' => '=',
|
||||
),
|
||||
@ -394,13 +445,9 @@ class Followers {
|
||||
);
|
||||
|
||||
$posts = new WP_Query( $args );
|
||||
$items = array();
|
||||
$items = array_map( array( Follower::class, 'init_from_cpt' ), $posts->get_posts() );
|
||||
|
||||
foreach ( $posts->get_posts() as $follower ) {
|
||||
$items[] = Follower::init_from_cpt( $follower );
|
||||
}
|
||||
|
||||
return $items;
|
||||
return array_filter( $items );
|
||||
}
|
||||
|
||||
/**
|
||||
@ -428,7 +475,7 @@ class Followers {
|
||||
|
||||
return add_post_meta(
|
||||
$post_id,
|
||||
'activitypub_errors',
|
||||
'_activitypub_errors',
|
||||
$error_message
|
||||
);
|
||||
}
|
||||
|
Reference in New Issue
Block a user