Event-Federation/wordpress-activitypub
Event-Federation/wordpress-activitypub
7
1
Fork 0
Code Issues 5 Pull requests Projects Releases Wiki Activity Actions 1

fix queries

Browse source
This commit is contained in:
Matthias Pfefferle 2023-06-15 11:47:50 +02:00
parent 7ed998d81f
commit 8b7744a5ea
1 changed files with 47 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
includes/collection/class-followers.php
View file

@ -3,7 +3,7 @@ namespace Activitypub\Collection;
use WP_Error; use WP_Error;
use Exception; use Exception;
use WP_Term_Query; use WP_Query;
use Activitypub\Http; use Activitypub\Http;
use Activitypub\Webfinger; use Activitypub\Webfinger;
use Activitypub\Model\Activity; use Activitypub\Model\Activity;
@ -19,7 +19,7 @@ use function Activitypub\get_remote_metadata_by_actor;
* @author Matthias Pfefferle * @author Matthias Pfefferle
*/ */
class Followers { class Followers {
const POST_TYPE = 'activitypub_followers'; const POST_TYPE = 'activitypub_follower';
const CACHE_KEY_INBOXES = 'follower_inboxes_%s'; const CACHE_KEY_INBOXES = 'follower_inboxes_%s';
/** /**
@ -50,7 +50,7 @@ class Followers {
'name' => _x( 'Followers', 'post_type plural name', 'activitypub' ), 'name' => _x( 'Followers', 'post_type plural name', 'activitypub' ),
'singular_name' => _x( 'Follower', 'post_type single name', 'activitypub' ), 'singular_name' => _x( 'Follower', 'post_type single name', 'activitypub' ),
), ),
'public' => false, 'public' => true,
'hierarchical' => false, 'hierarchical' => false,
'rewrite' => false, 'rewrite' => false,
'query_var' => false, 'query_var' => false,
@ -213,16 +213,15 @@ class Followers {
return $meta; return $meta;
} }
$follower = new Follower( $actor, $user_id ); $follower = new Follower( $actor );
$follower->from_meta( $meta ); $follower->from_meta( $meta );
$follower->upsert(); $follower->upsert();
if ( is_wp_error( $result ) ) { add_post_meta( $follower->get_id(), 'user_id', $user_id );
return $result;
} else { wp_cache_delete( sprintf( self::CACHE_KEY_INBOXES, $user_id ), 'activitypub' );
wp_cache_delete( sprintf( self::CACHE_KEY_INBOXES, $user_id ), 'activitypub' );
return $follower; return $follower;
}
} }
/** /**
@ -235,20 +234,34 @@ class Followers {
*/ */
public static function remove_follower( $user_id, $actor ) { public static function remove_follower( $user_id, $actor ) {
wp_cache_delete( sprintf( self::CACHE_KEY_INBOXES, $user_id ), 'activitypub' ); wp_cache_delete( sprintf( self::CACHE_KEY_INBOXES, $user_id ), 'activitypub' );
return wp_remove_object_terms( $user_id, $actor, self::POST_TYPE ); return wp_remove_object_terms( $user_id, $actor, self::POST_TYPE );
} }
/** /**
* Remove a Follower * Get a Follower
* *
* @param int $user_id The ID of the WordPress User * @param int $user_id The ID of the WordPress User
* @param string $actor The Actor URL * @param string $actor The Actor URL
* *
* @return \Activitypub\Model\Follower The Follower object * @return \Activitypub\Model\Follower The Follower object
*/ */
public static function get_follower( $user_id, $actor ) { public static function get_follower( $actor ) {
$posts = self::get_followers( $user_id, null, null, array( 'name' => $actor ) ); global $wpdb;
return is_empty( $posts ) ? null : $posts[0];
$post_id = $wpdb->get_var(
$wpdb->prepare(
"SELECT ID FROM $wpdb->posts WHERE guid=%s",
esc_sql( $actor )
)
);
if ( $post_id ) {
$post = get_post( $post_id );
return new Follower( $post );
}
return null;
} }
/** /**
@ -299,12 +312,17 @@ class Followers {
*/ */
public static function get_followers( $user_id, $number = null, $offset = null, $args = array() ) { public static function get_followers( $user_id, $number = null, $offset = null, $args = array() ) {
$defaults = array( $defaults = array(
'post_type' => self::POST_TYPE, 'post_type' => self::POST_TYPE,
'author' => $user_id, 'posts_per_page' => $number,
'number' => $number, 'offset' => $offset,
'offset' => $offset, 'orderby' => 'ID',
'orderby' => 'id', 'order' => 'DESC',
'order' => 'DESC', 'meta_query' => array(
array(
'key' => 'user_id',
'value' => $user_id,
),
),
); );
$args = wp_parse_args( $args, $defaults ); $args = wp_parse_args( $args, $defaults );
@ -362,11 +380,10 @@ class Followers {
} }
// get all Followers of a ID of the WordPress User // get all Followers of a ID of the WordPress User
$terms = new WP_Term_Query( $terms = new WP_Query(
array( array(
'taxonomy' => self::POST_TYPE, 'post_type' => self::POST_TYPE,
'hide_empty' => false, 'author' => $user_id,
'object_ids' => $user_id,
'fields' => 'ids', 'fields' => 'ids',
'meta_query' => array( 'meta_query' => array(
array( array(
@ -377,16 +394,16 @@ class Followers {
) )
); );
$terms = $terms->get_terms(); $posts = $posts->get_posts();
if ( ! $terms ) { if ( ! $posts ) {
return array(); return array();
} }
global $wpdb; global $wpdb;
$results = $wpdb->get_col( $results = $wpdb->get_col(
$wpdb->prepare( $wpdb->prepare(
"SELECT DISTINCT meta_value FROM {$wpdb->termmeta} "SELECT DISTINCT meta_value FROM {$wpdb->posts}
WHERE term_id IN (" . implode( ', ', array_fill( 0, count( $terms ), '%d' ) ) . ") WHERE term_id IN (" . implode( ', ', array_fill( 0, count( $terms ), '%d' ) ) . ")
AND meta_key = 'shared_inbox' AND meta_key = 'shared_inbox'
AND meta_value IS NOT NULL", AND meta_value IS NOT NULL",
@ -446,9 +463,9 @@ class Followers {
*/ */
public static function get_faulty_followers( $number = 10 ) { public static function get_faulty_followers( $number = 10 ) {
$args = array( $args = array(
'taxonomy' => self::POST_TYPE, 'post_type' => self::POST_TYPE,
'number' => $number, 'posts_per_page' => $number,
'meta_query' => array( 'meta_query' => array(
array( array(
'key' => 'errors', 'key' => 'errors',
'compare' => 'EXISTS', 'compare' => 'EXISTS',